mods + make (3adcb881) · Commits · INAF / DISCOS

Medicina/Servers/MedicinaCBand/include/Defs.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,9 +22,11 @@

		#ifdef MED_DEBUG_LVL
		#include <cstdio>
		#define MED_TRACE() do { fprintf(stderr, "%s:%d:%s() \n", __FILE__, __LINE__, __func__); } while(0);
		#define MED_TRACE() do { fprintf(stderr, "MED_LOG %s:%d:%s() \n", __FILE__, __LINE__, __func__); } while(0);
		#define MED_TRACE_MSG(msg) do { fprintf(stderr, "MED_LOG %s:%d:%s() - %s \n", __FILE__, __LINE__, __func__, msg); } while(0);
		#else
		#define MED_TRACE()
		#define MED_TRACE_MSG(msg) do { } while(0);
		#endif

		/*

Medicina/Servers/MedicinaCBand/src/ComponentCore.cpp

+7 −3

Original line number	Diff line number	Diff line
		@@ -37,13 +37,14 @@ void CComponentCore::initialize(maci::ContainerServices* services)

		CConfiguration const * const CComponentCore::execute() throw (ComponentErrors::CDBAccessExImpl,ComponentErrors::MemoryAllocationExImpl,ComponentErrors::SocketErrorExImpl)
		{
		MED_TRACE();
		MED_TRACE_MSG(" IN ");
		/*
		* This Call sets default Recevier Configuration at CCC_Normal
		* User has to call for Activate() and setupMode() to be more specific about receiver conf
		*/
		m_configuration.init(m_services); //throw (ComponentErrors::CDBAccessExImpl);
		try {
		MED_TRACE_MSG(" Receiver new ");
		m_control=new IRA::ReceiverControl(
		(const char *)m_configuration.getDewarIPAddress(),
		m_configuration.getDewarPort(),
		@@ -52,6 +53,7 @@ CConfiguration const * const CComponentCore::execute() throw (ComponentErrors::
		m_configuration.getLNASamplingTime(),
		m_configuration.getFeeds()
		);
		MED_TRACE_MSG(" Receiver new done");
		}
		catch (std::bad_alloc& ex) {
		_EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"CComponentCore::execute()");
		@@ -61,7 +63,7 @@ CConfiguration const * const CComponentCore::execute() throw (ComponentErrors::
		_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CComponentCore::execute()");
		throw dummy;
		}
		MED_TRACE();
		MED_TRACE_MSG(" OUT ");
		return &m_configuration;
		}

		@@ -170,6 +172,7 @@ const Management::TSystemStatus& CComponentCore::getComponentStatus()
		void CComponentCore::setMode(const char * mode) throw (ReceiversErrors::ModeErrorExImpl,ComponentErrors::ValidationErrorExImpl,ComponentErrors::ValueOutofRangeExImpl,
		ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::LocalOscillatorErrorExImpl)
		{
		MED_TRACE_MSG(" IN ");
		baci::ThreadSyncGuard guard(&m_mutex);
		IRA::CString cmdMode(mode);
		cmdMode.MakeUpper();
		@@ -193,6 +196,7 @@ void CComponentCore::setMode(const char * mode) throw (ReceiversErrors::ModeErro
		setLO(lo); // throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::ValueOutofRangeExImpl,ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::LocalOscillatorErrorExImpl)
		m_calDiode=false;
		ACS_LOG(LM_FULL_INFO,"CComponentCore::setMode()",(LM_NOTICE,"RECEIVER_MODE %s",mode));
		MED_TRACE_MSG(" OUT ");
		}

		const IRA::CString CComponentCore::getSetupMode()

Medicina/Servers/MedicinaCBand/src/Configuration.cpp

+24 −4

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ void CConfiguration::init(maci::ContainerServices *Services)
		* * CHC NarrowBw.
		* * CCC NarrowBw.
		*/
		MED_TRACE();
		MED_TRACE_MSG(" IN ");
		m_service= Services;
		/* read component configuration */
		_GET_STRING_ATTRIBUTE("DewarIPAddress","Dewar IP address:",m_dewarIPAddress,"");
		@@ -126,7 +126,7 @@ void CConfiguration::init(maci::ContainerServices *Services)
		readFeeds();
		/* Taper */
		readTaper();
		MED_TRACE();
		MED_TRACE_MSG(" OUT ");
		}

		/* * TABLES * */
		@@ -228,6 +228,9 @@ void CConfiguration::readConfigurationSetup(const IRA::CString & p_conf_path,
		ReceiverConfHandler::ConfigurationSetup & p_conf_setup)
		throw (ComponentErrors::CDBAccessExImpl)
		{
		MED_TRACE_MSG("IN");
		const char * l_app= p_conf_path;
		MED_TRACE_MSG(l_app);
		_GET_DWORD_ATTRIBUTE("Feeds","Number of feeds:", p_conf_setup.m_feeds, p_conf_path) ;
		_GET_DWORD_ATTRIBUTE("IFs","Number of IFs per feed:",p_conf_setup.m_IFs, p_conf_path);
		/* Read polarization token, string splitted by ' '
		@@ -348,32 +351,42 @@ void CConfiguration::readConfigurationSetup(const IRA::CString & p_conf_path,
		}
		p_conf_setup.m_LOMax.push_back(l_token.ToDouble());
		}
		MED_TRACE_MSG("OUT");
		}

		void CConfiguration::readNoiseMarkPoly(const IRA::CString & p_conf_path,
		ReceiverConfHandler::ConfigurationSetup & p_conf_setup)
		throw (ComponentErrors::CDBAccessExImpl)
		{
		MED_TRACE_MSG("IN");
		/* Nois mark is bound to receiver configuration */
		IRA::CError l_error;
		IRA::CString l_field, l_value, l_token;
		/* Collecting LCP "C0 C1 .."" coefficients from appropriate configuration file */
		int l_start=0;
		_GET_STRING_ATTRIBUTE("LCoeffs","LCP noise mark poly coefficients :", l_value, p_conf_path);
		while(!IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){
		while(IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){
		p_conf_setup.m_noise_mark_lcp_coeffs.push_back(l_token.ToDouble());
		}
		/* wo token convert string to value */
		if (!l_start)
		p_conf_setup.m_noise_mark_lcp_coeffs.push_back(l_value.ToDouble());
		/* Collecting RCP "C0 C1 .."" coefficients from appropriate configuration file */
		/* wo token convert string to value */
		if (!l_start)
		p_conf_setup.m_noise_mark_lcp_coeffs.push_back(l_value.ToDouble());
		l_start=0;
		_GET_STRING_ATTRIBUTE("RCoeffs","RCP noise mark poly coefficients :", l_value, p_conf_path);
		while(!IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){
		while(IRA::CIRATools::getNextToken(l_value, l_start, ' ', l_token)){
		p_conf_setup.m_noise_mark_rcp_coeffs.push_back(l_token.ToDouble());
		}
		MED_TRACE_MSG("OUT");
		}

		void CConfiguration::readFeeds()
		throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl)
		{
		MED_TRACE_MSG("IN");
		/* Local feed table */
		IRA::CDBTable m_feedsTable; /< Helper reading xml feeds table /
		IRA::CError l_error;
		@@ -437,11 +450,13 @@ void CConfiguration::readFeeds()
		m_feedsTable->closeTable();
		delete m_feedsTable;
		m_feedsTable=NULL;
		MED_TRACE_MSG("OUT");
		}

		void CConfiguration::readTaper()
		throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl)
		{
		MED_TRACE_MSG("IN");
		IRA::CDBTable * l_taper_table;
		IRA::CError l_error;
		IRA::CString l_field;
		@@ -486,21 +501,25 @@ void CConfiguration::readTaper()
		l_taper_table->closeTable();
		delete l_taper_table;
		l_taper_table=NULL;
		MED_TRACE_MSG("OUT");
		}

		void CConfiguration::readSynths()
		throw (ComponentErrors::CDBAccessExImpl,
		ComponentErrors::MemoryAllocationExImpl)
		{
		MED_TRACE_MSG("IN");
		/* SYNTHs */
		ReceiverConfHandler::ConfigurationAccess l_access= m_conf_hnd.getCurrentAccess();
		readSyntTable(m_synt_table_1st, l_access.m_synth_1_file_path);
		readSyntTable(m_synt_table_2nd, l_access.m_synth_2_file_path);
		MED_TRACE_MSG("OUT");
		}

		void CConfiguration::readSyntTable(std::vector<TLOValue> & p_synt_table, IRA::CString p_table_file)
		throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl)
		{
		MED_TRACE_MSG("IN");
		/* file table reading */
		IRA::CDBTable * m_loTable;
		IRA::CError l_error;
		@@ -542,4 +561,5 @@ void CConfiguration::readSyntTable(std::vector<TLOValue> & p_synt_table, IRA::CS
		m_loTable->closeTable();
		delete m_loTable;
		m_loTable=NULL;
		MED_TRACE_MSG("OUT");
		}
		No newline at end of file

Medicina/Servers/MedicinaCBand/src/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		#
		# user definable C-compilation flags
		USER_CFLAGS = -DMED_DEBUG_LVL
		USER_CFLAGS = -DMED_DEBUG_LVL -DEXCLUDE_MIXER -DEXCLUDE_MONITOR

		#
		# additional include and library search paths

Medicina/Servers/MedicinaCBand/src/MedicinaCBandImpl.cpp

+12 −6

Original line number	Diff line number	Diff line
		@@ -37,18 +37,18 @@ MedicinaCBandImpl::~MedicinaCBandImpl()

		void MedicinaCBandImpl::initialize() throw (ACSErr::ACSbaseExImpl)
		{
		MED_TRACE();
		MED_TRACE_MSG(" IN ");
		AUTO_TRACE("MedicinaCBandImpl::initialize()");
		ACS_LOG(LM_FULL_INFO,"MedicinaCBandImpl::initialize()",(LM_INFO,"MedicinaCBandImpl::COMPSTATE_INITIALIZING"));
		m_core.initialize(getContainerServices());
		m_monitor=NULL;
		ACS_LOG(LM_FULL_INFO,"MedicinaCBandImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZED"));

		MED_TRACE_MSG(" OUT ");
		}

		void MedicinaCBandImpl::execute() throw (ACSErr::ACSbaseExImpl)
		{

		MED_TRACE_MSG(" IN ");
		AUTO_TRACE("MedicinaCBandImpl::execute()");
		ACS::Time timestamp;
		const CConfiguration *config=m_core.execute(); //throw (ComponentErrors::CDBAccessExImpl,ComponentErrors::MemoryAllocationExImpl,ComponentErrors::SocketErrorExImpl)
		@@ -84,7 +84,7 @@ void MedicinaCBandImpl::execute() throw (ACSErr::ACSbaseExImpl)
		CComponentCore *temp=&m_core;
		try {
		m_monitor=getContainerServices()->getThreadManager()->create<CMonitorThread,CComponentCore*> (
		"WHATCHDOG7GHZ",temp,config->getWarchDogResponseTime()10,config->getWatchDogSleepTime()10);
		"WHATCHDOG_MEDCBAND",temp,config->getWarchDogResponseTime()10,config->getWatchDogSleepTime()10);
		}
		catch (acsthreadErrType::acsthreadErrTypeExImpl& ex) {
		_ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,_dummy,ex,"MedicinaCBandImpl::execute()");
		@@ -108,7 +108,7 @@ void MedicinaCBandImpl::execute() throw (ACSErr::ACSbaseExImpl)
		throw __dummy;
		}
		ACS_LOG(LM_FULL_INFO,"MedicinaCBandImpl::execute()",(LM_INFO,"COMPSTATE_OPERATIONAL"));

		MED_TRACE_MSG(" OUT ");
		}

		void MedicinaCBandImpl::cleanUp()
		@@ -137,6 +137,7 @@ void MedicinaCBandImpl::aboutToAbort()

		void MedicinaCBandImpl::activate(const char * setup_mode) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{
		MED_TRACE();
		try {
		m_core.activate(setup_mode);
		}
		@@ -153,10 +154,12 @@ void MedicinaCBandImpl::activate(const char * setup_mode) throw (CORBA::SystemEx
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		MED_TRACE();
		}

		void MedicinaCBandImpl::deactivate() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{
		MED_TRACE();
		try {
		m_core.deactivate();
		}
		@@ -173,6 +176,7 @@ void MedicinaCBandImpl::deactivate() throw (CORBA::SystemException,ComponentErro
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		MED_TRACE();
		}

		void MedicinaCBandImpl::calOn() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		@@ -287,6 +291,7 @@ void MedicinaCBandImpl::setLO(const ACS::doubleSeq& lo) throw (CORBA::SystemExce

		void MedicinaCBandImpl::setMode(const char * mode) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
		{
		MED_TRACE_MSG(" IN ");
		try {
		m_core.setMode(mode);
		}
		@@ -303,6 +308,7 @@ void MedicinaCBandImpl::setMode(const char * mode) throw (CORBA::SystemException
		impl.log(LM_DEBUG);
		throw impl.getComponentErrorsEx();
		}
		MED_TRACE_MSG(" OUT ");
		}

		ACS::doubleSeq *MedicinaCBandImpl::getCalibrationMark(const ACS::doubleSeq& freqs, const ACS::doubleSeq& bandwidths, const ACS::longSeq& feeds,const ACS::longSeq& ifs,