Commit 1dd6db48 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

goTo fix

parent 2f0fad6f

Common/Servers/Scheduler/include/Core_Operations.h

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ void _sidereal(const char * targetName,const double& ra,const double& dec,const 


/**

 * It sends the telescope to fixed position in the horizontal frame

 * @param azimuth azimuth position given in degrees

 * @param elevation elevation position given in degrees

 */

void _goTo(const double& azimuth,const double& elevation) throw (ManagementErrors::TelescopeSubScanErrorExImpl,

		ManagementErrors::TargetOrSubscanNotFeasibleExImpl,ManagementErrors::CloseTelescopeScanErrorExImpl);

Common/Servers/Scheduler/src/Core_Operations.i

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void CCore::_goTo(const double& azimuth,const double& elevation) throw (Manageme 
	MinorServo::MinorServoScan servo;

	Receivers::TReceiversParameters receievers;

	Schedule::CSubScanBinder binder(&primary,&secondary,&servo,&receievers);

	binder.goTo(azimuth,elevation);

	binder.goTo(azimuth*DD2R,elevation*DD2R);

	startTime=0; // it means start as soon as possible

	startScan(startTime,&primary,&secondary,&servo,&receievers); //ManagementErrors::TelescopeSubScanErrorExImpl,ManagementErrors::TargetOrSubscanNotFeasibleExImpl

	m_subScanEpoch=startTime;
@@ -582,7 +582,7 @@ void CCore::_fTrack(const char *dev) throw (ComponentErrors::CouldntGetComponent 
		_EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCore::_fTrack()");

		throw impl;

	}

	for (long t=0;t<topocentricFreq->length();t++) printf("topocentric Freq :%lf\n",topocentricFreq[t]);

	for (unsigned t=0;t<topocentricFreq->length();t++) printf("topocentric Freq :%lf\n",topocentricFreq[t]);

	// just to make sure the topocentric sequence has the right dimension!

	if (topocentricFreq->length()!=m_restFrequency.length()) {

		topocentricFreq->length(m_restFrequency.length());

SRT/Configuration/CDB/alma/DataBlock/SRTKBandMFReceiver/Feeds/Feeds.xml

+12 −12
Original line number Diff line number Diff line
@@ -14,43 +14,43 @@ 
	

	<Feed>

		<feedCode>1</feedCode>

		<xOffset>0.001027805</xOffset>

		<yOffset>0.0</yOffset>

		<xOffset>0.00033355205</xOffset>

		<yOffset>-0.00057772859</yOffset>

		<relativePower>0.97</relativePower>

	</Feed>

	

	<Feed>

		<feedCode>2</feedCode>

		<xOffset>0.000513903</xOffset>

		<yOffset>-0.000890118</yOffset>

		<xOffset>-0.00033355205</xOffset>

		<yOffset>-0.00057772859</yOffset>

		<relativePower>0.99</relativePower>

	</Feed>

	

	<Feed>

		<feedCode>3</feedCode>

		<xOffset>-0.000513903</xOffset>

		<yOffset>-0.000890118</yOffset>

		<xOffset>-0.00066710365</xOffset>

		<yOffset>0.0</yOffset>

		<relativePower>0.97</relativePower>

	</Feed>

	

	<Feed>

		<feedCode>4</feedCode>

		<xOffset>-0.001027805</xOffset>

		<yOffset>0.0</yOffset>

		<xOffset>-0.00033355205</xOffset>

		<yOffset>0.00057772859</yOffset>

		<relativePower>0.95</relativePower>

	</Feed>

	

	<Feed>

		<feedCode>5</feedCode>

		<xOffset>-0.000513903</xOffset>

		<yOffset>0.000890118</yOffset>

		<xOffset>0.00033355205</xOffset>

		<yOffset>0.00057772859</yOffset>

		<relativePower>0.97</relativePower>

	</Feed>

	

	<Feed>

		<feedCode>6</feedCode>

		<xOffset>0.000513903</xOffset>

		<yOffset>0.000890118</yOffset>

		<xOffset>0.00066710365</xOffset>

		<yOffset>0.0</yOffset>

		<relativePower>0.97</relativePower>

	</Feed>