Unverified Commit 0723d8dd authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #579, added Tsys on a defined range (#788) 

This commit will leave out Sardara implementation since it will updated
shortly from another branch in order to avoid conflicts
parent 766b0dd9

Common/Interfaces/BackendsInterface/idl/GenericBackend.idl

+11 −0
Original line number Diff line number Diff line
@@ -351,6 +351,17 @@ module Backends { 
		 * it is not allowed to call this method.  

		 */



		/*

		 * It allows to set a range where to calculate a Tsys.

		 * @throw ComponentErrors::ComponentErrorsEx

		 * @throw BackendsErrors::BackendsErrorsEx

		 * @throw CORBA::SystemException

		 * @param freq starting frequency (MHz).

		 * @param bw portion of the backend bandwith (MHz) where calculate the Tsys.

		 */

		 void setTsysRange(in double freq,in double bw) raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		

	};

	

};

Common/Servers/DBBC/include/DBBCImpl.h

+11 −0
Original line number Diff line number Diff line
@@ -69,6 +69,17 @@ virtual ACS::doubleSeq * getTpi () throw(CORBA::SystemException, ComponentErrors 


virtual ACS::doubleSeq * getRms () throw(CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){return 0;};



/**

     * This method is used to set a range in the bandwith of the backend where calculate the Tsys.

     * Here is just a place holder for this implementation of the genericBackend interface

     * @throw CORBA::SystemException

     * @throw ComponentErrors::ComponentErrorsEx

     * @throw BackendsErrors::BackendsErrorsEx

     * @param freq starting frequency.

     * @param bw bandwidth interval.

     */

    virtual void setTsysRange(CORBA::Double freq,CORBA::Double bw) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;};



virtual ACS::doubleSeq * getZero () throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){return 0;};



virtual void setKelvinCountsRatio (const ACS::doubleSeq & ratio,

Common/Servers/HolographyBackend/include/HolographyImpl.h

+11 −0
Original line number Diff line number Diff line
@@ -204,6 +204,17 @@ public: 
    virtual ACS::doubleSeq * getRms () throw (CORBA::SystemException,

    		ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;};



/**

     * This method is used to set a range in the bandwith of the backend where calculate the Tsys.

     * Here is just a place holder for this implementation of the genericBackend interface

     * @throw CORBA::SystemException

     * @throw ComponentErrors::ComponentErrorsEx

     * @throw BackendsErrors::BackendsErrorsEx

     * @param freq starting frequency.

     * @param bw bandwidth interval.

     */

    virtual void setTsysRange(CORBA::Double freq,CORBA::Double bw) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;};



 /**

     * This method is used to inform the component about the proper conversion factor between Kelvin and counts. This value is used for the tsys computation during

     * the sampling. If this method is never issued the default value of 1 will be used for all the channels.

Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h

+12 −1
Original line number Diff line number Diff line
@@ -299,6 +299,17 @@ public: 
    */

    virtual void setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



   /**

     * This method is used to set a range in the bandwith of the backend where calculate the Tsys.

     * Here is just a place holder for this implementation of the genericBackend interface

     * @throw CORBA::SystemException

     * @throw ComponentErrors::ComponentErrorsEx

     * @throw BackendsErrors::BackendsErrorsEx

     * @param freq starting frequency.

     * @param bw bandwidth interval.

     */

    virtual void setTsysRange(CORBA::Double freq,CORBA::Double bw) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;};

        

	/** 

	 * Returns a reference to the time  property Implementation of IDL interface.

	 * @return pointer to read-only unsigned long long  property time

Common/Servers/Scheduler/src/Core.cpp

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ void CCore::execute() throw(ComponentErrors::TimerErrorExImpl, ComponentErrors:: 
	m_parser->add("initialize", "backend", 3, &CCore::remoteCall);

	m_parser->add("calSwitch", "backend", 3, &CCore::remoteCall);

	m_parser->add("getRms", "backend", 3, &CCore::remoteCall);

	m_parser->add("setTsysRange","backend",3,&CCore::remoteCall);



	// minor servo

	m_parser->add("servoSetup", "minorservo", 4, &CCore::remoteCall);