Commit 0e29d6a3 authored by SRT Operator's avatar SRT Operator
Browse files

modified XK00 and XC00 initialization

parent ca0f1cc0

Common/Servers/XBackend/include/CommandLine.h

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public: 
	 * Call this function in order to get the number of bins for each input. 

	 */	

	void getFeed(ACS::longSeq& feed) const;	

    void setFeedC();

    void setFeedZero();

	/**

	 * Call this function in order to get the polarization for each input. 

	 */
@@ -611,6 +611,7 @@ public: 
    	void setMode8BitParameter(bool mode) {m_mode8bit=mode;}



	bool m_XarcosC;

	bool m_XarcosK00;

};



#endif /*_COMMANDLINE_H_*/

Common/Servers/XBackend/src/CommandLine.cpp

+12 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ m_GroupSpectrometer(groupS) 
	m_pcontrolLoop=NULL;

    start = true;

	m_XarcosC = false;

	m_XarcosK00 = false;

}



CCommandLine::~CCommandLine()
@@ -754,7 +755,7 @@ void CCommandLine::getFeed(ACS::longSeq& feed) const 
	}

}



void CCommandLine::setFeedC() {

void CCommandLine::setFeedZero() {

    m_feedNumber[0]=0;

	m_feedNumberInput[0]=0;

    m_feedNumber[1]=0;
@@ -763,9 +764,13 @@ void CCommandLine::setFeedC() { 
	m_feedNumberInput[2]=0;

    m_feedNumber[3]=0;

	m_feedNumberInput[3]=0;

    m_feedNumber[4]=0;

	m_feedNumberInput[4]=0;

    m_feedNumber[5]=0;

	m_feedNumberInput[5]=0;

    m_feedNumber[6]=0;

	m_feedNumberInput[6]=0;

    m_feedNumber[7]=0;

	m_feedNumberInput[7]=0;

}
@@ -1340,7 +1345,9 @@ AUTO_TRACE("CCommandLine::setMode8bit()"); 
		IRA::CIRATools::Wait(0,100000);

		setSection(3,176.005859375,0.48828125,1,2,0.9765625,-1);

		IRA::CIRATools::Wait(0,100000);

	    setFeedZero();

        m_XarcosC=false;

        m_XarcosK00=true;

    }

    else if (config=="XC00") {

        setMode8bit(true);
@@ -1354,8 +1361,9 @@ AUTO_TRACE("CCommandLine::setMode8bit()"); 
		IRA::CIRATools::Wait(0,100000);

		setSection(3,176.005859375,0.48828125,1,2,0.9765625,-1);

		IRA::CIRATools::Wait(0,100000);

	    setFeedC();

	    setFeedZero();

		m_XarcosC=true;

		m_XarcosK00=false;

    }

    else

        return false;
@@ -1375,8 +1383,8 @@ void CCommandLine::setSection(const long& input,const double& freq,const double& 
	setAttenuation(input,-1);

    Init();//Configurazione nell'HW 

	getConfiguration();

    if (m_XarcosC == true)

        setFeedC();

    if (m_XarcosC == true || m_XarcosK00 == true)

        setFeedZero();

}



void CCommandLine::getTsys(ACS::doubleSeq& tsys) const

Common/Servers/XBackend/src/XBackendsImpl.cpp

+8 −5
Original line number Diff line number Diff line
@@ -608,8 +608,8 @@ void XBackendsImpl::setSection(CORBA::Long input,CORBA::Double freq,CORBA::Doubl 
		dummy.log(LM_DEBUG);

		throw dummy.getComponentErrorsEx();

	}

	if (line->m_XarcosC == true)

		line->setFeedC();		

	if (line->m_XarcosC == true || line->m_XarcosK00 == true)

		line->setFeedZero();

}



ACS::doubleSeq *XBackendsImpl::getTpi ()
@@ -1080,7 +1080,9 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst 
			IRA::CIRATools::Wait(0,100000);

			setSection(3,176.005859375,0.48828125,1,2,0.9765625,-1);

			IRA::CIRATools::Wait(0,100000);

		   	line->setFeedZero();

           	line->m_XarcosC=false;

           	line->m_XarcosK00=true;

			break;

		case (Backends::XArcos_C00): // XC00

			setMode8bit(true);
@@ -1094,8 +1096,9 @@ void XBackendsImpl::setXarcosConf(Backends::TXArcosConf conf) throw (CORBA::Syst 
			IRA::CIRATools::Wait(0,100000);

			setSection(3,176.005859375,0.48828125,1,2,0.9765625,-1);

			IRA::CIRATools::Wait(0,100000);

		    	line->setFeedC();

		   	line->setFeedZero();

           	line->m_XarcosC=true;

           	line->m_XarcosK00=false;

		    	//setMode8bit(true);

			break;

	}