Commit 94106394 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Issue #885, fixed Configuration.h test

parent 17d65746
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public:
     * @throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl, ComponentErrors::SocketErrorExImpl,
     *       ReceiversErrors::ModeErrorExImpl)
     */
    virtual CConfiguration const * const execute();
    virtual CConfiguration<maci::ContainerServices> const * const execute();
    

    /**
@@ -345,35 +345,35 @@ public:
     * This is getter method. No need to make it thread safe......
     * @return the current value of the cryogenic temperature at cool head in °K
     */
    CConfiguration::BoardValue getCryoCoolHead() const { return m_cryoCoolHead; }
    CConfiguration<maci::ContainerServices>::BoardValue getCryoCoolHead() const { return m_cryoCoolHead; }


    /**
     * This is getter method. No need to make it thread safe......
     * @return the current value of the cryogenic temperature at cool head window in °K
     */
    CConfiguration::BoardValue getCryoCoolHeadWin() const { return m_cryoCoolHeadWin; }
    CConfiguration<maci::ContainerServices>::BoardValue getCryoCoolHeadWin() const { return m_cryoCoolHeadWin; }


    /**
     * This is getter method. No need to make it thread safe......
      * @return the current value of the cryogenic temperature at LNA in °K
     */
    CConfiguration::BoardValue getCryoLNA() const { return m_cryoLNA; }
    CConfiguration<maci::ContainerServices>::BoardValue getCryoLNA() const { return m_cryoLNA; }


    /**
     * This is getter method. No need to make it thread safe......
     * @return the current value of the cryogenic temperature at LNA  window in °K
     */
    CConfiguration::BoardValue getCryoLNAWin() const { return m_cryoLNAWin; }
    CConfiguration<maci::ContainerServices>::BoardValue getCryoLNAWin() const { return m_cryoLNAWin; }


    /**
     * This is getter method. No need to make it thread safe......
     * @return the current vertex temperature in °K
     */
    CConfiguration::BoardValue getVertexTemperature() const { return m_envTemperature; }
    CConfiguration<maci::ContainerServices>::BoardValue getVertexTemperature() const { return m_envTemperature; }


    /**
@@ -534,7 +534,7 @@ protected:
    inline bool checkStatusBit(TStatusBit bit) { return m_statusWord & (1 << bit); }


    CConfiguration m_configuration;
    CConfiguration<maci::ContainerServices> m_configuration;
    CKQWReceiverControl *m_control; // This object is thread safe
    BACIMutex m_mutex;
    //IRA::CString m_actualMode;
@@ -548,11 +548,11 @@ private:
    bool m_localOscillatorFault;
    //double m_localOscillatorValue;
    double m_vacuum;
    CConfiguration::BoardValue m_cryoCoolHead;
    CConfiguration::BoardValue m_cryoCoolHeadWin;
    CConfiguration::BoardValue m_cryoLNA;
    CConfiguration::BoardValue m_cryoLNAWin;
    CConfiguration::BoardValue m_envTemperature;
    CConfiguration<maci::ContainerServices>::BoardValue m_cryoCoolHead;
    CConfiguration<maci::ContainerServices>::BoardValue m_cryoCoolHeadWin;
    CConfiguration<maci::ContainerServices>::BoardValue m_cryoLNA;
    CConfiguration<maci::ContainerServices>::BoardValue m_cryoLNAWin;
    CConfiguration<maci::ContainerServices>::BoardValue m_envTemperature;
    std::vector<IRA::ReceiverControl::StageValues> m_vdStageValues;
    std::vector<IRA::ReceiverControl::StageValues> m_idStageValues;
    std::vector<IRA::ReceiverControl::StageValues> m_vgStageValues;
+71 −67
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ using namespace IRA;
 * @author <a href=mailto:andrea.orlati@inaf.it>Andrea Orlati</a>, Istituto di Radioastronomia, Italia
 * <br> 
 */
template <class T>
class CConfiguration {
public:

@@ -322,7 +323,7 @@ public:
	 * @param Services pointer to the container services object or to simpleClient
	 * @param comp_name name of the component 
	*/
	void init(maci::ContainerServices* Services,IRA::CString comp_name="");
	void init(T* Services,IRA::CString comp_name="");

private:
	IRA::CString m_dewarIPAddress;
@@ -339,7 +340,7 @@ private:
	IRA::CString m_localOscillator_W1_Instance;
	IRA::CString m_localOscillator_W2_Instance;

    maci::ContainerServices* m_services;
	T* m_services;
	IRA::CString m_mode;
	IRA::CString m_defaultMode;
	double *m_BandRFMin;
@@ -373,4 +374,7 @@ private:
	void updateBandWith(const long& pos);
};


#include "Configuration.tpp"

#endif
+589 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public:
	*/
	CORBA::Double read(ACS::Time& timestamp)
	{
      CConfiguration::BoardValue result = m_pCore->getCryoCoolHead();
      CConfiguration<maci::ContainerServices>::BoardValue result = m_pCore->getCryoCoolHead();
      m_val = result.temperature;
		timestamp = result.timestamp;
		return m_val;
+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

Loading