Unverified Commit 98966072 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #922, SRT MS configurations are not hardcoded anymore (#923) 

This branch contains also some other fixes for the SRT minor servos
- Replaced the word 'LookupTables' with 'Polynomial' or 'Coefficients'.
- Reviewed some logging lines that erroneously appeared in the LoggingDisplay even though they were not supposed to.
parent e376ca04

SRT/CDB/alma/DataBlock/MinorServo/Boss/Configurations/Configurations.xml

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - Author: Giuseppe Carboni

   - History:

 	- 02-04-25 Created

-->



<SRTMinorServoBossConfigurationsTable xmlns="urn:schemas-cosylab-com:SRTMinorServoBoss:1.0" 

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">



    <configuration> <DISCOS>LLP</DISCOS>     <LDO>Primario</LDO>    </configuration>

    <configuration> <DISCOS>PPP</DISCOS>     <LDO>Primario</LDO>    </configuration>

    <configuration> <DISCOS>PLP</DISCOS>     <LDO>Primario</LDO>    </configuration>

    <configuration> <DISCOS>HHP</DISCOS>     <LDO>Primario</LDO>    </configuration>

    <configuration> <DISCOS>XKP</DISCOS>     <LDO>Primario</LDO>    </configuration>

    <configuration> <DISCOS>CCG</DISCOS>     <LDO>Gregoriano1</LDO> </configuration>

    <configuration> <DISCOS>KKG</DISCOS>     <LDO>Gregoriano2</LDO> </configuration>

    <configuration> <DISCOS>WWG</DISCOS>     <LDO>Gregoriano3</LDO> </configuration>

    <configuration> <DISCOS>QQG</DISCOS>     <LDO>Gregoriano4</LDO> </configuration>

    <configuration> <DISCOS>CTR</DISCOS>     <LDO>Gregoriano5</LDO> </configuration>

    <configuration> <DISCOS>MISTRAL</DISCOS> <LDO>Gregoriano6</LDO> </configuration>

    <configuration> <DISCOS>CCB</DISCOS>     <LDO>BWG1</LDO>        </configuration>

    <configuration> <DISCOS>XB</DISCOS>      <LDO>BWG3</LDO>        </configuration>



</SRTMinorServoBossConfigurationsTable>

SRT/CDB/alma/DataBlock/MinorServo/GFR/Coefficients/Coefficients.xml

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - Author: Giuseppe Carboni

   - History:

 	- 14-03-23 Created

-->



<SRTMinorServoCoefficientsTable xmlns="urn:schemas-cosylab-com:SRTMinorServoCoefficients:1.0" 

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">



    <!-- n stands for name, a stands for axis, p stands for polynomial -->



    <configuration><n>CCG</n>     <a>ROTATION</a><p>-88.70659  </p></configuration>



    <configuration><n>KKG</n>     <a>ROTATION</a><p>-159.8899  </p></configuration>



    <configuration><n>WWG</n>     <a>ROTATION</a><p>90.971610  </p></configuration>



    <configuration><n>QQG</n>     <a>ROTATION</a><p>162.771    </p></configuration>



    <configuration><n>CTR</n>     <a>ROTATION</a><p>55.373967  </p></configuration>



    <configuration><n>MISTRAL</n> <a>ROTATION</a><p>-51.821170 </p></configuration>



    <!-- BWG configurations are not necessary since the SETUP command takes care of positioning the GFR to 0 -->



</SRTMinorServoCoefficientsTable>

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

deleted100644 → 0
+0 −32
Original line number Original line Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - Author: Giuseppe Carboni

   - History:

 	- 14-03-23 Created

-->



<SRTMinorServoLookupTable xmlns="urn:schemas-cosylab-com:SRTMinorServoLookupTable:1.0" 

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">



    <CCG>               <axis>ROTATION</axis> <coefficients>-88.70659   </coefficients></CCG>

    <CCG_ASACTIVE>      <axis>ROTATION</axis> <coefficients>-88.70659   </coefficients></CCG_ASACTIVE>

    <KKG>               <axis>ROTATION</axis> <coefficients>-159.8899   </coefficients></KKG>

    <KKG_ASACTIVE>      <axis>ROTATION</axis> <coefficients>-159.8899   </coefficients></KKG_ASACTIVE>

    <WWG>               <axis>ROTATION</axis> <coefficients>90.971610   </coefficients></WWG>

    <WWG_ASACTIVE>      <axis>ROTATION</axis> <coefficients>90.971610   </coefficients></WWG_ASACTIVE>

    <QQG>               <axis>ROTATION</axis> <coefficients>162.771     </coefficients></QQG>

    <QQG_ASACTIVE>      <axis>ROTATION</axis> <coefficients>162.771     </coefficients></QQG_ASACTIVE>

    <TRI>               <axis>ROTATION</axis> <coefficients>55.373967   </coefficients></TRI>

    <TRI_ASACTIVE>      <axis>ROTATION</axis> <coefficients>55.373967   </coefficients></TRI_ASACTIVE>

    <MISTRAL>           <axis>ROTATION</axis> <coefficients>-51.821170  </coefficients></MISTRAL>

    <MISTRAL_ASACTIVE>  <axis>ROTATION</axis> <coefficients>-51.821170  </coefficients></MISTRAL_ASACTIVE>



    <!-- 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-->

    <!--XB>                <axis>ROTATION</axis> <coefficients>0           </coefficients></XB-->

    <!--XB_ASACTIVE>       <axis>ROTATION</axis> <coefficients>0           </coefficients></XB_ASACTIVE-->



</SRTMinorServoLookupTable>

SRT/CDB/alma/DataBlock/MinorServo/M3R/LookupTables/LookupTables.xml→SRT/CDB/alma/DataBlock/MinorServo/M3R/Coefficients/Coefficients.xml

+19 −0
Original line number Original line Diff line number Diff line
@@ -5,14 +5,15 @@ 
 	- 14-03-23 Created

 	- 14-03-23 Created

-->

-->





<SRTMinorServoLookupTable xmlns="urn:schemas-cosylab-com:SRTMinorServoLookupTable:1.0" 

<SRTMinorServoCoefficientsTable xmlns="urn:schemas-cosylab-com:SRTMinorServoCoefficients:1.0" 

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">





    <CCB>           <axis>ROTATION</axis> <coefficients>44.95999544939037931    </coefficients></CCB>

    <!-- n stands for name, a stands for axis, p stands for polynomial -->

    <CCB_ASACTIVE>  <axis>ROTATION</axis> <coefficients>44.95999544939037931    </coefficients></CCB_ASACTIVE>

    <XB>            <axis>ROTATION</axis> <coefficients>135.003886290282340384  </coefficients></XB>

    <XB_ASACTIVE>   <axis>ROTATION</axis> <coefficients>135.003886290282340384  </coefficients></XB_ASACTIVE>





</SRTMinorServoLookupTable>
 
    <configuration><n>CCB</n><a>ROTATION</a><p>44.95999544939037931     </p></configuration>



    <configuration><n>XB</n> <a>ROTATION</a><p>135.003886290282340384   </p></configuration>



</SRTMinorServoCoefficientsTable>

SRT/CDB/alma/DataBlock/MinorServo/PFP/Coefficients/Coefficients.xml

0 → 100644
+35 −0
Original line number Original line Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - Author: Giuseppe Carboni

   - History:

 	- 14-03-23 Created

-->



<SRTMinorServoCoefficientsTable xmlns="urn:schemas-cosylab-com:SRTMinorServoCoefficients:1.0" 

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">



    <!-- n stands for name, a stands for axis, p stands for polynomial -->



    <configuration><n>LLP</n><a>TX</a>      <p>0</p></configuration>

    <configuration><n>LLP</n><a>TZ</a>      <p>0</p></configuration>

    <configuration><n>LLP</n><a>RTHETA</a>  <p>0</p></configuration>



    <configuration><n>PPP</n><a>TX</a>      <p>0</p></configuration>

    <configuration><n>PPP</n><a>TZ</a>      <p>0</p></configuration>

    <configuration><n>PPP</n><a>RTHETA</a>  <p>0</p></configuration>



    <configuration><n>PLP</n><a>TX</a>      <p>0</p></configuration>

    <configuration><n>PLP</n><a>TZ</a>      <p>0</p></configuration>

    <configuration><n>PLP</n><a>RTHETA</a>  <p>0</p></configuration>



    <configuration><n>HHP</n><a>TX</a>      <p>0</p></configuration>

    <configuration><n>HHP</n><a>TZ</a>      <p>0</p></configuration>

    <configuration><n>HHP</n><a>RTHETA</a>  <p>0</p></configuration>



    <configuration><n>XKP</n><a>TX</a>      <p>0</p></configuration>

    <configuration><n>XKP</n><a>TZ</a>      <p>0</p></configuration>

    <configuration><n>XKP</n><a>RTHETA</a>  <p>0</p></configuration>



</SRTMinorServoCoefficientsTable>