modified freq and bw arrays (3ade13c9) · Commits · INAF / DISCOS

Common/Servers/XBackend/include/CommandLine.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -612,6 +612,7 @@ public:

		bool m_XarcosC;
		bool m_XarcosK00;
		bool m_XarcosK77;
		};

		#endif /_COMMANDLINE_H_/

Common/Servers/XBackend/src/CommandLine.cpp

+23 −8

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ m_GroupSpectrometer(groupS)
		start = true;
		m_XarcosC = false;
		m_XarcosK00 = false;
		m_XarcosK77 = false;
		}

		CCommandLine::~CCommandLine()
		@@ -425,17 +426,27 @@ void CCommandLine::setConfiguration(const long& secId,const double& freq,const d
		temp.Setindex(secId);
		groupS->Xspec.specificaSezione[secId]=temp;
		m_bandWidth[secId]=newBW;
		m_bandWidthInput[secId]=newBW;
		m_bandWidthInput[secId+1]=newBW;
		m_sampleRate[secId]=newSR;
		m_frequency[secId]=newFreq;
		m_frequencyInput[secId]=newFreq;
		m_frequencyInput[secId+1]=newFreq;
		m_bins[secId]=newBins;
		m_feedNumber[secId]=newFd;
		m_polarization[secId]=(Backends::TPolarization)newPol;
		if (m_XarcosK77 == true) {
		m_bandWidthInput[secId]=newBW;
		m_bandWidthInput[secId+1]=newBW;
		m_frequencyInput[secId]=newFreq;
		m_frequencyInput[secId+1]=newFreq;
		m_feedNumberInput[secId]=newFd;
		m_feedNumberInput[secId+1]=newFd;
		m_polarization[secId]=(Backends::TPolarization)newPol;
		}
		else {
		m_bandWidthInput[2*secId]=newBW;
		m_bandWidthInput[2*secId+1]=newBW;
		m_frequencyInput[2*secId]=newFreq;
		m_frequencyInput[2*secId+1]=newFreq;
		m_feedNumberInput[2*secId]=newFd;
		m_feedNumberInput[2*secId+1]=newFd;
		}
		}
		else {
		double oldFreq=-1;
		@@ -889,7 +900,6 @@ void CCommandLine::fillMainHeader(Backends::TMainHeader& bkd)
		//bkd.integration=groupSpec->Xspec.GetTempoIntegrazione();
		bkd.integration=(groupSpec->Xspec.GetTempoIntegrazione())*1000; //integration time value in msec into the fits header
		bkd.sampleSize=SAMPLESIZE;
		bkd.noData=false;
		ACS_LOG(LM_FULL_INFO,"CCommandLine::fillMainHeader",(LM_INFO,"Main_OK"));
		}

		@@ -1307,6 +1317,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()");
		IRA::CIRATools::Wait(0,100000);
		setSection(6,145,62.5,6,2,125,-1);
		m_XarcosC=false;
		m_XarcosK77=true;
		}
		else if (config=="XK06") {
		setMode8bit(true);
		@@ -1320,6 +1331,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()");
		IRA::CIRATools::Wait(0,100000);
		setSection(3,174.296875,3.90625,6,2,7.8125,-1);
		m_XarcosC=false;
		m_XarcosK77=false;
		}
		else if (config=="XK03") {
		setMode8bit(true);
		@@ -1333,6 +1345,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()");
		IRA::CIRATools::Wait(0,100000);
		setSection(3,174.296875,3.90625,2,2,7.8125,-1);
		m_XarcosC=false;
		m_XarcosK77=false;
		}
		else if(config=="XK00") {
		setMode8bit(true);
		@@ -1349,6 +1362,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()");
		setFeedZero();
		m_XarcosC=false;
		m_XarcosK00=true;
		m_XarcosK77=false;
		}
		else if (config=="XC00") {
		setMode8bit(true);
		@@ -1365,6 +1379,7 @@ AUTO_TRACE("CCommandLine::setMode8bit()");
		setFeedZero();
		m_XarcosC=true;
		m_XarcosK00=false;
		m_XarcosK77=false;
		}
		else
		return false;

Common/Servers/XBackend/src/XBackendsImpl.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -695,12 +695,6 @@ void XBackendsImpl::enableChannels(const ACS::longSeq& enable)
		}
		}

		void XBackendsImpl::setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,
		BackendsErrors::BackendsErrorsEx)
		{
		// nothing to do
		}

		void XBackendsImpl::setTime()
		throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx)
		{
		@@ -1046,6 +1040,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst
		IRA::CIRATools::Wait(0,100000);
		setSection(6,145,62.5,6,2,125,-1);
		line->m_XarcosC=false;
		line->m_XarcosK77=true;
		break;
		case (Backends::XArcos_K06): // XK06, CENTRAL FEED & FEED 6
		setMode8bit(true);
		@@ -1059,6 +1054,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst
		IRA::CIRATools::Wait(0,100000);
		setSection(3,174.296875,3.90625,6,2,7.8125,-1);
		line->m_XarcosC=false;
		line->m_XarcosK77=false;
		break;
		case (Backends::XArcos_K03): // XK03, CENTRAL FEED & FEED 3
		setMode8bit(true);
		@@ -1073,6 +1069,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst
		setSection(3,174.296875,2.90625,2,2,7.8125,-1);
		IRA::CIRATools::Wait(0,100000);
		line->m_XarcosC=false;
		line->m_XarcosK77=false;
		break;
		case (Backends::XArcos_K00): // XK00, CENTRAL FEED
		setMode8bit(true);
		@@ -1089,6 +1086,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst
		line->setFeedZero();
		line->m_XarcosC=false;
		line->m_XarcosK00=true;
		line->m_XarcosK77=false;
		break;
		case (Backends::XArcos_C00): // XC00
		setMode8bit(true);
		@@ -1105,6 +1103,7 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst
		line->setFeedZero();
		line->m_XarcosC=true;
		line->m_XarcosK00=false;
		line->m_XarcosK77=false;
		//setMode8bit(true);
		break;
		}