Commit 25a8645f authored by TheDebbio's avatar TheDebbio
Browse files

reviewing interface and hook to server

parent f9202ea7

Medicina/Interfaces/MedicinaReceiversInterface/idl/MedicinaCBand.idl

+2 −2
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ module Receivers { 
			/**

			* Turns cold head on bringing down C Low receiver stage temperature.						 

			*/

			void TurnColdHeadOn() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

			void turnColdHeadOn() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);



			/**

			* Turns cold head off on C Low receiver stage.						 

			*/

			void TurnColdHeadOff() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

			void turnColdHeadOff() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

									

			

			/* **** VACUUM **** */

Medicina/Servers/MedicinaCBand/include/ComponentCore.h

+71 −12
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ public: 
     */

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





        /* *** IFs *** */



    /**
@@ -289,18 +288,35 @@ public: 


        /* *** VACUUM *** */



     /**

     * This is getter method. No need to make it thread safe......

     * @return the current value of the vacuum in mbar

     */

    double  getVacuum() const { return m_vacuum; }



    /**

     * It reads and updates from the control board the current value of the vacuum

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl

     */

    void updateVacuum() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



 	 /**

 	 * @brief Turn on vacuum pump

 	 */	

	 void vacuumPumpOn() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



	 /**

 	 * @brief Turn off vacuum pump

 	 */	

	 void vacuumPumpOff() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);

	 

    /**

     * It check if the vacuum pump is on and check is the status is fault or not (<i>VACUUMPUMPFAULT</i>)

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl

     */

    void updateVacuumPump() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);





    /**

     * It checks if the vacuum valve is opened or not

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl
@@ -308,10 +324,15 @@ public: 
    void updateVacuumValve() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



	/**

     * This is getter method. No need to make it thread safe......

     * @return the current value of the vacuum in mbar

 	 * @brief Turn on vacuum valve with delay

 	 * @todo check how it works

 	 */	

    double  getVacuum() const { return m_vacuum; }

	 void openVacuumValve(const char * p_mode, double p_delay) throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);

	 

	 /**

	 * @brief Close vaccum valve

	 */

	 void closeVacuumValve() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



    /**

     * Allows to set the "default_value" for the vacuum characteristic. In principle it is possible to read it directly from CDB, but I found it more
@@ -319,6 +340,15 @@ public: 
     */

    inline void setVacuumDefault(const double& val) { m_vacuumDefault=val; }

       

     /**

     * It turns on the sensor for vacuum measurement.

     */

    void vacuumSensorOn() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl);

    

    /**

     * It turns off the sensor for vacuum measurement.

     */

    void vacuumSensorOff() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl);



        /* *** TEMPERATURE *** */
@@ -328,13 +358,37 @@ public: 
     */

    BoardValue getEnvironmentTemperature() const { return m_environmentTemperature; }





    /**

     * It reads and updates from the control board the current vertex temperature

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl

     */

    void updateEnvironmentTemperature() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



    /**

     * This is getter method. No need to make it thread safe......

     * @return the current value of the vertex temperature

     */

	BoardValue getShieldTemperature() const { return m_shieldTemperature; }



	 /**

     * It reads and updates from the control board the current shield temperature

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl

     */

    void updateShieldTemperature() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



/**

     * This is getter method. No need to make it thread safe......

     * @return the current value of the vertex temperature

     */

	BoardValue getLnaTemperature() const { return m_lnaTemperature; }



	 /**

     * It reads and updates from the control board the current shield temperature

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl

     */

    void updateLnaTemperature() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);





     /**

     * It checks if the cool head is turned on or not

     * @throw ReceiversErrors::ReceiverControlBoardErrorExImpl
@@ -406,12 +460,17 @@ private: 


    MixerOperator m_mixer;  /**< LOs manager */

    

    bool m_calDiode;



    double m_vacuum;

    BoardValue m_environmentTemperature;

    double m_vacuumDefault;

    bool m_calDiode;

    

    BoardValue m_environmentTemperature;

    BoardValue m_shieldTemperature;

    BoardValue m_lnaTemperature;

        

    IRA::ReceiverControl::FetValues m_fetValues;

    

    DWORD m_statusWord;    

    bool m_ioMarkError; /**< m_ioMarkError is a flag used to know if we already got an IO error. See mantis issue n.0000236 */

    Management::TSystemStatus m_componentStatus;

Medicina/Servers/MedicinaCBand/include/DevIOCryoTemperatureCoolHeadWindow.h

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <baciDevIO.h>

#include <IRA>

#include "Commons.h"



/**

 * This class is derived from template DevIO and it is used by the cryoTemparatureCoolHeadWindow  property of the  component.
@@ -54,7 +55,7 @@ public: 
	*/

	CORBA::Double read(ACS::Time& timestamp) throw (ACSErr::ACSbaseExImpl)

	{

        CConfiguration::BoardValue result = m_pCore->getCryoCoolHeadWin();

        BoardValue result = m_pCore->getShieldTemperature();

        m_val = result.temperature;

        timestamp = result.timestamp;

		return m_val;

Medicina/Servers/MedicinaCBand/include/DevIOCryoTemperatureLNA.h

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <baciDevIO.h>

#include <IRA>

#include "Commons.h"



/**

 * This class is derived from template DevIO and it is used by the cryoTemparatureLNA  property of the  component.
@@ -54,7 +55,7 @@ public: 
	*/

	CORBA::Double read(ACS::Time& timestamp) throw (ACSErr::ACSbaseExImpl)

	{

        CConfiguration::BoardValue result = m_pCore->getCryoLNA();

        BoardValue result = m_pCore->getLnaTemperature();

        m_val = result.temperature;

        timestamp = result.timestamp;

		return m_val;

Medicina/Servers/MedicinaCBand/include/DevIOEnvTemperature.h

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <baciDevIO.h>

#include <IRA>

#include "Commons.h"



/**

 * This class is derived from template DevIO and it is used by the environmentTemperature  property of the  component.
@@ -54,7 +55,7 @@ public: 
	*/

	CORBA::Double read(ACS::Time& timestamp) throw (ACSErr::ACSbaseExImpl)

	{

        CConfiguration::BoardValue result = m_pCore->getEnvironmentTemperature();

        BoardValue result = m_pCore->getEnvironmentTemperature();

        m_val = result.temperature;

        timestamp = result.timestamp;

		return m_val;