Commit f63307b1 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Various KBANDTEST, MISTRAL and MISTRALOLD updates

parent 3cab9f3d

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

+15 −13
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    <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>

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

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



    <CABINET>           <axis>ROTATION</axis> <coefficients>40          </coefficients></CABINET>

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

+14 −0
Original line number Diff line number Diff line
@@ -101,6 +101,20 @@ 
    <MISTRAL_ASACTIVE>  <axis>RY</axis><coefficients>-0.036111111111111108                                                                                              </coefficients></MISTRAL_ASACTIVE>

    <MISTRAL_ASACTIVE>  <axis>RZ</axis><coefficients>0                                                                                                                  </coefficients></MISTRAL_ASACTIVE>



    <MISTRAL_OLD>       <axis>TX</axis><coefficients>-1.5                                                                                                               </coefficients></MISTRAL_OLD>

    <MISTRAL_OLD>       <axis>TY</axis><coefficients>28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958                                                  </coefficients></MISTRAL_OLD>

    <MISTRAL_OLD>       <axis>TZ</axis><coefficients>9.530113849340003,-0.169826241752,0.000419997047,0.000003985237                                                    </coefficients></MISTRAL_OLD>

    <MISTRAL_OLD>       <axis>RX</axis><coefficients>-0.011392527142374848,-0.0001426193499425,0.000039508844799,-0.000000131010010                                     </coefficients></MISTRAL_OLD>

    <MISTRAL_OLD>       <axis>RY</axis><coefficients>-0.03611111111111111                                                                                               </coefficients></MISTRAL_OLD>

    <MISTRAL_OLD>       <axis>RZ</axis><coefficients>0                                                                                                                  </coefficients></MISTRAL_OLD>



    <MISTRAL_OLD_ASACTIVE>  <axis>TX</axis><coefficients>-1.5                                                                                                           </coefficients></MISTRAL_OLD_ASACTIVE>

    <MISTRAL_OLD_ASACTIVE>  <axis>TY</axis><coefficients>29.556666666666498,0.263472663139432,-0.018206701940039,0.000072373113855                                      </coefficients></MISTRAL_OLD_ASACTIVE>

    <MISTRAL_OLD_ASACTIVE>  <axis>TZ</axis><coefficients>-15.6669651675,1.9293068324,-0.0628990613,0.0007771141,-0.0000032940                                           </coefficients></MISTRAL_OLD_ASACTIVE>

    <MISTRAL_OLD_ASACTIVE>  <axis>RX</axis><coefficients>-0.0055555555555569409,0.00014822163433269445,0.000027586713698,-0.000000077732053                             </coefficients></MISTRAL_OLD_ASACTIVE>

    <MISTRAL_OLD_ASACTIVE>  <axis>RY</axis><coefficients>-0.036111111111111108                                                                                          </coefficients></MISTRAL_OLD_ASACTIVE>

    <MISTRAL_OLD_ASACTIVE>  <axis>RZ</axis><coefficients>0                                                                                                              </coefficients></MISTRAL_OLD_ASACTIVE>



    <CCB>               <axis>TX</axis><coefficients>-1.5                                                                                                               </coefficients></CCB>

    <CCB>               <axis>TY</axis><coefficients>28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958                                                  </coefficients></CCB>

    <CCB>               <axis>TZ</axis><coefficients>9.530113849340003,-0.169826241752,0.000419997047,0.000003985237                                                    </coefficients></CCB>

SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml

+71 −1
Original line number Diff line number Diff line
@@ -70,6 +70,41 @@ 
	<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>

	<receiverCode>KBANDTEST</receiverCode>

	<phi>90.0</phi>

	<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2941563129 </coefficientVal00>

	<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>

	<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0093321120 </coefficientVal02>

	<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0093851285 </coefficientVal03>

	<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0008529911 </coefficientVal04>

	<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0014051557 </coefficientVal05>

	<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> -0.4696825146 </coefficientVal06>

	<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.2948508262 </coefficientVal07>

	<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>

	<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>

	<coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.5207281112 </coefficientVal10>

	<coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>

	<coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0001423927 </coefficientVal12>

	<coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0000103739 </coefficientVal13>

	<coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>

	<coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>

	<coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>

	<coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>

	<coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>

	<coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>

	<coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>

	<coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>

	<coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>

	<coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>

	<coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>

	<coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>

	<coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>

	<coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>

	<coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>

	<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>

	<receiverCode>LP</receiverCode>

        <phi>90.0</phi>
@@ -175,7 +210,7 @@ 
</Receiver>



<Receiver>

	<receiverCode>MISTRAL</receiverCode>

	<receiverCode>MISTRAL_OLD</receiverCode>

	<phi>90.0</phi>

	<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2956719398 </coefficientVal00>

	<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>
@@ -209,4 +244,39 @@ 
	<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



<Receiver>

	<receiverCode>MISTRAL</receiverCode>

	<phi>90.0</phi>

	<coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.2941563129 </coefficientVal00>

	<coefficientNum01> 0 </coefficientNum01> <coefficientVal01> 0.0 </coefficientVal01>

	<coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0093321120 </coefficientVal02>

	<coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0093851285 </coefficientVal03>

	<coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0008529911 </coefficientVal04>

	<coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0014051557 </coefficientVal05>

	<coefficientNum06> 1 </coefficientNum06> <coefficientVal06> -0.4696825146 </coefficientVal06>

	<coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.2948508262 </coefficientVal07>

	<coefficientNum08> 0 </coefficientNum08> <coefficientVal08> 0.0 </coefficientVal08>

	<coefficientNum09> 0 </coefficientNum09> <coefficientVal09> 0.0 </coefficientVal09>

	<coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.5207281112 </coefficientVal10>

	<coefficientNum11> 0 </coefficientNum11> <coefficientVal11> 0.0 </coefficientVal11>

	<coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0001423927 </coefficientVal12>

	<coefficientNum13> 1 </coefficientNum13> <coefficientVal13> -0.0000103739 </coefficientVal13>

	<coefficientNum14> 0 </coefficientNum14> <coefficientVal14> 0.0 </coefficientVal14>

	<coefficientNum15> 0 </coefficientNum15> <coefficientVal15> 0.0 </coefficientVal15>

	<coefficientNum16> 0 </coefficientNum16> <coefficientVal16> 0.0 </coefficientVal16>

	<coefficientNum17> 0 </coefficientNum17> <coefficientVal17> 0.0 </coefficientVal17>

	<coefficientNum18> 0 </coefficientNum18> <coefficientVal18> 0.0 </coefficientVal18>

	<coefficientNum19> 0 </coefficientNum19> <coefficientVal19> 0.0 </coefficientVal19>

	<coefficientNum20> 0 </coefficientNum20> <coefficientVal20> 0.0 </coefficientVal20>

	<coefficientNum21> 0 </coefficientNum21> <coefficientVal21> 0.0 </coefficientVal21>

	<coefficientNum22> 0 </coefficientNum22> <coefficientVal22> 0.0 </coefficientVal22>

	<coefficientNum23> 0 </coefficientNum23> <coefficientVal23> 0.0 </coefficientVal23>

	<coefficientNum24> 0 </coefficientNum24> <coefficientVal24> 0.0 </coefficientVal24>

	<coefficientNum25> 0 </coefficientNum25> <coefficientVal25> 0.0 </coefficientVal25>

	<coefficientNum26> 0 </coefficientNum26> <coefficientVal26> 0.0 </coefficientVal26>

	<coefficientNum27> 0 </coefficientNum27> <coefficientVal27> 0.0 </coefficientVal27>

	<coefficientNum28> 0 </coefficientNum28> <coefficientVal28> 0.0 </coefficientVal28>

	<coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0.0 </coefficientVal29>

</Receiver>



</PointingModel>

SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml

+17 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


<Procedure name="setupKBANDTEST" args="0">

<body>

	antennaSetup=KKG

	antennaSetup=KBANDTEST

	servoSetup=KBAND_TEST

	receiversSetup=KKG

	receiversMode=SINGLEDISH
@@ -159,6 +159,22 @@ 
</body>

</Procedure>



<Procedure name="setupMISTRALOLD" args="0">

<body>

	antennaSetup=MISTRAL_OLD

	servoSetup=MISTRAL_OLD

	receiversSetup=KKG

	receiversMode=SINGLEDISH

	chooseBackend=TotalPower

	initialize=CCG

	device=0

	calOff

	restFrequency=0

	azelOffsets=0d,0d

	asSetLUT=LT_lut_20240917_2.txt

</body>

</Procedure>



<Procedure name="telescopePark" args="0">

<body>

	goTo=*,89.8d

SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ namespace MinorServo 
        {"QQG",     std::make_pair(CONFIGURATION_GREGORIAN4, true )},

        {"TRI",     std::make_pair(CONFIGURATION_GREGORIAN5, true )},

        {"MISTRAL", std::make_pair(CONFIGURATION_GREGORIAN6, true )},

        {"MISTRAL_OLD", 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)},