Commit d22b36fe authored by Andrea Orlat's avatar Andrea Orlat
Browse files

if the derotator is not configured, it now returns a value that is not plausible any more (0)

parent 97c78498

Common/Servers/ReceiversBoss/src/RecvBossCore.cpp

+4 −5
Original line number Diff line number Diff line
@@ -332,25 +332,24 @@ void CRecvBossCore::externalCalOff() throw (ComponentErrors::ValidationErrorExIm 
	}

}





double CRecvBossCore::getDerotatorPosition(const ACS::Time& epoch) throw (ComponentErrors::CouldntGetComponentExImpl,

		ReceiversErrors::DewarPositionerCommandErrorExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl)

{

	IRA::CString component;

	bool derotator;

	if (m_currentRecvCode=="") {

		return 0;

		return nan("1");

	}

	if (!m_config->getReceiver(m_currentRecvCode,component,derotator)) {

		return 0;

		return nan("1");

	}

	if (m_config->dewarPositionerInterface()=="") {

	}

	if (!derotator) {

		return 0;

		return nan("1");

	}

	if (m_updateMode==Receivers::RCV_UNDEF_DEROTCONF) {

		return 0;

		return nan("1");;

	}

	baci::ThreadSyncGuard guard(&m_mutex);

	loadDewarPositioner(); // ComponentErrors::CouldntGetComponentExImpl

Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i

+10 −0
Original line number Diff line number Diff line
@@ -89,6 +89,16 @@ void CRecvBossCore::cleanUp() 
	}

}



void CRecvBossCore::externalCalOff() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

				ComponentErrors::UnexpectedExImpl)

{

}



void CRecvBossCore::externalCalOn() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

				ComponentErrors::UnexpectedExImpl)

{

}



void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

		ComponentErrors::UnexpectedExImpl)

{

Common/Servers/ReceiversBoss/src/RecvBossCore_nt.i

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ void CRecvBossCore::cleanUp() 
	m_fsSocketCal.Close(err);

}



void CRecvBossCore::externalCalOff() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

				ComponentErrors::UnexpectedExImpl)

{

}



void CRecvBossCore::externalCalOn() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

				ComponentErrors::UnexpectedExImpl)

{

}





void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::CORBAProblemExImpl,ReceiversErrors::UnavailableReceiverOperationExImpl,

		ComponentErrors::UnexpectedExImpl)

{