Commit 864f5afa authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Added MinorServos CABINET GFR configuration

parent f9d46107

SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml

+2 −0
Original line number Diff line number Diff line
@@ -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-->

SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h

+6 −5
Original line number Diff line number Diff line
@@ -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)},

    };



    /**

SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd

+1 −0
Original line number Diff line number Diff line
@@ -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>