broken: compile error reduction in progress, getcalmarktemp to be reviewd (6008c033) · Commits · INAF / DISCOS

Medicina/Servers/MedicinaCBand/include/ComponentCore.h

+24 −20

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <LocalOscillatorInterfaceC.h>
		#include <ReceiversErrors.h>
		#include <ManagmentDefinitionsC.h>
		#include "Commons.h"
		#include "MixerOperator.h"

		/**
		@@ -23,6 +24,24 @@
		* <br>
		*/
		class CComponentCore {

		private:

		enum TStatusBit {
		LOCAL=0,
		VACUUMSENSOR=1,
		VACUUMPUMPSTATUS=2,
		VACUUMPUMPFAULT=3,
		VACUUMVALVEOPEN=4,
		COOLHEADON=5,
		COMPRESSORFAULT=6,
		NOISEMARK=7,
		NOISEMARKERROR=8,
		EXTNOISEMARK=9,
		CONNECTIONERROR=10,
		UNLOCKED=11
		};

		public:
		/**
		* Constructor
		@@ -97,7 +116,7 @@ public:
		* It returns the current operating mode of the receiver.
		* @return output string
		*/
		const IRA::CString& getSetupMode();
		const IRA::CString getSetupMode();


		/* * LOs * */
		@@ -179,13 +198,13 @@ public:
		* It returns the number of IF chains
		* @return output value
		*/
		const DWORD& getIFs();
		const DWORD getIFs();

		/**
		* It returns the number of feeds
		* @return output value
		*/
		const DWORD& getFeeds();
		const DWORD getFeeds();

		/* * TAPER * */

		@@ -307,7 +326,7 @@ public:
		* This is getter method. No need to make it thread safe......
		* @return the current value of the vertex temperature
		*/
		CConfiguration::BoardValue getEnvironmentTemperature() const { return m_environmentTemperature; }
		BoardValue getEnvironmentTemperature() const { return m_environmentTemperature; }


		/**
		@@ -410,21 +429,6 @@ private:

		private:

		enum TStatusBit {
		LOCAL=0,
		VACUUMSENSOR=1,
		VACUUMPUMPSTATUS=2,
		VACUUMPUMPFAULT=3,
		VACUUMVALVEOPEN=4,
		COOLHEADON=5,
		COMPRESSORFAULT=6,
		NOISEMARK=7,
		NOISEMARKERROR=8,
		EXTNOISEMARK=9,
		CONNECTIONERROR=10,
		UNLOCKED=11
		};

		/*@brief LO device and data collector /

		CConfiguration m_configuration;
		@@ -441,7 +445,7 @@ private:
		MixerOperator m_mixer; /*< LOs manager /

		double m_vacuum;
		CConfiguration::BoardValue m_environmentTemperature;
		BoardValue m_environmentTemperature;
		double m_vacuumDefault;
		bool m_calDiode;

Medicina/Servers/MedicinaCBand/include/Configuration.h

+4 −12

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include "Commons.h"
		#include "ReceiverConfHandler.h"


		/**
		* This class implements the component configuration. The data inside this class are initialized at the startup from the
		* configuration database and then are used (read) inside the component.
		@@ -154,12 +153,6 @@ public:

		/* * SINGLE SETUP ENTRIES * */

		/**
		* @return the number of feeds
		* @details Valid till you reallocate source data vector
		*/
		inline const DWORD& getFeeds() const { return m_conf_hnd.getCurrentSetup().m_feeds; }

		/**
		* @return mnemonic of the working mode of the receiver
		*/
		@@ -267,6 +260,8 @@ public:

		private:

		maci::ContainerServices * m_service;

		IRA::CString m_dewarIPAddress;
		WORD m_dewarPort;
		IRA::CString m_LNAIPAddress;
		@@ -280,9 +275,6 @@ private:
		IRA::CString m_localOscillatorInstance1st; /*< 1st stage mixer component instance name /
		IRA::CString m_localOscillatorInstance2nd; /*< 2nd stage mixer component instance name /

		std::vector<TFeedValue> m_feeds_vector; /*< Feed data array /
		std::vector<TTaperValue> m_taper_vector; /*< Feed data array /

		std::vector<TLOValue> m_synt_table_1st; /*< Freq - power synt table 1st stage LO/
		std::vector<TLOValue> m_synt_table_2nd; /*< Freq - power synt table 2nd stage LO/
		std::vector<TMarkValue> m_mark_values; /*< @todo Mark value cosa do fuori?? /

Medicina/Servers/MedicinaCBand/include/MixerOperator.h

+12 −4

Original line number	Diff line number	Diff line
		@@ -2,8 +2,11 @@
		#define MED_C_BAND_MIXER_OP_H

		#include <IRA>
		#include "Configuration.h"
		#include <ReceiverControl.h>
		#include <LocalOscillatorInterfaceC.h>
		#include <ReceiversErrors.h>
		#include <ManagmentDefinitionsC.h>
		#include "Configuration.h"

		/**
		* @brief This class enclose both mixer stages into a unique interface
		@@ -23,6 +26,11 @@ class MixerOperator{
		*/
		~MixerOperator();

		/**
		* @brief
		*/
		bool isLoaded()const;

		/**
		* @brief Mixer Setup
		* @details devices initialization, set default freq
		@@ -54,7 +62,7 @@ class MixerOperator{
		* @param p_values Values for what? why an array?
		* @return true Value is valid
		*/
		bool SetValue(const ACS::doubleSeq& p_values)
		bool setValue(const ACS::doubleSeq& p_values)
		throw (ComponentErrors::ValidationErrorExImpl,
		ComponentErrors::ValueOutofRangeExImpl,
		ComponentErrors::CouldntGetComponentExImpl,
		@@ -82,7 +90,7 @@ class MixerOperator{
		* @param[inout] p_loDev LOs device object
		* @param[in] p_lo_instance LO name to be loaded
		*/
		void loadDevice(Receivers::LocalOsclillator_var p_loDev,
		void loadDevice(Receivers::LocalOscillator_var p_loDev,
		char * p_lo_name);

		/**
		@@ -91,7 +99,7 @@ class MixerOperator{
		* @param p_loDev instance container
		* @param p_lo_name instance name
		*/
		void releaseDevice(Receivers::LocalOsclillator_var p_loDev,
		void releaseDevice(Receivers::LocalOscillator_var p_loDev,
		char * p_lo_name);

		private:

Medicina/Servers/MedicinaCBand/include/ReceiverConfHandler.cpp

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		#include "ReceiverConfHandler.h"

Medicina/Servers/MedicinaCBand/include/ReceiverConfHandler.h

+16 −5

Original line number	Diff line number	Diff line
		@@ -50,6 +50,10 @@ struct ReceiverConfHandler{
		IRA::CString m_name_str; /*< Conf string name /
		IRA::CString m_conf_file_path;/*< Conf data block file path /
		IRA::CString m_noisemark_file_path;/*< Noise mark data block file path /
		IRA::CString m_synth_1_file_path;/*< Synth 1st stage data block file path /
		IRA::CString m_synth_2_file_path;/*< Synth 2nd stage data block file path /
		IRA::CString m_feeds_file_path;/*< Feeds data block file path /
		IRA::CString m_taper_file_path;/*< Taper data block file path /
		};

		/**
		@@ -103,7 +107,7 @@ struct ReceiverConfHandler{
		* @return true
		* @return True if requested configuration is valid.
		*/
		bool setConfiguration(IRA::Cstring p_conf_name);
		bool setConfiguration(IRA::CString p_conf_name);

		/**
		* @brief Set configuration starting from given receiver keeping default Normal as mode
		@@ -169,6 +173,13 @@ struct ReceiverConfHandler{
		*/
		ConfigurationSetup getCurrentSetup() const;

		/**
		* @brief Getter actual conf file access infos
		*
		* @return Current conf file acces
		*/
		ConfigurationAccess getCurrentAccess() const;

		/**
		* @brief Get the Available configuration by enum name
		* @return Available conf names