Commit 83983b24 authored by TheDebbio's avatar TheDebbio
Browse files

broken: configuration on going 

Taper, feeds, setup reading adaptations.
Todo:
 - getter to be modified
 - synth arch needs a review
parent a0ba4f38

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NoiseMark/CCC/NoiseMark.xml

+5 −13
Original line number Diff line number Diff line
@@ -3,18 +3,10 @@ 
<NoiseMarkLookUpTable xmlns="urn:schemas-cosylab-com:NoiseMarkLookUpTable:1.0"

             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

				

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>18.483</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>17.333</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>16.183</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>15.033</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>13.883</NoiseMark></MarkEntry>



<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>19.654</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>18.504</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>17.354</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>16.204</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>15.054</NoiseMark></MarkEntry>

				LCoeffs= "5.88"

				RCoeffs= "5.71"

				>



</NoiseMarkLookUpTable>
 
 No newline at end of file

Medicina/Configuration/CDB/alma/DataBlock/MedicinaCBand/NoiseMark/CHC/NoiseMark.xml

+5 −13
Original line number Diff line number Diff line
@@ -3,18 +3,10 @@ 
<NoiseMarkLookUpTable xmlns="urn:schemas-cosylab-com:NoiseMarkLookUpTable:1.0"

             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

				

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>5.88</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>5.88</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>5.88</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>5.88</NoiseMark></MarkEntry>

<MarkEntry><Polarization>LEFT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>5.88</NoiseMark></MarkEntry>



<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>5700.0</SkyFrequency><NoiseMark>5.71</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6200.0</SkyFrequency><NoiseMark>5.71</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>6700.0</SkyFrequency><NoiseMark>5.71</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7200.0</SkyFrequency><NoiseMark>5.71</NoiseMark></MarkEntry>

<MarkEntry><Polarization>RIGHT</Polarization><SkyFrequency>7700.0</SkyFrequency><NoiseMark>5.71</NoiseMark></MarkEntry>

				LCoeffs= "31.593 -0.0023"

				RCoeffs= "32.764 -0.0023"

				>



</NoiseMarkLookUpTable>
 
 No newline at end of file

Medicina/Configuration/CDB/alma/RECEIVERS/MedicinaCBand/MedicinaCBand.xml

+4 −1
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ 
				CCCNArrowSetup= "DataBlock/MedicinaCBand/NarrowBandwidthSetup/CCC"

				CHCNormalSetup= "DataBlock/MedicinaCBand/NormalModeSetup/CHC"

				CHCNarrowSetup= "DataBlock/MedicinaCBand/NarrowBandwidthSetup/CHC"

				

				CCCNormalNoiseMark= "DataBlock/MedicinaCBand/NoiseMark/CCC"

				CCCNarrowNoiseMark= "DataBlock/MedicinaCBand/NoiseMark/CCC"

				CHCNormalNoiseMark= "DataBlock/MedicinaCBand/NoiseMark/CHC"

				CHCNarrowNoiseMark= "DataBlock/MedicinaCBand/NoiseMark/CHC"

>

			<LO description="Sequence of local oscillator values for each IF chain"/>

			<feeds description="Number of feeds of the receiver"/>

Medicina/Servers/MedicinaCBand/include/Configuration.h

+72 −20
Original line number Diff line number Diff line
@@ -60,22 +60,6 @@ public: 
        ACS::Time timestamp;

	} BoardValue;



	/**

	 * @brief Setup parmaters collector

	 */

	struct SetupParams{

		DWORD m_IFs;

		DWORD m_feeds;

		std::vector<double> m_RFMin;

		std::vector<double> m_RFMax;

		std::vector<double> m_IFMin;

		std::vector<double> m_IFBandwidth;		

		std::vector<Receivers::TPolarization> m_polarizations;		

		std::vector<double> m_defaultLO;

		std::vector<double> m_fixedLO2;

		std::vector<double> m_LOMin;

		std::vector<double> m_LOMax;

	};



	/**

	 * Default constructor
@@ -257,6 +241,48 @@ public: 
	void init(maci::ContainerServices *Services)  throw (ComponentErrors::CDBAccessExImpl,ComponentErrors::MemoryAllocationExImpl);

	

private:



	/**

	 * @brief Read setup configuration from file

	 * @details Setup conf. example params

				Mode="NORMAL"

				RFMin="4300.0 4300.0"

				RFMax="5800.0 5800.0"

				IFMin="100.0 100.0"

				IFBandwidth="400.0 400.0"

				Feeds="1"

				IFs="2"

				Polarization="L R"

				DefaultLO="4600.0 4600.0"

				FixedLO2="2300.0 2300.0"

				LOMin="4200.0 4200.0"

				LOMax="5500.0 5500.0"	 

	 * @param[in] p_conf_path configuration file path

	 * @param[out] p_params_out Read conf params	 

	 */

	void readConfigurationSetup(const IRA::CString & p_conf_path, SetupParams & p_params_out )  throw (ComponentErrors::CDBAccessExImpl);



	/**

	 * @brief Read noise mark polynomial coefficient from file

	 * @details NoiseMark DataBlock carries polynomial calcultaion coefficients

	 * 	E.g.:  NMtemp= C0 + C1*Fin	 

	 * @param[in] p_conf_path file path

	 * @param[out] p_params_out Read conf params	 

	 */

	void readNoiseMarkPoly(const IRA::CString & p_conf_path, SetupParams & p_params_out) throw (ComponentErrors::CDBAccessExImpl);



	/**

	 * @brief Feed coordinates readings

	 */

	void readFeeds() throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl);



	/**

	 * @brief Taper values readings

	 */

	void readTaper() throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl);



private:



	IRA::CString m_dewarIPAddress;

	WORD m_dewarPort;

	IRA::CString m_LNAIPAddress;
@@ -266,13 +292,40 @@ private: 
	DDWORD m_LNASamplingTime;

	DDWORD m_repetitionCacheTime;

	DDWORD m_repetitionExpireTime;



	IRA::CString m_localOscillatorInstance1st; /**< 1st stage mixer component instance name */

	IRA::CString m_localOscillatorInstance2nd; /**< 2nd stage mixer component instance name */



	std::map<IRA::CString, IRA::CString> m_conf_files;	/**< Map known allowed configurations - configuration files */ 

	/**

	 * @brief Configuration file path container struct

	 */

	struct ConfigurationFiles{

		IRA::CString m_setup;		/**< General setup xml conf file path */ 

		IRA::CString m_noise_mark;  /**< Noise mark xml conf file path */

	};



	/**

	 * @brief Setup configuration parameters

	 */

	struct SetupParams{

		DWORD m_IFs;

		DWORD m_feeds;

		std::vector<Receivers::TPolarization> m_polarizations;		

		std::vector<double> m_RFMin;

		std::vector<double> m_RFMax;

		std::vector<double> m_IFMin;

		std::vector<double> m_IFBandwidth;			

		std::vector<double> m_defaultLO;

		std::vector<double> m_fixedLO2;

		std::vector<double> m_LOMin;

		std::vector<double> m_LOMax;

		std::vector<double> m_noise_mark_lcp_coeffs; /**< Noise mark polynomial coeff. left pol. */		

		std::vector<double> m_noise_mark_rcp_coeffs; /**< Noise mark polynomial coeff. right pol. */		

	};



	std::map<IRA::CString, ConfigurationFiles > m_conf_files;			/**< Map known allowed configurations - setup configuration files */ 

	std::map<IRA::CString, SetupParams> m_conf_param; 			/**< Map configuration name - parameters */ 

	

	IRA::CDBTable *m_markTable;

	IRA::CDBTable *m_loTable;

	IRA::CDBTable *m_taperTable;

	IRA::CDBTable *m_feedsTable;
@@ -286,5 +339,4 @@ private: 
	TFeedValue * m_feedVector; // length given by m_feeds

};





#endif

Medicina/Servers/MedicinaCBand/src/Configuration.cpp

+304 −346

File changed.

Preview size limit exceeded, changes collapsed.