Commit 7bd95dd3 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

chooseBackend now support aliases defined for each backend

parent ca7bbde3

Common/Interfaces/CommonInterface/config/CDB/schemas/Managment.xsd

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ 
	<xs:import namespace="urn:schemas-cosylab-com:CDB:1.0" schemaLocation="CDB.xsd"/>

	<xs:import namespace="urn:schemas-cosylab-com:BACI:1.0" schemaLocation="BACI.xsd"/>

	

	<xs:simpleType name="TSubScanSignalBasicType">

		<xs:restriction base="xs:string">

	    	<xs:enumeration value="SIGNAL"/>

	    	<xs:enumeration value="REFERENCE"/>

	    	<xs:enumeration value="NONE"/>

		</xs:restriction>

	</xs:simpleType>

	

	<xs:simpleType name="TScanAxisEnumerationType">

		<xs:annotation><xs:documentation>

			Lists all axis managed by the minor servo system, a subset of the TScanAxis enumeration

Common/Interfaces/CommonInterface/idl/ManagmentDefinitions.midl

+18 −2
Original line number Diff line number Diff line
@@ -70,6 +70,15 @@ module Management { 
		MNG_NONE               /*!< no action */

	};

	

	/**

	 * This enlists all signal values during a subScan

	 */

	enum TSubScanSignal {

		MNG_SIGNAL_SIGNAL,      /*!< The subscan signal is on source  */

		MNG_SIGNAL_REFERENCE,   /*!< The subscan signal is off source  */

		MNG_SIGNAL_NONE         /*!< The subscan signal is undetermined, during OTF for example  */

	};



	/**

	 * Enlist all the supported coordinate frames

	 * @note this is derived one-one to the corresponding structure in Antenna module. This definition is present in order to avoid circular inclusion between
@@ -169,12 +178,19 @@ module Management { 
		/**

		 * It allows to shutdown or park or stow the subsystem, any boss should take all the action required to

		 * put its subsystem in a survival position.

		 * @thorw ManagementErrors::ParkingErrorEx

		 * @throw ManagementErrors::ParkingErrorEx

		 * @throw CORBA::SystemException

		 */

		void park() raises (ManagementErrors::ParkingErrorEx);

	};

	

	/**

	 * This structure contains some information derived from the subscan parameters

	*/

	struct TSubScanConfiguration  {

		TSubScanSignal signal;			/* this indicates the signal of the current subscan */

	};



};



#endif

Common/Interfaces/ManagmentInterface/config/CDB/schemas/TelescopeEquipment.xsd

+8 −0
Original line number Diff line number Diff line
@@ -41,10 +41,18 @@ 
		<xs:attribute name="beamDeviationFactor" type="xs:double" use="required"/>

	</xs:complexType>

	

	<xs:complexType name="AvailableBackendsType">

		<xs:attribute name="alias" type="xs:string" use="required"/>

		<xs:attribute name="backend" type="xs:string" use="required"/>

		<xs:attribute name="noData" type="xs:boolean" use="required"/>

	</xs:complexType>



	<xs:complexType name="TelescopeEquipmentType">

		<xs:sequence>	

			<xs:element name="MinorServoMapping" type="MinorServoMappingType" minOccurs="0" maxOccurs="unbounded" />

			<xs:element name="AvailableBackend" type="AvailableBackendsType" minOccurs="0" maxOccurs="unbounded" />

		</xs:sequence>



		<!-- FTrack resolution, number of decimal positions that are meaningful for the synthetizer, 3 means 100.3456MHz is the same as 100.345MHz  -->

		<xs:attribute name="FTrackPrecisionDigits" type="xs:long" use="required"/>		

	</xs:complexType>

Common/Interfaces/ManagmentInterface/idl/Scheduler.idl

+3 −1
Original line number Diff line number Diff line
@@ -171,7 +171,9 @@ module Management { 
		 * This method allows to change the instance of the backend choosen as default backend. The new backend is not loaded, it will the next time the default backend is required.

		 * The default backend is used (when no schedule is running) to perform some scheduler operations (@sa <i>setDevice()</i> and <i>systemTemperature</i>).

		 * @throw CORBA::SystemExcpetion  

		 * @param bckInstance name of the instance of the new default backend 

		 * @throw ComponentErrors::ComponentErrorsEx

		 * @thorw ManagementErrors::ManagementErrorsEx

		 * @param bckInstance name of the instance of the new default backend or any other assigned alias that the system knows

		 */

		void chooseDefaultBackend(in string bckInstance) raises (ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx);

Common/Servers/NewFitsWriter/include/FileCreator.h

+9 −0
Original line number Diff line number Diff line 
// note, the blank between the macro and the parenthesis is mandatory

#ifdef SCHEMA_TABLE_NUMBER

#define BOOST_PP_LOCAL_LIMITS (1, SCHEMA_TABLE_NUMBER)

#define BOOST_PP_LOCAL_MACRO(n) _FILE_CREATETABLE(n)

#include BOOST_PP_LOCAL_ITERATE()

#endif



#ifdef SCHEMA_HEADER_ENTRY_NUMBER

#define BOOST_PP_LOCAL_LIMITS (1, SCHEMA_HEADER_ENTRY_NUMBER)

#define BOOST_PP_LOCAL_MACRO(n) _FILE_CREATEHEADER(n)

#include BOOST_PP_LOCAL_ITERATE()

#endif



#ifdef SCHEMA_COLUMN_NUMBER

#define BOOST_PP_LOCAL_LIMITS (1, SCHEMA_COLUMN_NUMBER)

#define BOOST_PP_LOCAL_MACRO(n) _FILE_CREATECOLUMNS(n)

#include BOOST_PP_LOCAL_ITERATE()

#endif



#ifdef SCHEMA_DATA_COLUMN_NUMBER

#define BOOST_PP_LOCAL_LIMITS (1, SCHEMA_DATA_COLUMN_NUMBER)

#define BOOST_PP_LOCAL_MACRO(n) _FILE_CREATEDATACOLUMNS(n)

#include BOOST_PP_LOCAL_ITERATE()

#endif