Added the external mark control: externalCalOn() and externalCalOff() (81567fb0) · Commits · INAF / DISCOS

Common/Interfaces/ReceiversInterface/idl/CommonReceiverInterface.idl

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,27 @@ module Receivers {
	*/		*/
	void calOff() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);		void calOff() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);


			/**
			* Turns on (activate) the external mark control
			* @throw ComponentErrors::ComponentErrorsEx
			* @throw ReceiversErrors::ReceiversErrorsEx
			* @throw CORBA::SystemExcpetion
			*/
			void externalCalOn() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);



			/**
			* Turns off (deactivate) the external mark control
			* @throw ComponentErrors::ComponentErrorsEx
			* @throw ReceiversErrors::ReceiversErrorsEx
			* @throw CORBA::SystemExcpetion
			*/
			void externalCalOff() raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);



	/**		/**
	* If requirest by a particular receiver, this methos allows to setup particular operating mode.		* If requirest by a particular receiver, this methos allows to setup particular operating mode.
	* The mode must be a valid mode code, recognized by the receiver.		* The mode must be a valid mode code, recognized by the receiver.

SRT/Servers/SRT7GHzReceiver/include/ComponentCore.h

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,6 +139,22 @@ public:
	*/		*/
	void calOff() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ComponentErrors::ValidationErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl);		void calOff() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ComponentErrors::ValidationErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl);

			/** It turns the external calibration diode on. */
			void externalCalOn() throw (
			ReceiversErrors::NoRemoteControlErrorExImpl,
			ComponentErrors::ValidationErrorExImpl,
			ReceiversErrors::ReceiverControlBoardErrorExImpl
			);


			/** It turns the external calibration diode off. */
			void externalCalOff() throw (
			ReceiversErrors::NoRemoteControlErrorExImpl,
			ComponentErrors::ValidationErrorExImpl,
			ReceiversErrors::ReceiverControlBoardErrorExImpl
			);


	/**		/**
	* It turns on the sensor for vacuum measurement.		* It turns on the sensor for vacuum measurement.
	*/		*/

SRT/Servers/SRT7GHzReceiver/include/SRT7GHzImpl.h

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@
	/* */		/* */
	/* Who when What */		/* Who when What */
	/* Andrea Orlati(aorlati@ira.inaf.it) 02/08/2011 Creation */		/* Andrea Orlati(aorlati@ira.inaf.it) 02/08/2011 Creation */
			/* Marco Buttu (mbuttu@oa-cagliari.inaf.it) 20/05/2015 External Mark */


	#ifndef __cplusplus		#ifndef __cplusplus
	@@ -138,6 +139,31 @@ public:
	*/		*/
	void calOff() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);		void calOff() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);


			/**
			* This method is used to turn the external calibration diode on.
			* @throw CORBA::SystemExcpetion
			* @throw ComponentErrors::ComponentErrorsEx
			* @throw ReceiversErrors::ReceiversErrorsEx
			*/
			void externalCalOn() throw (
			CORBA::SystemException,
			ComponentErrors::ComponentErrorsEx,
			ReceiversErrors::ReceiversErrorsEx);


			/**
			* This method is used to turn the external calibration diode off.
			* @throw CORBA::SystemExcpetion
			* @throw ComponentErrors::ComponentErrorsEx
			* @throw ReceiversErrors::ReceiversErrorsEx
			*/
			void externalCalOff() throw (
			CORBA::SystemException,
			ComponentErrors::ComponentErrorsEx,
			ReceiversErrors::ReceiversErrorsEx);


	/**		/**
	* This method allows to set local oscillator. In this implementation only the first value is considered.		* This method allows to set local oscillator. In this implementation only the first value is considered.
	* @param lo the list contains the values in MHz for the local oscillator		* @param lo the list contains the values in MHz for the local oscillator

SRT/Servers/SRT7GHzReceiver/src/ComponentCore.cpp

+82 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,8 +139,90 @@ void CComponentCore::activate() throw (ReceiversErrors::ModeErrorExImpl,Componen
	setMode((const char *)m_configuration.getSetupMode()); // Throw ......		setMode((const char *)m_configuration.getSetupMode()); // Throw ......
	guard.release();		guard.release();
	lnaOn(); // throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl)		lnaOn(); // throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl)
			externalCalOff();
	}		}


			void CComponentCore::externalCalOn() throw (
			ReceiversErrors::NoRemoteControlErrorExImpl,
			ComponentErrors::ValidationErrorExImpl,
			ReceiversErrors::ReceiverControlBoardErrorExImpl)
			{
			baci::ThreadSyncGuard guard(&m_mutex);
			if (m_setupMode=="") {
			_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CComponentCore::externalCalOn()");
			impl.setReason("receiver not configured yet");
			throw impl;
			}
			guard.release();
			if (checkStatusBit(LOCAL)) {
			_EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOn()");
			throw impl;
			}
			try {
			m_control->setExtCalibrationOn();
			}
			catch (IRA::ReceiverControlEx& ex) {
			_EXCPT(ReceiversErrors::ReceiverControlBoardErrorExImpl,impl,"CComponentCore::externalCalOn()");
			impl.setDetails(ex.what().c_str());
			setStatusBit(CONNECTIONERROR);
			throw impl;
			}
			try {
			m_control->isExtCalibrationOn() ? setStatusBit(EXTNOISEMARK) : clearStatusBit(EXTNOISEMARK);
			clearStatusBit(CONNECTIONERROR); // The communication was ok so clear the CONNECTIONERROR bit
			}
			catch (IRA::ReceiverControlEx& ex) {
			_EXCPT(ReceiversErrors::ReceiverControlBoardErrorExImpl,impl,"CComponentCore::externalCalOn()");
			impl.setDetails(ex.what().c_str());
			setStatusBit(CONNECTIONERROR);
			throw impl;
			}

			}


			void CComponentCore::externalCalOff() throw (
			ReceiversErrors::NoRemoteControlErrorExImpl,
			ComponentErrors::ValidationErrorExImpl,
			ReceiversErrors::ReceiverControlBoardErrorExImpl
			)
			{
			baci::ThreadSyncGuard guard(&m_mutex);
			if (m_setupMode=="") {
			_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CComponentCore::externalCalOff()");
			impl.setReason("receiver not configured yet");
			throw impl;
			}
			guard.release();
			if (checkStatusBit(LOCAL)) {
			_EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOff()");
			throw impl;
			}
			try {
			m_control->setExtCalibrationOff();
			}
			catch (IRA::ReceiverControlEx& ex) {
			_EXCPT(ReceiversErrors::ReceiverControlBoardErrorExImpl,impl,"CComponentCore::externalCalOff()");
			impl.setDetails(ex.what().c_str());
			setStatusBit(CONNECTIONERROR);
			throw impl;
			}
			try {
			m_control->isExtCalibrationOn() ? setStatusBit(EXTNOISEMARK) : clearStatusBit(EXTNOISEMARK);
			clearStatusBit(CONNECTIONERROR); // The communication was ok so clear the CONNECTIONERROR bit
			}
			catch (IRA::ReceiverControlEx& ex) {
			_EXCPT(ReceiversErrors::ReceiverControlBoardErrorExImpl,impl,"CComponentCore::externalCalOff()");
			impl.setDetails(ex.what().c_str());
			setStatusBit(CONNECTIONERROR);
			throw impl;
			}
			}




	void CComponentCore::deactivate() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl)		void CComponentCore::deactivate() throw (ReceiversErrors::NoRemoteControlErrorExImpl,ReceiversErrors::ReceiverControlBoardErrorExImpl)
	{		{
	// no guard needed.		// no guard needed.

SRT/Servers/SRT7GHzReceiver/src/SRT7GHzImpl.cpp

+51 −0

Original line number	Original line	Diff line number	Diff line
	@@ -247,6 +247,57 @@ void SRT7GHzImpl::calOff() throw (CORBA::SystemException,ComponentErrors::Compon
	}		}
	}		}


			void SRT7GHzImpl::externalCalOn() throw (
			CORBA::SystemException,
			ComponentErrors::ComponentErrorsEx,
			ReceiversErrors::ReceiversErrorsEx
			)
			{
			try {
			m_core.externalCalOn();
			}
			catch (ComponentErrors::ComponentErrorsExImpl& ex) {
			ex.log(LM_DEBUG);
			throw ex.getComponentErrorsEx();
			}
			catch (ReceiversErrors::ReceiversErrorsExImpl& ex) {
			ex.log(LM_DEBUG);
			throw ex.getReceiversErrorsEx();
			}
			catch (...) {
			_EXCPT(ComponentErrors::UnexpectedExImpl, impl, "SRT7GHzImpl::externalCalOn()");
			impl.log(LM_DEBUG);
			throw impl.getComponentErrorsEx();
			}
			}


			void SRT7GHzImpl::externalCalOff() throw (
			CORBA::SystemException,
			ComponentErrors::ComponentErrorsEx,
			ReceiversErrors::ReceiversErrorsEx
			)
			{
			try {
			m_core.externalCalOff();
			}
			catch (ComponentErrors::ComponentErrorsExImpl& ex) {
			ex.log(LM_DEBUG);
			throw ex.getComponentErrorsEx();
			}
			catch (ReceiversErrors::ReceiversErrorsExImpl& ex) {
			ex.log(LM_DEBUG);
			throw ex.getReceiversErrorsEx();
			}
			catch (...) {
			_EXCPT(ComponentErrors::UnexpectedExImpl, impl, "SRT7GHzImpl::externalCalOff()");
			impl.log(LM_DEBUG);
			throw impl.getComponentErrorsEx();
			}
			}


	void SRT7GHzImpl::setLO(const ACS::doubleSeq& lo) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)		void SRT7GHzImpl::setLO(const ACS::doubleSeq& lo) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx)
	{		{
	try {		try {