Commit c7728b29 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Fitzilla completion (#282) 

* working #38: some keywords in summary file not null anymore

* added setDefaultLogfile method to CustomLogger interface

* implemented setDefaultLogfile method in CustomLogger component

* working issue #38: other set of keywords are now meaningful

* issue #38: EXPTIME added to the set of keywords that are not null anymore

* closing issue #142: at the end of a schedule the log file is changed to default

* issue #38: updated version and file history

* DiscosVersion Library not compiled when making the system

* fix issue#239: The SINGAL keyword in the main header expanded in order to track the calibration diode status (#278)

* fix issue #239: small bug related to cal noise status fixed
parent 355f5b09

Common/Interfaces/CommonInterface/idl/ManagmentDefinitions.midl

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ module Management { 
	enum TSubScanSignal {

		MNG_SIGNAL_SIGNAL,      /*!< The subscan signal is on source  */

		MNG_SIGNAL_REFERENCE,   /*!< The subscan signal is off source  */

		MNG_SIGNAL_REFCAL,      /*!< The subscan signal is off source and calibration diode is fired  */

		MNG_SIGNAL_REFSIG,      /*!< The subscan signal is on source and the calibration diode is fired */

		MNG_SIGNAL_NONE         /*!< The subscan signal is undetermined, during OTF for example  */

	};

Common/Interfaces/CommonInterface/include/ManagementModule.h

+14 −2
Original line number Diff line number Diff line
@@ -103,6 +103,14 @@ public: 
			mode=Management::MNG_SIGNAL_NONE;

			return true;

		}

		else if (strcasecmp(strScan,"REFCAL")==0) {

			mode=Management::MNG_SIGNAL_REFCAL;

			return true;

		}

		else if (strcasecmp(strScan,"REFSIG")==0) {

			mode=Management::MNG_SIGNAL_REFSIG;

			return true;

		}		

		else {

			return false;

		}
@@ -115,6 +123,12 @@ public: 
		if (scan==Management::MNG_SIGNAL_REFERENCE) {

			return "REFERENCE";

		}

		if (scan==Management::MNG_SIGNAL_REFCAL) {

			return "REFCAL";

		}

		if (scan==Management::MNG_SIGNAL_REFSIG) {

			return "REFSIG";

		}

		else { //Management::MNG_SIGNAL_REFERENCE

			return "NONE";

		}
@@ -125,6 +139,4 @@ public: 
};









#endif /* MANAGEMENTMODULE_H_ */

Common/Interfaces/ManagmentInterface/idl/CustomLogger.midl

+6 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ module Management{ 
                 */

                void setLogfile(in string base_path,

                                in string filename) raises (ManagementErrors::ManagementErrorsEx);

                /**

                 * Close the actual log files and open a new one for logging.

                 * This call will automatically open the default log file as set in the CDB

                 * Tries to create the necessary directory.

                 */

                void setDefaultLogfile() raises (ManagementErrors::ManagementErrorsEx);

                /**

                 * Emits a classical ACS logging message. Used mainly for debugging and testing purposes.

                 * @param msg: the logging message

Common/Interfaces/ManagmentInterface/idl/DataReceiver.idl

+2 −0
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ module Management { 
		string baseName; // name of the file

		string scanLayout;

		string schedule;   // name of the schedule

		string log; //name of the log

		long device;

		string backendName;

	} TScanSetup;

	

	/**

Common/Interfaces/ReceiversInterface/idl/CommonReceiverInterface.idl

+2 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ module Receivers { 
         * @param ifs is a list that identfies which IFs of the feed we are interested in, usually 0..<i>IFs</i>-1

         * @param skyFreq used to return the resulting frequency whan comparing the detector subband and the receiver IF band, the band is the real observed frequency in fact the oscillator is also added (MHz)

         * @param skyBw used to return the total observed bandwidth. (Mhz)

         * @param onoff true if the calibration diode is turned on.

         * @param scaleFactor this value is used as a weight during system temperature computation in order to scale to a real tsys value. 

         * @return for each subband the list of the noise calibration values in Kelvin degrees. It must be freed by the caller.

         * @throw ComponentErrors::ComponentErrorsEx
@@ -128,7 +129,7 @@ module Receivers { 
         * @throw CORBA::SystemException  

         */

        ACS::doubleSeq getCalibrationMark(in ACS::doubleSeq freqs,in ACS::doubleSeq bandwidths,in ACS::longSeq feeds,in ACS::longSeq ifs,out ACS::doubleSeq skyFreq,out ACS::doubleSeq skyBw,

        		out double scaleFactor)    raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

        		out boolean onoff,out double scaleFactor) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

        

        

        /**