Commit 5c276b9d authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix issue 205, fixed ACS bulk data transfer. Also fixed some roach bugs and... 

Fix issue 205, fixed ACS bulk data transfer. Also fixed some roach bugs and added some configurations to it. (#216)

* fix #205: fixed for both TotalPower and XArcos

* Fix #125, removed some remaining references to `THeaderRecord` structure and objects.
Another reference can be found in XarcosThread.h, used in XarcosThread.cpp, but I believe the methods that uses it are no longer needed. Also, a reference can be found in Common/Servers/HolographyBackend but I'm leaving it there because the component does not build correctly (see #208).

* Roach updated with latest TRUNK modifications.

* Fix #205 BulkDataTransfer fixed in roach.
Also some roach bugs have been fixed and some new configurations have been added.
parent 389b11a5

Common/Servers/Roach/include/CommandLine.h

+5 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public: 
	 * In this implementation the inputs number is the same of the number of section (SIMPLE_SECTION)

	 */

	//inline void getInputsNumber(long &in) const { in=m_sectionsNumber; }

	inline void getInputsNumber(long &in) const { in=m_rfInputs; }

	inline void getInputsNumber(long &in) const { in=m_inputsNumber; }

		

	/**

	 * Call this function to get the milliseconds of integration time
@@ -86,6 +86,7 @@ public: 
	 * Call this function in order to get the start frequency value for each section. 

	 */

	void getFrequency(ACS::doubleSeq& freq) const;

	void getFrequencyAttr(ACS::doubleSeq& freq) const;

	

	/**

	 * Call this function in order to get the sample rate for each section.
@@ -111,6 +112,7 @@ public: 
	 * Call this function in order to get the feed connected to each section.

	 */

	void getFeed(ACS::longSeq& feed) const;

	void getFeedAttr(ACS::longSeq& feed) const;



	/**

	 * Call this function in order to get the IF connected to each input.
@@ -160,6 +162,7 @@ public: 
	 */

	void getBandWidth(ACS::doubleSeq& bw) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,

			BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl);

	void getBandWidthAttr(ACS::doubleSeq& bw) const;

	

	/**

	 * Call this function in order to get the time clock reported by the backend.
@@ -640,7 +643,7 @@ private: 
	 */

	double m_tpiZero[MAX_SECTION_NUMBER];



    long m_rfInputs;

    long m_inputsNumber;



    double m_filter;

Common/Servers/Roach/include/DevIOBandWidth.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
		// get the CommandLine .......

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		try {

			line->getBandWidth(m_val);

			line->getBandWidthAttr(m_val);

		}

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOBandWidth::read()");

Common/Servers/Roach/include/DevIOFeed.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
		// get the CommandLine .......

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		try {

			line->getFeed(m_val);

			line->getFeedAttr(m_val);

		}

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOFeed::read()");

Common/Servers/Roach/include/DevIOFrequency.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public: 
		// get the CommandLine .......

		CSecAreaResourceWrapper<CCommandLine> line=m_pLink->Get();

		try {

			line->getFrequency(m_val);

			line->getFrequencyAttr(m_val);

		}

		catch (ACSErr::ACSbaseExImpl& E) {

			_ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOFrequency::read()");

Common/Servers/Roach/src/CommandLine.cpp

+224 −360

File changed.

Preview size limit exceeded, changes collapsed.