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

included the equatorial frame in the antennaRunTime structure

parent 641100cc

Common/Interfaces/CommonInterface/idl/AntennaDefinitions.midl

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ module Antenna { 
	 	 * expected elevation at the beginning of the scan

	 	 */

		double elevation;

		/**

		 * expected right ascension at the beginning of the scan

		 */

		double rightAscension;

		/**

		 * expected declination at the beginning of the scan

		 */

		double declination;

		/**

	 	 * expected starting ut time

	 	 */

Common/Servers/AntennaBoss/src/BossCore.cpp

+7 −0
Original line number Diff line number Diff line
@@ -760,11 +760,16 @@ bool CBossCore::checkScan(const ACS::Time& startUt,const Antenna::TTrackingParam 
				velDef,antennaInfo->timeToStop,name,scanOff,antennaInfo->axis,generatorFlux.out());

		antennaInfo->targetName=CORBA::string_dup((const char *)name);

		if (generatorType==Antenna::ANT_OTF) {

			double pangle;

			TIMEVALUE ct(startTime);

			IRA::CDateTime time(ct,m_dut1);

			generator->getHorizontalCoordinate(startTime,azimuth,elevation); 

			generator->getHorizontalCoordinate(startTime+par.otf.subScanDuration,stopAzimuth,stopElevation); //this is the coordinate at the end of the scan

			antennaInfo->startEpoch=startTime;

			antennaInfo->azimuth=azimuth;

			antennaInfo->elevation=elevation;

			IRA::CSkySource::horizontalToEquatorial(time,m_site,azimuth,elevation,

					antennaInfo->rightAscension,antennaInfo->declination,pangle);

			antennaInfo->onTheFly=true;

			ACS_LOG(LM_FULL_INFO,"CBossCore::checkScan()",(LM_DEBUG,"OTF_AZ_EL: %lf %lf",azimuth,elevation));

			ACS_LOG(LM_FULL_INFO,"CBossCore::checkScan()",(LM_DEBUG,"OTF_STOPAZ_STOPEL: %lf %lf",stopAzimuth,stopElevation));
@@ -785,6 +790,8 @@ bool CBossCore::checkScan(const ACS::Time& startUt,const Antenna::TTrackingParam 
			generator->getHorizontalCoordinate(inputTime,azimuth,elevation); //use inputTime (=now), in order to get where the source is now)

			antennaInfo->azimuth=azimuth;

			antennaInfo->elevation=elevation;

			antennaInfo->rightAscension=ra;

			antennaInfo->declination=dec;

			antennaInfo->onTheFly=false;

			ACS_LOG(LM_FULL_INFO,"CBossCore::checkScan()",(LM_DEBUG,"TARGET_AZ_EL: %lf %lf",azimuth,elevation));

		}

Common/Servers/ReceiversBoss/src/RecvBossCore.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,8 @@ void CRecvBossCore::startScan(ACS::Time& startUT,const Receivers::TReceiversPara 
	if ((m_config->dewarPositionerInterface()!="") && (derotator) && (m_updateMode!=Receivers::RCV_UNDEF_DEROTCONF))  {

		loadDewarPositioner(); // ComponentErrors::CouldntGetComponentExImpl

		try {

			m_dewarPositioner->startUpdating(antennaInfo.axis,antennaInfo.section,antennaInfo.azimuth,antennaInfo.elevation);

			m_dewarPositioner->startUpdating(antennaInfo.axis,antennaInfo.section,antennaInfo.azimuth,

					antennaInfo.elevation,antennaInfo.rightAscension,antennaInfo.declination);

			m_dewarIsMoving=true;

		}

		catch (ComponentErrors::ComponentErrorsEx& ex) {

Common/Servers/Scheduler/src/SubScanBinder.cpp

+3 −1
Original line number Diff line number Diff line 
#include "Schedule.h"

#include <slamac.h>



using namespace Schedule;
@@ -47,7 +48,8 @@ void CSubScanBinder::peaker(const IRA::CString& axis,const double& span,const AC 
	}

	else {

		axisCode=m_config->getAxisFromServoName(axis);

		bdf=m_config->getBDFfromAxis(axisCode);

		bdf=m_config->getBDFfromAxis(axisCode)/3600.0; //degrees per mm

		bdf*=DD2R; // radians per mm

		geom=m_config->getScanGeometryFromAxis(axisCode);

	}

	antennaSpan=span*bdf;

SRT/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
		

	<MinorServoMapping axis="SUBR_Z" servoName="SRP_TZ" antennaGeometry="LON" beamDeviationFactor="0.0"/>

	<MinorServoMapping axis="SUBR_X" servoName="SRP_TX" antennaGeometry="LON" beamDeviationFactor="0.0"/>

	<MinorServoMapping axis="SUBR_Y" servoName="SRP_TY" antennaGeometry="LON" beamDeviationFactor="0.0"/>

	<! TY, BDF = 8.87 arcseconds/mm -->

	<MinorServoMapping axis="SUBR_Y" servoName="SRP_TY" antennaGeometry="LAT" beamDeviationFactor="8.87"/>

	<MinorServoMapping axis="SUBR_ROTY" servoName="SRP_RY" antennaGeometry="LON" beamDeviationFactor="0.0"/>

	<MinorServoMapping axis="SUBR_ROTX" servoName="SRP_RX" antennaGeometry="LON" beamDeviationFactor="0.0"/>

	<MinorServoMapping axis="PFP_Z" servoName="PFP_TZ" antennaGeometry="LON" beamDeviationFactor="0.0"/>