Commit 24211a6d authored by Andrea Orlat's avatar Andrea Orlat
Browse files

fixed a bug whenn calling peakerScan from scheduler component

parent 7088f22e

Common/Servers/Scheduler/include/Core.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public: 
			ManagementErrors::AntennaScanErrorExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl,ManagementErrors::TsysErrorExImpl,ComponentErrors::OperationErrorExImpl,

			ManagementErrors::UnsupportedOperationExImpl,ManagementErrors::MinorServoScanErrorExImpl,ComponentErrors::TimerErrorExImpl,

			ManagementErrors::AbortedByUserExImpl,ManagementErrors::NotAllowedDuringScheduleExImpl,ManagementErrors::RecordingAlreadyActiveExImpl,

			ComponentErrors::ValidationErrorExImpl);

			ComponentErrors::ValidationErrorExImpl,ManagementErrors::TelescopeSubScanErrorExImpl);



	/**

	 * this is a macro operation, it performs a skydip scan from the current azimuth position

Common/Servers/Scheduler/src/Core.cpp

+5 −3
Original line number Diff line number Diff line
@@ -359,10 +359,12 @@ void CCore::skydip(const double& el1,const double& el2,const ACS::TimeInterval& 
	ACS_LOG(LM_FULL_INFO,"CCore::skydip()",(LM_NOTICE,"SKYDIP_DONE"));

}*/



void CCore::peakerScan(const char *axis,const double& span,const ACS::TimeInterval& duration) throw (ComponentErrors::CouldntGetComponentExImpl,ComponentErrors::ComponentNotActiveExImpl,

		ManagementErrors::AntennaScanErrorExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::UnexpectedExImpl,ManagementErrors::TsysErrorExImpl,ComponentErrors::OperationErrorExImpl,

void CCore::peakerScan(const char *axis,const double& span,const ACS::TimeInterval& duration) throw (ComponentErrors::CouldntGetComponentExImpl,

		ComponentErrors::ComponentNotActiveExImpl,ManagementErrors::AntennaScanErrorExImpl,ComponentErrors::CORBAProblemExImpl,

		ComponentErrors::UnexpectedExImpl,ManagementErrors::TsysErrorExImpl,ComponentErrors::OperationErrorExImpl,

		ManagementErrors::UnsupportedOperationExImpl,ManagementErrors::MinorServoScanErrorExImpl,ComponentErrors::TimerErrorExImpl,

		ManagementErrors::AbortedByUserExImpl,ManagementErrors::NotAllowedDuringScheduleExImpl,ManagementErrors::RecordingAlreadyActiveExImpl,ComponentErrors::ValidationErrorExImpl)

		ManagementErrors::AbortedByUserExImpl,ManagementErrors::NotAllowedDuringScheduleExImpl,ManagementErrors::RecordingAlreadyActiveExImpl,

		ComponentErrors::ValidationErrorExImpl,ManagementErrors::TelescopeSubScanErrorExImpl)

{

	//no need to get the mutex, because it is already done inside the executor object

	if (m_schedExecuter) {

Common/Servers/Scheduler/src/Core_Common.i

+2 −2
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ bool CCore::checkScan(ACS::Time& ut,const Antenna::TTrackingParameters *const pr 
	}

	catch (ComponentErrors::ComponentErrorsEx& ex) {

		_ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::checkScan()");

		impl.setReason("Could not connect to the antenna boss");

		impl.setReason("Could not check scan with antenna boss");

		throw impl;

	}

	catch (AntennaErrors::AntennaErrorsEx& ex) {

		_ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::checkScan()");

		impl.setReason("Could not connect to the antenna boss");

		impl.setReason("Could not check scan with antenna boss");

		throw impl;

	}

	catch (CORBA::SystemException& ex) {

Common/Servers/Scheduler/src/SubScanBinder.cpp

+7 −1
Original line number Diff line number Diff line
@@ -61,9 +61,15 @@ void CSubScanBinder::peaker(const IRA::CString& axis,const double& span,const AC 
	if (antennaSpan>0) {

		OTFC(Antenna::ANT_EQUATORIAL,geom,Antenna::ANT_HORIZONTAL,direction,antennaSpan,duration,sec);

	}

	else {

		if (sec==NULL) { // in this case the current target is kept!

			m_primary->secondary=true;

			m_secondary->type=Antenna::ANT_NONE;

		}

		else {

			copyPrimaryAntenaTrack(sec);

		}

	}

    m_servo->is_empty_scan=false;

    m_servo->axis_code=CORBA::string_dup((const char *)axis);

    m_servo->range=span;