diff --git a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml index 9481f7890788a154112c0b50bd231433a4a1be92..c8cb3564cc04d1d6db172fee86be468475c5da2d 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml @@ -23,6 +23,8 @@ <MISTRAL> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL> <MISTRAL_ASACTIVE> <axis>ROTATION</axis> <coefficients>-51.821170 </coefficients></MISTRAL_ASACTIVE> + <CABINET> <axis>ROTATION</axis> <coefficients>40 </coefficients></CABINET> + <!-- BWG - GFR open - configurations commented out since the SETUP command takes care of positioning the GFR to 0 --> <!--CCB> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB--> <!--CCB_ASACTIVE> <axis>ROTATION</axis> <coefficients>0 </coefficients></CCB_ASACTIVE--> diff --git a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h index 3c5446638b63224658901858b589ab3370ab1aa0..cae77edb364c453394e25fd0990fe57aa35fc462 100644 --- a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h +++ b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h @@ -79,11 +79,11 @@ namespace MinorServo using DiscosConfigurationNameTableType = std::map<std::string, std::pair<SRTMinorServoFocalConfiguration, bool>>; const DiscosConfigurationNameTableType DiscosConfigurationNameTable = { - {"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, - {"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)}, - {"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, - {"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)}, - {"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)}, + //{"LLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, + //{"PPP", std::make_pair(CONFIGURATION_PRIMARY, false)}, + //{"PLP", std::make_pair(CONFIGURATION_PRIMARY, false)}, + //{"HHP", std::make_pair(CONFIGURATION_PRIMARY, false)}, + //{"XKP", std::make_pair(CONFIGURATION_PRIMARY, false)}, {"CCG", std::make_pair(CONFIGURATION_GREGORIAN1, true )}, {"KKG", std::make_pair(CONFIGURATION_GREGORIAN2, true )}, {"WWG", std::make_pair(CONFIGURATION_GREGORIAN3, true )}, @@ -92,6 +92,7 @@ namespace MinorServo {"MISTRAL", std::make_pair(CONFIGURATION_GREGORIAN6, true )}, {"CCB", std::make_pair(CONFIGURATION_BWG1, true )}, {"XB", std::make_pair(CONFIGURATION_BWG3, true )}, + {"CABINET", std::make_pair(CONFIGURATION_GREGORIAN7, false)}, }; /** diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd index 858936df267329f497190fd6f80b87837e75e7bc..4470ec709449f3e8ce3cec3c07a768e9cf3bdd50 100644 --- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd +++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd @@ -44,6 +44,7 @@ <xs:element name="CCB_ASACTIVE" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="XB" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="XB_ASACTIVE" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" /> + <xs:element name="CABINET" type="SRTMinorServoCoefficientsType" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType>