Unverified Commit 4ffd8ff8 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

rework issue #553: modfied the name and the meaning of the three additiona...

rework issue #553: modfied the name and the meaning of the three additiona keys in the main header of the FitsFile version 1.21. They now refers to user (#578)

offset not subscna offsets.
parent 6fb647f4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/
	issue #504 - added credits clause (regarding INAF data ownership) to fits files headers
   issue #518 - KBand receivers cryo temperature read wrongly with connection problems. More information:
    https://github.com/discos/discos/issues/518#issuecomment-590838480
   issue #530 - New Fitszilla versione 1.21 online. The subscan offsets related keywords added to the primary header.
   issue #533 - New Fitszilla versione 1.21 online. The user offsets related keywords added to the primary header.
	issue #556 - Added API to send emails to local system administrators. This feature is now exploted when a servo system oscillation is detected at Noto and Medicina
## Fixed
    issue #518 - In case of communication error we set a dummy value (100000) for the temperature properties, and the related timestamp keeps the value of the last communication timestamp.
+10 −2
Original line number Diff line number Diff line
@@ -661,12 +661,20 @@ module Antenna {
		/**
		 * This method should only be used internally to know the scan offsets currently commanded
		 * @throw CORBA::SystemException
		 * @param lonOff user offset for the longitude (radians)
		 * @param latOff user offset for the latitude (radians)
		 * @param lonOff scan offset for the longitude (radians)
		 * @param latOff scan offset for the latitude (radians)
		 * @param offFrame reference frame of the offsets
		 */
		void getScanOffsets(out double lonOff, out double latOff,out TCoordinateFrame offFrame);
		
		/**
		 * This method should only be used internally to know the user offsets currently commanded
		 * @throw CORBA::SystemException
		 * @param lonOff user offset for the longitude (radians)
		 * @param latOff user offset for the latitude (radians)
		 * @param offFrame reference frame of the offsets
		 */
		void getUserOffsets(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
+15 −6
Original line number Diff line number Diff line
@@ -635,16 +635,25 @@ public:
	/**
	 * This method should only be used internally to know the scan offsets currently commanded
	 * @throw CORBA::SystemException
	 * @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)
	 * @param lonOff scan offset for longitude (radians)
	 * @param latOff scan offset for latitude (radians)
	 * @param frameOff scan offset frame
	*/
	void getScanOffsets(CORBA::Double_out lonOff,CORBA::Double_out latOff,
	 Antenna::TCoordinateFrame_out frameOff) throw (CORBA::SystemException);
	 
	/**
	 * This method should only be used internally to know the user offsets currently commanded
	 * @throw CORBA::SystemException
	 * @throw CORBA::SystemException
	 * @param lonOff user offset for longitude (radians)
	 * @param latOff user offset for latitude (radians)
	 * @param frameOff user offset frame
	*/
	void getUserOffsets(CORBA::Double_out lonOff,CORBA::Double_out latOff,
	 Antenna::TCoordinateFrame_out frameOff) throw (CORBA::SystemException);
	 
	
	/**
	 * It can be called to know which is the axis the antenna is currently performing the scan
	 * @param axis returned identfier of the axis
+5 −0
Original line number Diff line number Diff line
@@ -327,6 +327,11 @@ public:
	*/	
	void getScanOffsets(double& lonOff,double& latOff,Antenna::TCoordinateFrame& frame);

	/**
	* Get the scan offsets configured for the current scan 
	*/		
	void getUserOffsets(double& lonOff,double& latOff,Antenna::TCoordinateFrame& frame);
	
	/**
	 * @return the J2000 right ascension of the target
	 */
+15 −0
Original line number Diff line number Diff line
@@ -627,6 +627,21 @@ void AntennaBossImpl::getScanOffsets(CORBA::Double_out lonOff,CORBA::Double_out
	lonOff=(CORBA::Double)lon; latOff=(CORBA::Double)lat; frameOff=frame;
}

void AntennaBossImpl::getUserOffsets(CORBA::Double_out lonOff,CORBA::Double_out latOff,
 Antenna::TCoordinateFrame_out frameOff) throw (CORBA::SystemException)
{
	double lon,lat;
	Antenna::TCoordinateFrame frame;
	if (!m_core) {
		lonOff=latOff=0.0;
		frameOff=Antenna::ANT_HORIZONTAL;
		return;
	}
	CSecAreaResourceWrapper<CBossCore> resource=m_core->Get("IMPL:getScanOffsets");
	resource->getUserOffsets(lon,lat,frame);
	lonOff=(CORBA::Double)lon; latOff=(CORBA::Double)lat; frameOff=frame;
}

void AntennaBossImpl::getScanAxis (Management::TScanAxis_out axis) throw (CORBA::SystemException)
{
	if (!m_core) {
Loading