Fix #81: argument time clashes with alma.ACS.Time (97c27619) · Commits · INAF / DISCOS

Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl

+11 −11

Original line number	Diff line number	Diff line
		@@ -584,17 +584,17 @@ module Antenna {
		* This method should only be used internally to know the raw coordinates commanded to the mount. You must provide the timemark
		* your coordinates have to refer to.
		* @throw CORBA::SyStemException
		* @param time this indicates to the routine the time to which the coordinates refer
		* @param timemark this indicates to the routine the time to which the coordinates refer
		* @param az the raw azimuth in radians
		* @param el the raw elevation in radians
		*/
		void getRawCoordinates(in ACS::Time time,out double az,out double el);
		void getRawCoordinates(in ACS::Time timemark,out double az,out double el);

		/**
		* This method should only be used internally to know the apparent coordinates commanded. You must provide the timemark
		* your coordinates have to refer to. Apparent coordinates are included with user offsets and come directly fro ephemeris generator. They should differ from observed coordinate just for pointing errors.
		* @throw CORBA::SyStemException
		* @param time this indicates the time the coordinates refer to
		* @param timemark this indicates the time the coordinates refer to
		* @param az the apparent azimuth in radians
		* @param el the apparent elevation in radians
		* @param ra apparent right ascension in radinas
		@@ -603,48 +603,48 @@ module Antenna {
		* @param lon galactic longitude corresponding to the apparent equatorial
		* @param lat galactic latitude corresponding to the apparent equatorial
		*/
		void getApparentCoordinates(in ACS::Time time,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat);
		void getApparentCoordinates(in ACS::Time timemark,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat);

		/**
		* This method should only be used internally to know the observed equatorial coordinates. A timestamp to which the coordinates
		* referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of
		* an interpolation. The equinox is J2000. They directly come from the observed in the horizontal frame.
		* In case duration is greter than the configured coordinate integration time, the returned coordinates are the result of the average over the duration interval that starts
		* from <i>time</i>.
		* from <i>timestamp</i>.
		* @throw CORBA::SystemExcpetion
		* @param time the input timestamp
		* @param timestamp the input timestamp
		* @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged
		* over the provided interval.
		* @param ra the returned observed right ascension in radians
		* @param dec the returned observed declination in radians
		*/
		void getObservedEquatorial(in ACS::Time time,in ACS::TimeInterval duration,out double ra,out double dec);
		void getObservedEquatorial(in ACS::Time timestamp,in ACS::TimeInterval duration,out double ra,out double dec);

		/**
		* This method should only be used internally to know the observed galactic coordinates. A timestamp to which the coordinates
		* referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of
		* an interpolation. They are obtained by converting the corresponding J2000 observed equatorial coordinates.
		* @throw CORBA::SystemExcpetion
		* @param time the input timestamp
		* @param timestamp the input timestamp
		* @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged
		* over the provided interval.
		* @param ra the returned observed galactic longitude in radians
		* @param dec the returned observed galactic latitude in radians
		*/
		void getObservedGalactic(in ACS::Time time,in ACS::TimeInterval duration, out double longitude,out double latitude);
		void getObservedGalactic(in ACS::Time timestamp,in ACS::TimeInterval duration, out double longitude,out double latitude);

		/**
		* This method should only be used internally to know the observed horizontal coordinates. A timestamp to which the coordinates
		* referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of
		* an interpolation. They are obtained by the encoders coordinates depurated by instrumental effects..
		* @throw CORBA::SystemExcpetion
		* @param time the input timestamp
		* @param timestamp the input timestamp
		* @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged
		* over the provided interval.
		* @param ra the returned observed azimuth in radians
		* @param dec the returned observed elevation in radians
		*/
		void getObservedHorizontal(in ACS::Time time,in ACS::TimeInterval duration,out double az,out double el);
		void getObservedHorizontal(in ACS::Time timestamp,in ACS::TimeInterval duration,out double az,out double el);

		/**
		* This method should only be used internally to know the user offsets currently commanded

Common/Interfaces/AntennaInterface/idl/EphemGenerator.idl

+6 −6

Original line number	Diff line number	Diff line
		@@ -98,16 +98,16 @@ module Antenna {
		* This method is only for control software internal use. It used, given a timestamp, to retrive the apparent
		* horizontal coordinates in one shot.
		* @throw CORBA::SystemException
		* @param time this parameter is used to pass the excat time the caller wants to know the topocentric coordinates.
		* @param timestamp this parameter is used to pass the exact time the caller wants to know the topocentric coordinates.
		* @param az that's the returned value in radians of the azimuth for the requested time.
		* @param el that's the returned value in radians of the elevation for the requested time.
		*/
		void getHorizontalCoordinate(in ACS::Time time, out double az,out double el);
		void getHorizontalCoordinate(in ACS::Time timestamp, out double az,out double el);

		/**
		* This method should only be used internally to know the apparent coordinates in all frames.
		* @throw CORBA::SyStemException
		* @param time this indicates the time the coordinates refer to
		* @param timestamp this indicates the time the coordinates refer to
		* @param az the apparent azimuth in radians
		* @param el the apparent elevation in radians
		* @param ra apparent right ascension in radinas
		@@ -116,7 +116,7 @@ module Antenna {
		* @param lon galactic longitude corresponding to the apparent equatorial
		* @param lat galactic latitude corresponding to the apparent equatorial
		*/
		void getAllCoordinates(in ACS::Time time,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat);
		void getAllCoordinates(in ACS::Time timestamp,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat);

		/**
		* This method is called internally to know if the telescope is tracking the right position or not. The generator will subtract the
		@@ -127,7 +127,7 @@ module Antenna {
		* into account the fact that during acceleration ramps the antenna is not,stritcly speaking, tracking.
		* The coordinates passed here must be observed (depurated by all the instrumental effects and correction that are used
		* to point correctly the telescope)
		* @param time represent the time that the provided azimuth and elevation referes to. The component will compute its azimuth
		* @param timestamp represent the time that the provided azimuth and elevation referes to. The component will compute its azimuth
		* and elevation in order to compare them.
		* @param az the azimuth (radians) of the coordinate where the telescope is, if it is nearby (inside HPBW) the computed (by this
		* component) one, the antenna is tracking.
		@@ -136,7 +136,7 @@ module Antenna {
		* @param HPBW the beam width at half power(radians), used to decide if the pointing errors
		* @return true if the antenna is tracking, false in all other cases.
		*/
		boolean checkTracking (in ACS::Time time,in double az,in double el,in double HPBW);
		boolean checkTracking (in ACS::Time timestamp,in double az,in double el,in double HPBW);

		/**
		* This method is used to calculate the flux of a source who's parameter

Common/Interfaces/AntennaInterface/idl/Mount.midl

+7 −7

Original line number	Diff line number	Diff line
		@@ -148,10 +148,10 @@ module Antenna {
		* @throw CORBA::SystemException
		* @param az azimuth of the data point that will be transfered (degrees)
		* @param el elevation of the data point that will be transfered (degrees)
		* @param time time stamp of the data point, the mount will try to reach that point at the given time
		* @param timestamp time stamp of the data point, the mount will try to reach that point at the given time
		* @param restart if true the data point stack will be cleared and all previuos loaded point will be lost.
		*/
		void programTrack(in double az,in double el,in ACS::Time time,in boolean restart) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx);
		void programTrack(in double az,in double el,in ACS::Time timestamp,in boolean restart) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx);

		/**
		* This method can be used to stop all running operation (jobs that requires long time to complete) or in a more simple way to
		@@ -246,29 +246,29 @@ module Antenna {
		* This method is used internally by client component. It is used to read the azimuth, elevation, azimuthOffset and elevationOffset in one shot.
		* All these information are marked with a timestamp. The returned values are in degrees. At any time if you want to know the obseverd sky point
		* you have to subtract to each coordinate the respective offset.
		* @param time this timestamp marks the other values returned by this method
		* @param timestamp this timestamp marks the other values returned by this method
		* @param azimuth returns the azimuth read directly from the mount encoders
		* @param elevation returns the elevation read directly from the mount encoders, it is exactly the same value of the property <i>elevation</i>
		* @param azOff returns the value of the instant offset for the azimuth axe. This value is the last commanded by the method <i>setOffsets</i>.
		* @param elOff returns the value of the instant offset for the elevation axe. This value is the last commanded by the method <i>setOffsets</i>.
		* @param section this parameter brings the information of the section in which the mount is at the epoch given by parameter <i>time</i>.
		* @param section this parameter brings the information of the section in which the mount is at the epoch given by parameter <i>timestamp</i>.
		* @throw CORBA::SystemException
		* @throw ComponentErrors::ComponentErrorsEx
		* @thorw AntennaErrors::AntennaErrorsEx
		*/
		void getEncoderCoordinates(out ACS::Time time,out double azimuth,out double elevation,out double azOff,
		void getEncoderCoordinates(out ACS::Time timestamp,out double azimuth,out double elevation,out double azOff,
		out double elOff,out TSections section) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx);

		/**
		* This method is internally used to retrieve antenna errors in one time.
		* @param time this is the timestamp that marks the other values returned by this method
		* @param timestamp this is the timestamp that marks the other values returned by this method
		* @param azError error in azimuth in degrees
		* @param elError error in elevation in degrees
		* @throw CORBA::SystemException
		* @throw ComponentErrors::ComponentErrorsEx
		* @thorw AntennaErrors::AntennaErrorsEx
		*/
		void getAntennaErrors(out ACS::Time time,out double azError,out double elError) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx);
		void getAntennaErrors(out ACS::Time timestamp,out double azError,out double elError) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx);

		/**
		* This method is used internally by client components. It can be used to force the azimuth range the mount will travel in order to reach the