Fix #376, update SRT configuration for L band (#384) (11852857) · Commits · INAF / DISCOS

Common/Servers/Sardara/include/CommandLine.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,7 @@ private:

		ContainerServices* m_services;
		Backends::TotalPower_var m_totalPower;
		Receivers::GenericIFDistributor_var m_ifDistributor;
		//Receivers::GenericIFDistributor_var m_ifDistributor;

		/**
		* List the fields of the backend status

Common/Servers/Sardara/src/CommandLine.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ void CCommandLine::Init(CConfiguration *config) throw (ComponentErrors::SocketEr
		throw Impl;
		}

		m_ifDistributor = Receivers::GenericIFDistributor::_nil();
		/*m_ifDistributor = Receivers::GenericIFDistributor::_nil();
		try {
		m_ifDistributor = m_services->getComponent<Receivers::GenericIFDistributor>("RECEIVERS/SRTIFDistributor");
		}
		@@ -148,7 +148,7 @@ void CCommandLine::Init(CConfiguration *config) throw (ComponentErrors::SocketEr
		_ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,"CCommadLine::Init()");
		Impl.setComponentName("RECEIVERS/SRTIFDistributor");
		throw Impl;
		}
		}*/

		char *Station;
		IRA::CString cStation;
		@@ -519,7 +519,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const
		}
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"TOTALPOWER_FILTER_CONFIGURED %ld,FILTER=%lf",inputId,filter));
		}
		if ((m_SL00==true \|\| m_SL00S==true) && m_stationSRT == true) {
		/*if ((m_SL00==true \|\| m_SL00S==true) && m_stationSRT == true) {
		try {
		if (newBW==128.00) {
		m_ifDistributor->setup("BW-NARROW");
		@@ -542,7 +542,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()");
		impl.log(LM_ERROR);
		}
		}
		}*/
		}
		}
		catch (...) {
		@@ -773,10 +773,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C
		m_inputsNumber=m_sectionsNumber;
		m_SL00=true;
		m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false;
		if (m_stationSRT == true) {
		/*if (m_stationSRT == true) {
		m_ifDistributor->setup("BW-UNFILTERED");
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED"));
		}
		}*/
		}
		if (config.Compare("SP00")==0) {
		m_filter = 730.0;
		@@ -825,10 +825,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C
		m_sectionsNumber=m_sectionsNumber/2;
		m_SL00S=true;
		m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SP00S=false;
		if (m_stationSRT == true) {
		/*if (m_stationSRT == true) {
		m_ifDistributor->setup("BW-UNFILTERED");
		ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED"));
		}
		}*/
		}
		if (config.Compare("SP00S")==0) {
		m_filter = 730.0;

Common/Servers/Scheduler/src/Core.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors::
		// no range checks because * is allowed
		m_parser->add("skydip",new function3<CCore,non_constant,void_type,I<elevation_type<rad,false> >,I<elevation_type<rad,false> >,I<interval_type> >(this,&CCore::skydip),3);
		m_parser->add("agc","_tp_agc",2,"NONE");
		m_parser->add("ifd","_ifd",1,"SRT");
		// m_parser->add("ifd","_ifd",1,"SRT");
		m_parser->add("restFrequency",new function1<CCore,non_constant,void_type,I<doubleSeq_type> >(this,&CCore::_setRestFrequency),1);
		m_parser->add("fTrack",new function1<CCore,non_constant,void_type,I<string_type> >(this,&CCore::_fTrack),1);
		m_parser->add("peaker",new function3<CCore,non_constant,void_type,I<string_type>,I<double_type>,I<interval_type> >(this,&CCore::_peaker),3);

SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -5,18 +5,18 @@
		xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

		<SynthesizerEntry><Frequency>0.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>0.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>400.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>400.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>800.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>800.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>1200.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>1200.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>1600.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>1600.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>2000.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>2000.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		<SynthesizerEntry><Frequency>2400.0</Frequency><OutputPower>13.0</OutputPower></SynthesizerEntry>
		<SynthesizerEntry><Frequency>2400.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>

		</LocalOscillatorLookUpTable>

SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		RepetitionExpireTime="10000000"
		ReceiverName="SRTLPBand"
		DefaultMode="L3L4"
		LocalOscillatorInstance="RECEIVERS/SRTIFDistributor"
		LocalOscillatorInstance="RECEIVERS/LO_LP"
		>
		<LO description="Sequence of local oscillator values for each IF chain" />
		<feeds description="Number of feeds of the receiver" />