Commit b77b68fb authored by MDB's avatar MDB
Browse files

correzione geteffectivevalue mixer + setlo per ogni fi

parent 657301c7

Medicina/Interfaces/MedicinaReceiversInterface/idl/MedicinaCBand.idl

+2 −2
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ module Receivers { 
         *  The returned pattern is a X bits field with a meaning depending on the implementation.

         *  The returned pattern is a X bits field with a meaning depending on the implementation.

         *  Bits are referring to control flags ( remote or local control ) and cold head status 

         *  Bits are referring to control flags ( remote or local control ) and cold head status 

         */

         */

        readonly attribute ACS::ROpattern cryoStatus;                 

        //readonly attribute ACS::ROpattern cryoStatus;                 

        

        

        /**

        /**

         * Cryogenic temperature of the Low Noise Amplifier. Approximately 20K

         * Cryogenic temperature of the Low Noise Amplifier. Approximately 20K
@@ -110,7 +110,7 @@ module Receivers { 
         *  The returned pattern is a X bits field with a meaning depending on the implementation.

         *  The returned pattern is a X bits field with a meaning depending on the implementation.

         *  Bits are referring to vacuum status (working, failure ...)

         *  Bits are referring to vacuum status (working, failure ...)

         */

         */

        readonly attribute ACS::ROpattern vacuumStatus;

        //readonly attribute ACS::ROpattern vacuumStatus;





        /** 

        /** 

         * It allows to turn the vacuum sensor on. The vacuum sensor is necessary to have a correct measurment of the vacuum characteristic. 

         * It allows to turn the vacuum sensor on. The vacuum sensor is necessary to have a correct measurment of the vacuum characteristic.

Medicina/Servers/MedicinaCBand/include/MedicinaCBandImpl.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -482,8 +482,8 @@ private: 
	baci::SmartPropertyPointer<baci::ROdouble> m_pId_2;

	baci::SmartPropertyPointer<baci::ROdouble> m_pId_2;

	baci::SmartPropertyPointer<baci::ROdouble> m_pVg_1;

	baci::SmartPropertyPointer<baci::ROdouble> m_pVg_1;

	baci::SmartPropertyPointer<baci::ROdouble> m_pVg_2;

	baci::SmartPropertyPointer<baci::ROdouble> m_pVg_2;

	baci::SmartPropertyPointer<baci::ROpattern> m_vacuum_status;

	//baci::SmartPropertyPointer<baci::ROpattern> m_vacuum_status;

	baci::SmartPropertyPointer<baci::ROpattern> m_cryo_status;	

	//baci::SmartPropertyPointer<baci::ROpattern> m_cryo_status;	

	baci::SmartPropertyPointer<baci::ROdouble> m_env_temp;

	baci::SmartPropertyPointer<baci::ROdouble> m_env_temp;

	baci::SmartPropertyPointer<baci::ROdouble> m_shield_temp;	

	baci::SmartPropertyPointer<baci::ROdouble> m_shield_temp;	

	baci::SmartPropertyPointer<baci::ROdouble> m_lna_temp;		

	baci::SmartPropertyPointer<baci::ROdouble> m_lna_temp;

Medicina/Servers/MedicinaCBand/src/ComponentCore.cpp

+20 −18
Original line number Original line Diff line number Diff line
@@ -339,25 +339,27 @@ void CComponentCore::setLO(const ACS::doubleSeq& lo) 
    ReceiverConfHandler::ConfigurationSetup l_setup;

    ReceiverConfHandler::ConfigurationSetup l_setup;





    m_mixer.setValue(lo);           

    m_mixer.setValue(lo);           

    l_lo_value= m_mixer.getValue();    

    l_lo_value= m_mixer.getEffectiveValue();    

    l_setup= m_configuration.getCurrentSetup();	   

    l_setup= m_configuration.getCurrentSetup();	   



    /* For every IF */

    for (int i=0; i < l_setup.m_IFs ;i++) {

        try{        

        try{        

            /* TEST */

            /* TEST */

        MED_TRACE_FMT("m_IFBandwidth[0] : %f\n", l_setup.m_IFBandwidth[0]);

            MED_TRACE_FMT("m_IFBandwidth[%d] : %f\n",i, l_setup.m_IFBandwidth[i]);

        MED_TRACE_FMT("m_rfmax[0] : %f\n", l_setup.m_RFMax[0]);    

            MED_TRACE_FMT("m_rfmax[%d] : %f\n",i, l_setup.m_RFMax[i]);    

        MED_TRACE_FMT("lo_value : %f\n", l_lo_value);

            MED_TRACE_FMT("lo_value : %f\n",i, l_lo_value);

        MED_TRACE_FMT("m_startfreq[0] : %f\n", m_startFreq[0]);        

            MED_TRACE_FMT("m_startfreq[%d] : %f\n",i, m_startFreq[i]);        

        m_bandwidth[0]= l_setup.m_RFMax[0]-( m_startFreq[0] + l_lo_value );        

            m_bandwidth[i]= l_setup.m_RFMax[i]-( m_startFreq[i] + l_lo_value );        

            // the if bandwidth could never be larger than the max IF bandwidth:

            // the if bandwidth could never be larger than the max IF bandwidth:

        if (m_bandwidth[0] > l_setup.m_IFBandwidth[0])

            if (m_bandwidth[i] > l_setup.m_IFBandwidth[i])

            m_bandwidth[0]= l_setup.m_IFBandwidth[0];        

                m_bandwidth[i]= l_setup.m_IFBandwidth[i];        

        MED_TRACE_FMT( "m_bandwidth[0] : %f", m_bandwidth[0]);

            MED_TRACE_FMT( "m_bandwidth[%d] : %f", i, m_bandwidth[i]);

        }catch(...){

        }catch(...){

            _IRA_LOGFILTER_LOG(LM_CRITICAL,"CComponentCore::setLO()","ReceiverControl allocation error");

            _IRA_LOGFILTER_LOG(LM_CRITICAL,"CComponentCore::setLO()","ReceiverControl allocation error");

            _EXCPT(ReceiversErrors::ModeErrorExImpl,impl,"CComponentCore::setLO()");

            _EXCPT(ReceiversErrors::ModeErrorExImpl,impl,"CComponentCore::setLO()");

            throw impl;          

            throw impl;          

        }

        }

    }

    ACS_LOG(LM_FULL_INFO,"CComponentCore::setLO()",(LM_NOTICE,"LOCAL_OSCILLATOR %lf",l_lo_value));

    ACS_LOG(LM_FULL_INFO,"CComponentCore::setLO()",(LM_NOTICE,"LOCAL_OSCILLATOR %lf",l_lo_value));

	MED_TRACE_MSG(" OUT ");

	MED_TRACE_MSG(" OUT ");

}

}
@@ -669,7 +671,7 @@ void CComponentCore::getCalibrationMark(ACS::doubleSeq& result, 
                realBw=0.0;

                realBw=0.0;

        }

        }

        ACS_LOG(LM_FULL_INFO,"CComponentCore::getCalibrationMark()",(LM_DEBUG,"SUB_BAND %lf %lf",realFreq,realBw));

        ACS_LOG(LM_FULL_INFO,"CComponentCore::getCalibrationMark()",(LM_DEBUG,"SUB_BAND %lf %lf",realFreq,realBw));

        realFreq+=m_mixer.getValue();

        realFreq+=m_mixer.getEffectiveValue();

        resFreq[i]=realFreq;

        resFreq[i]=realFreq;

        resBw[i]=realBw;

        resBw[i]=realBw;

        realFreq+=realBw/2.0;

        realFreq+=realBw/2.0;

Medicina/Servers/MedicinaCBand/src/MedicinaCBandImpl.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -762,8 +762,8 @@ _PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pId_1,Id_1); 
_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pId_2,Id_2);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pId_2,Id_2);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pVg_1,Vg_1);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pVg_1,Vg_1);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pVg_2,Vg_2);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_pVg_2,Vg_2);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROpattern,m_vacuum_status, vacuumStatus);

//_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROpattern,m_vacuum_status, vacuumStatus);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROpattern,m_cryo_status, cryoStatus);

//_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROpattern,m_cryo_status, cryoStatus);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_env_temp, environmentTemperature);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_env_temp, environmentTemperature);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_shield_temp, cryoTemperatureShield);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_shield_temp, cryoTemperatureShield);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_lna_temp, cryoTemperatureLNA);

_PROPERTY_REFERENCE_CPP(MedicinaCBandImpl,ACS::ROdouble,m_lna_temp, cryoTemperatureLNA);