Commit 657301c7 authored by TheDebbio's avatar TheDebbio
Browse files

sistemazione getLO, test 1

parent e5c70556

Medicina/Configuration/CDB/alma/BACKENDS/TotalPower/TotalPower.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               DataPort="6001"

               DataIPAddress="192.168.51.100"            	   

               DataIPAddress="192.168.51.105"            	   

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

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

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
				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"   

				DewarIPAddress="192.168.51.2"

				DewarPort="10002"

				LNAIPAddress="192.168.51.2"

				LNAPort="10003"		

				DewarIPAddress="192.168.51.55"

				DewarPort="5002"

				LNAIPAddress="192.168.51.62"

				LNAPort="5002"		

				WatchDogResponseTime="400000"

				WatchDogSleepTime="500000"

				LNASamplingTime="250000"

Medicina/Servers/MedicinaCBand/include/ComponentCore.h

+8 −0
Original line number Diff line number Diff line
@@ -144,12 +144,20 @@ public: 
     * @thorw ReceiversErrors::LocalOscillatorErrorExImpl

     */

    void setLO(const ACS::doubleSeq& lo) throw (ReceiversErrors::ReceiversErrorsExImpl,ComponentErrors::ComponentErrorsExImpl);



    /**

     * It returns back the current local oscillator frequency settings.

     * @param lo output sequence

     */

    void getLO(ACS::doubleSeq& lo) throw (ReceiversErrors::LocalOscillatorErrorExImpl);



    /**

     * It returns back the current local oscillator frequency settings taking into account double stage frequency calc

     * @param lo output sequence

     */

    void getEffectiveLO(ACS::doubleSeq& lo) throw (ReceiversErrors::LocalOscillatorErrorExImpl);





    /**

     * I checks if the local oscillator is locked properly

     */

Medicina/Servers/MedicinaCBand/include/DevIOLocalOscillator.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public: 
	ACS::doubleSeq read(ACS::Time& timestamp) throw (ACSErr::ACSbaseExImpl)

	{

		try{

			m_pCore->getLO(m_val);					

			m_pCore->getEffectiveLO(m_val);					

		}catch(...){

			AUTO_TRACE("DevIOLocalOscillator::read() - Error getting Value");			

		}

Medicina/Servers/MedicinaCBand/src/ComponentCore.cpp

+16 −1
Original line number Diff line number Diff line
@@ -365,7 +365,22 @@ void CComponentCore::setLO(const ACS::doubleSeq& lo) 
void CComponentCore::getLO(ACS::doubleSeq& lo) throw (ReceiversErrors::LocalOscillatorErrorExImpl)

{

    baci::ThreadSyncGuard guard(&m_mutex);    

    lo[0]= m_mixer.getValue();    

    lo.length(m_configuration.getIFs());

    int i=0;

    for(i=0; i< m_configuration.getIFs(); i++){

        lo[i]= m_mixer.getValue();    

    }

}





void CComponentCore::getEffectiveLO(ACS::doubleSeq& lo) throw (ReceiversErrors::LocalOscillatorErrorExImpl)

{

    baci::ThreadSyncGuard guard(&m_mutex);

    lo.length(m_configuration.getIFs());

    int i=0;

    for(i=0; i< m_configuration.getIFs(); i++){

        lo[i]= m_mixer.getEffectiveValue();

    }

}



void CComponentCore::checkLocalOscillator() throw (ComponentErrors::CORBAProblemExImpl,ComponentErrors::CouldntGetAttributeExImpl)