onother, not-completed implementation, some compilation error still present (6cc25f22) · Commits · INAF / DISCOS

Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp

+54 −17

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@

		#define TEMPLATE_4_ROTREFERENCEFRAME Antenna::ROTReferenceFrame_ptr,ACS::Monitorpattern,ACS::Monitorpattern_var,_TW_CBpattern,ACS::CBpattern_var
		#define TEMPLATE_4_ROTVRADDEFINITION Antenna::ROTVradDefinition_ptr,ACS::Monitorpattern,ACS::Monitorpattern_var,_TW_CBpattern,ACS::CBpattern_var
		#define TEMPLATE_4_ROTCOORDINATEFRAME Antenna::ROTCoordinateFrame_ptr,ACS::Monitorpattern,ACS::Monitorpattern_var,_TW_CBpattern,ACS::CBpattern_var


		using namespace TW;
		@@ -130,12 +131,18 @@ int main(int argc, char *argv[]) {
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *targetRA_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *targetDec_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *targetVrad_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *azOff_field;
		/TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> azOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *elOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *raOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *decOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *lonOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *latOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> latOff_field;/

		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *scanLonOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *scanLatOff_field;
		TW::CPropertyStatusBox<TEMPLATE_4_ROTCOORDINATEFRAME,Antenna::TCoordinateFrame> *scanFrameOff_box;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *sysAzOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *sysElOff_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *rawAzimuth_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *rawElevation_field;
		TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *observedAzimuth_field;
		@@ -259,12 +266,17 @@ int main(int argc, char *argv[]) {
		_GET_ACS_PROPERTY(ACS::ROdouble,targetVrad);
		_GET_ACS_PROPERTY(Antenna::ROTReferenceFrame,vradReferenceFrame);
		_GET_ACS_PROPERTY(Antenna::ROTVradDefinition,vradDefinition);
		_GET_ACS_PROPERTY(ACS::ROdouble,azimuthOffset);
		/*_GET_ACS_PROPERTY(ACS::ROdouble,azimuthOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,elevationOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,rightAscensionOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,declinationOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,longitudeOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,latitudeOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,latitudeOffset);*/
		_GET_ACS_PROPERTY(ACS::ROdouble,subScanLonOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,subScanLatOffset);
		_GET_ACS_PROPERTY(Antenna::ROTCoordinateFrame,subScanOffsetFrame);
		_GET_ACS_PROPERTY(ACS::ROdouble,systemAzimuthOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,systemElevationOffset);
		_GET_ACS_PROPERTY(ACS::ROdouble,rawAzimuth);
		_GET_ACS_PROPERTY(ACS::ROdouble,rawElevation);
		_GET_ACS_PROPERTY(ACS::ROdouble,observedAzimuth);
		@@ -291,12 +303,19 @@ int main(int argc, char *argv[]) {
		targetRA_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(targetRightAscension.in());
		targetDec_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(targetDeclination.in());
		targetVrad_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(targetVrad.in());
		azOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(azimuthOffset.in());
		/*azOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(azimuthOffset.in());
		elOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(elevationOffset.in());
		raOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(rightAscensionOffset.in());
		decOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(declinationOffset.in());
		lonOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(longitudeOffset.in());
		latOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(latitudeOffset.in());
		latOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(latitudeOffset.in());*/

		scanLonOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(subScanLonOffset.in());
		scanLatOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(subScanLatOffset.in());
		scanFrameOff_box=new TW::CPropertyStatusBox<TEMPLATE_4_ROTCOORDINATEFRAME,Antenna::TCoordinateFrame>(subScanOffsetFrame.in(),Antenna::ANT_HORIZONTAL);
		sysAzOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(systemAzimuthOffset.in());
		sysElOff_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(systemElevationOffset.in());

		rawAzimuth_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(rawAzimuth.in());
		rawElevation_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(rawElevation.in());
		observedAzimuth_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(observedAzimuth.in());
		@@ -338,18 +357,23 @@ int main(int argc, char *argv[]) {
		_TW_SET_COMPONENT(targetDec_field,37,1,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(targetFlux_field,52,1,11,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(target_field,0,1,17,1,CColorPair::GREEN_BLACK,CStyle::UNDERLINE,output_label);

		_TW_SET_COMPONENT(targetVrad_field,22,2,11,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);

		_TW_SET_COMPONENT(refFrame_box,34,2,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(velDef_box,47,2,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);

		_TW_SET_COMPONENT(azOff_field,22,3,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(elOff_field,37,3,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(raOff_field,22,4,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(scanLonOff_field,22,3,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(scanLatOff_field,37,3,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(scanFrameOff_box,52,3,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		scanFrameOff_box->setStatusLook(Antenna::ANT_HORIZONTAL);
		scanFrameOff_box->setStatusLook(Antenna::ANT_EQUATORIAL);
		scanFrameOff_box->setStatusLook(Antenna::ANT_GALACTIC);
		_TW_SET_COMPONENT(sysAzOff_field,22,5,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(sysElOff_field,37,5,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);

		/*_TW_SET_COMPONENT(raOff_field,22,4,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(decOff_field,37,4,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(lonOff_field,22,5,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(latOff_field,37,5,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(latOff_field,37,5,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);*/
		_TW_SET_COMPONENT(rawAzimuth_field,22,6,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(rawElevation_field,37,6,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		_TW_SET_COMPONENT(observedAzimuth_field,22,7,14,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label);
		@@ -386,12 +410,17 @@ int main(int argc, char *argv[]) {
		targetVrad_field->setFormatFunction(CFormatFunctions::floatingPointFormat,NULL);
		strcpy(fluxFormat,"(%05.1lf Jy)");
		targetFlux_field->setFormatFunction(CFormatFunctions::floatingPointFormat,static_cast<void *>(fluxFormat));
		azOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		/*azOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		elOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		raOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL); //format as hh.mm.ss.ss
		decOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		lonOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		latOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		latOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);*/

		scanLonOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL); //format as hh.mm.ss.ss
		scanLatOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		sysAzOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		sysElOff_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		observedGalLongitude_field->setFormatFunction(CFormatFunctions::angleFormat,NULL);
		observedGalLatitude_field->setFormatFunction(CFormatFunctions::angleFormat,NULL);
		pointingAzimuthCorrection_field->setFormatFunction(CFormatFunctions::coordinateFormat,NULL);
		@@ -450,12 +479,20 @@ int main(int argc, char *argv[]) {
		_INSTALL_MONITOR(refFrame_box,2000);
		_INSTALL_MONITOR(velDef_box,2000);
		_INSTALL_MONITOR(targetFlux_field,2000);
		_INSTALL_MONITOR(azOff_field,500);
		/*_INSTALL_MONITOR(azOff_field,500);
		_INSTALL_MONITOR(elOff_field,500);
		_INSTALL_MONITOR(raOff_field,500);
		_INSTALL_MONITOR(decOff_field,500);
		_INSTALL_MONITOR(lonOff_field,500);
		_INSTALL_MONITOR(latOff_field,500);
		_INSTALL_MONITOR(latOff_field,500);*/

		_INSTALL_MONITOR(scanLonOff_field,500);
		_INSTALL_MONITOR(scanLatOff_field,500);
		_INSTALL_MONITOR(scanFrameOff_box,500);
		_INSTALL_MONITOR(sysAzOff_field,500);
		_INSTALL_MONITOR(sysElOff_field,500);


		_INSTALL_MONITOR(rawAzimuth_field,300);
		_INSTALL_MONITOR(rawElevation_field,300);
		_INSTALL_MONITOR(observedAzimuth_field,300);

Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl

+7 −8

Original line number	Diff line number	Diff line
		@@ -684,14 +684,13 @@ module Antenna {
		/**
		* This method should only be used internally to know the user offsets currently commanded
		* @throw CORBA::SystemExcpetion
		* @param azOff user offset for the azimuth (radians)
		* @param elOff user offset for the elevation (radians)
		* @param raOff user offset for the right ascension (radians)
		* @param decOff user offset for the declination (radians)
		* @param lonOff user offset for the longitude (radians)
		* @param latOff user offset for the latitude (radians)
		*/
		void getAllOffsets(out double azOff,out double elOff,out double raOff,out double decOff,out double lonOff,out double latOff);
		* @param sysAzOff system offset for the azimuth (radians)
		* @param sysElOff system offset for the elevation (radians)
		* @param lonOff current offset along longitude (radians)
		* @param lonOff current offset along latitude (radians)
		* @param frame current offset frame
		*/
		void getAllOffsets(out double sysAzOff,out double sysElOff,out double lonOff,out double latOff,out TCoordinateFrame offFrame);

		/**
		* This method is used internally to know the scan axis/direction os the presently commanded scan

Common/Servers/AntennaBoss/include/AntennaBossImpl.h

+10 −8

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@ using namespace baci;
		_SP_WILDCARD_CLASS(ReferenceFrame_WildCard,"UNDEF");
		_SP_WILDCARD_CLASS(VradDefinition_WildCard,"UNDEF");
		_SP_WILDCARD_CLASS(VRad_WildCard,"nan");
		_SP_WILDCARD_CLASS(Offset_WildCard,"nan");


		class ReferenceFrame_converter
		{
		@@ -655,14 +657,14 @@ public:
		/**
		* It is used internally to returns the user offsets in all supported frames
		* @throw CORBA::SystemException
		* @param raOff the returned offset azimuth in radians
		* @param elOff the returned offset elevation in radians
		* @param raOff the returned offset right ascension in radians
		* @param decOff the returned offset declination in radians
		* @param lonOff the returned offset longitude in radians
		* @param latOff the returned offset latitude in radians
		*/
		void getAllOffsets(CORBA::Double_out azOff,CORBA::Double_out elOff,CORBA::Double_out raOff,CORBA::Double_out decOff,CORBA::Double_out lonOff,CORBA::Double_out latOff) throw (CORBA::SystemException);
		* @param sysAzOff current azimuth system offset in radians
		* @param sysEllOff current elevation system offset in radians
		* @param lonOff current longitude frame in radians
		* @param latOff current latitude offset in radians
		* @param offFrame current offset frame
		*/
		virtual void getAllOffsets(CORBA::Double_out sysAzOff,CORBA::Double_out sysElOff,CORBA::Double_out lonOff,CORBA::Double_out latOff,
		Antenna::TCoordinateFrame_out offFrame) throw (CORBA::SystemException);

		/**
		* It can be called to know which is the axis the antenna is currently performing the scan

Common/Servers/AntennaBoss/include/BossCore.h

+14 −6

Original line number	Diff line number	Diff line
		@@ -201,7 +201,15 @@ public:
		* @throw ComponentErrors::CORBAProblemExImpl
		* @thorw ComponentErrors::OperationErrorExImpl
		*/
		void setOffsets(const double& lonOff,const double& latOff,const Antenna::TCoordinateFrame& frame) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);
		void setOffsets(const Antenna::TCoordinateFrame& frame,const double& lonOff,const double& latOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);

		/**
		* This sets new system offsets
		* @param azOff new azimuth offset in radians
		* @param elOff new elevation offset in radians
		*/
		void setSystemOffsets(const double& lonOff,const double& latOff);


		/**
		* Sets the <i>m_enable</i> flag to false, i.e. the component will not send command to the mount any more. To enable the component again a call
		@@ -318,9 +326,9 @@ public:
		const double& getTargetRightAscension() const { return m_targetRA; }

		/**
		* Get all the user offset (refferred to all supported frames) with a single call.
		* Get all the offsets with a single call.
		*/
		void getAllOffsets(double& azOff,double& elOff,double& raOff,double& decOff,double& lonOff,double& latOff) const;
		void getAllOffsets(double& sysAzOff,double& sysElOff,double& lonOff,double& latOff,Antenna::TCoordinateFrame& offFrame) const;

		/**
		* @return the J2000 right ascension of the target
		@@ -572,21 +580,21 @@ public:
		* @param azOff azimuth offset (rad)
		* @param elOff elevation offset (rad)
		*/
		void setHorizontalOffsets(const double& azOff,const double& elOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);
		//void setHorizontalOffsets(const double& azOff,const double& elOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);

		/**
		* This is a wrapper function for the <i>setOffsets()</i> function when the equatorial frame is implicit.
		* @param raOff right ascension offset (rad)
		* @param decOff declination offset (rad)
		*/
		void setEquatorialOffsets(const double& raOff,const double& decOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);
		//void setEquatorialOffsets(const double& raOff,const double& decOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);

		/**
		* This is a wrapper function for the <i>setOffsets()</i> function when the galactic frame is implicit.
		* @param lonOff galactic longitude offset (rad)
		* @param latOff galactic latitude offset (rad)
		*/
		void setGalacticOffsets(const double& lonOff,const double& latOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);
		//void setGalacticOffsets(const double& lonOff,const double& latOff) throw(ComponentErrors::UnexpectedExImpl,ComponentErrors::CORBAProblemExImpl,ComponentErrors::OperationErrorExImpl);

		/**
		* @return can be called to retrieve the axis of the current scan

Common/Servers/AntennaBoss/src/AntennaBossImpl.cpp

+21 −11

Original line number	Diff line number	Diff line
		@@ -198,15 +198,23 @@ void AntennaBossImpl::initialize() throw (ACSErr::ACSbaseExImpl)
		m_parser->add("preset",new function2<CBossCore,non_constant,void_type,I<angle_type<rad> >,I<angle_type<rad> > >(boss,&CBossCore::preset),2);
		//m_parser->add("vlsr",new function1<CBossCore,non_constant,void_type,I<double_type> >(boss,&CBossCore::setVlsr),1);
		m_parser->add("fwhm",new function2<CBossCore,non_constant,void_type,I<angle_type<rad> >, I<double_type> >(boss,&CBossCore::setFWHM),2);
		m_parser->add("azelOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setHorizontalOffsets),2);
		m_parser->add("radecOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setEquatorialOffsets),2);
		m_parser->add("lonlatOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setGalacticOffsets),2);
		//m_parser->add("azelOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setHorizontalOffsets),2);
		//m_parser->add("radecOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setEquatorialOffsets),2);
		//m_parser->add("lonlatOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad> >,I<angleOffset_type<rad> > >(boss,&CBossCore::setGalacticOffsets),2);
		//m_parser->add("skydipOTF",new function3<CBossCore,non_constant,time_type,I<elevation_type<rad,false> >,I<elevation_type<rad,false> >,I<interval_type> >(boss,&CBossCore::skydip),3);
		m_parser->add("antennaReset",new function0<CBossCore,non_constant,void_type >(boss,&CBossCore::resetFailures),0);
		//m_parser->add("goOff",new function2<CBossCore,non_constant,void_type,I<enum_type<AntennaFrame2String,Antenna::TCoordinateFrame > >,I<double_type > >(boss,&CBossCore::goOff),2);
		m_parser->add("radialVelocity",new function3<CBossCore,non_constant,void_type,I< basic_type<double,double_converter,VRad_WildCard> >,
		I<enum_type<ReferenceFrame_converter,Antenna::TReferenceFrame,ReferenceFrame_WildCard> >,
		I<enum_type<VradDefinition_converter,Antenna::TVradDefinition,VradDefinition_WildCard> > >(boss,&CBossCore::radialVelocity),3);

		m_parser->add("setOffsets",new function3<CBossCore,non_constant,void_type,I<enum_type<AntennaFrame2String,Antenna::TCoordinateFrame > >,
		I<angleOffset_type<rad,Offset_WildCard> >,I<angleOffset_type<rad,Offset_WildCard> > >(boss,&CBossCore::setOffsets),3);

		m_parser->add("setSysOffsets",new function2<CBossCore,non_constant,void_type,I<angleOffset_type<rad,Offset_WildCard> >,I<angleOffset_type<rad,Offset_WildCard> > >
		(boss,&CBossCore::setSystemOffsets),2);


		ACS_LOG(LM_FULL_INFO,"AntennaBossImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZED"));
		}

		@@ -329,7 +337,7 @@ void AntennaBossImpl::setSubScanOffsets(Antenna::TCoordinateFrame frame,CORBA::D
		AUTO_TRACE("AntennaBossImpl::setSubScanOffsets()");
		CSecAreaResourceWrapper<CBossCore> resource=m_core->Get();
		try {
		resource->setOffsets(lonOff,latOff,frame);
		resource->setOffsets(frame,lonOff,latOff);
		}
		catch (AntennaErrors::AntennaErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		@@ -346,7 +354,7 @@ void AntennaBossImpl::setSystemOffsets(CORBA::Double az,CORBA::Double el) throw
		AUTO_TRACE("AntennaBossImpl::setSystemOffset()");
		CSecAreaResourceWrapper<CBossCore> resource=m_core->Get();
		try {
		//resource->setOffsets(lonOff,latOff,frame);
		resource->setSystemOffsets(az,el);
		}
		catch (AntennaErrors::AntennaErrorsExImpl& ex) {
		ex.log(LM_DEBUG);
		@@ -639,17 +647,19 @@ void AntennaBossImpl::getObservedHorizontal(ACS::Time time,ACS::TimeInterval dur
		el=(CORBA::Double)El;
		}

		void AntennaBossImpl::getAllOffsets(CORBA::Double_out azOff,CORBA::Double_out elOff,CORBA::Double_out raOff,CORBA::Double_out decOff,CORBA::Double_out lonOff,CORBA::Double_out latOff) throw (
		CORBA::SystemException)
		void AntennaBossImpl::getAllOffsets(CORBA::Double_out sysAzOff,CORBA::Double_out sysElOff,CORBA::Double_out lonOff,CORBA::Double_out latOff,
		Antenna::TCoordinateFrame_out offFrame) throw (CORBA::SystemException)

		{
		double az,el,ra,dec,lon,lat;
		double az,el,lon,lat;
		offFrame=Antenna::ANT_HORIZONTAL;
		if (!m_core) {
		azOff=elOff=raOff=decOff=lonOff=latOff=0.0;
		az=el=lon=lat=0.0;
		return;
		}
		CSecAreaResourceWrapper<CBossCore> resource=m_core->Get("IMPL:getAllOffsets");
		resource->getAllOffsets(az,el,ra,dec,lon,lat);
		azOff=(CORBA::Double)az; elOff=(CORBA::Double)el; raOff=(CORBA::Double)ra; decOff=(CORBA::Double)dec; lonOff=(CORBA::Double)lon; latOff=(CORBA::Double)lat;
		resource->getAllOffsets(az,el,lon,lat,offFrame);
		sysAzOff=(CORBA::Double)az; sysElOff=(CORBA::Double)el; lonOff=(CORBA::Double)lon; latOff=(CORBA::Double)lat;
		}

		void AntennaBossImpl::getScanAxis (Management::TScanAxis_out axis) throw (CORBA::SystemException)