Commit e228166d authored by Marco Buttu's avatar Marco Buttu
Browse files

Fix #167: add the XB configuration

parent 9f2b9b36

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

+34 −1
Original line number Diff line number Diff line
@@ -113,6 +113,39 @@ 
        <coefficientNum29> 0 </coefficientNum29> <coefficientVal29> 0 </coefficientVal29>

</Receiver>



<Receiver>

	<receiverCode>XB</receiverCode>

        <phi>90.0</phi>

        <coefficientNum00> 1 </coefficientNum00> <coefficientVal00> -2.3029563427 </coefficientVal00>

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

        <coefficientNum02> 1 </coefficientNum02> <coefficientVal02> -0.0102762356 </coefficientVal02>

        <coefficientNum03> 1 </coefficientNum03> <coefficientVal03> -0.0050985431 </coefficientVal03>

        <coefficientNum04> 1 </coefficientNum04> <coefficientVal04> -0.0008867322 </coefficientVal04>

        <coefficientNum05> 1 </coefficientNum05> <coefficientVal05> -0.0019946923 </coefficientVal05>

        <coefficientNum06> 1 </coefficientNum06> <coefficientVal06> 0.0873332769 </coefficientVal06>

        <coefficientNum07> 1 </coefficientNum07> <coefficientVal07> 0.0871561393</coefficientVal07>

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

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

        <coefficientNum10> 1 </coefficientNum10> <coefficientVal10> 0.0115426397 </coefficientVal10>

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

        <coefficientNum12> 1 </coefficientNum12> <coefficientVal12> 0.0020223276 </coefficientVal12>

        <coefficientNum13> 1 </coefficientNum13> <coefficientVal13> 0.0008122203 </coefficientVal13>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

</Receiver>



</PointingModel>

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

+14 −0
Original line number Diff line number Diff line
@@ -33,6 +33,20 @@ 
 	<IF>0 1</IF>

</Configuration>



<Configuration>

	<configurationID>XB</configurationID>

 	<sections>1</sections>

 	<calSwitchingEnabled>FALSE</calSwitchingEnabled>

 	<inputPort>BWG</inputPort>

	<inputPortDB>5</inputPortDB>

 	<inputPortBW>2350</inputPortBW>

 	<beams>1</beams>

 	<section_boards>13</section_boards>

 	<polarizations>R</polarizations>

 	<feed>0</feed>

 	<IF>0</IF>

</Configuration>



<Configuration>

	<configurationID>LLP</configurationID>

 	<sections>2</sections>

SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml

+23 −6
Original line number Diff line number Diff line
@@ -57,6 +57,29 @@ 
        @ M3R: RZ(mm) = (286.67);

    "



    XB_ASACTIVE="

        @ PFP: park;

        @ GFR: park;

        @ SRP: TX = (-1.5); 

               TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); 

               TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410);

               RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053);

               RY = (-0.036111111111111108); 

               RZ = (0);

        @ M3R: RZ = (860.8);

    "

    XB="

        @ PFP: park;

        @ GFR: park;

        @ SRP: TX(mm) = (-1.5); 

               TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958);

               TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237);

               RX(degree) = (-0.011392527142374848, -0.0001426193499425, 0.000039508844799, -0.000000131010010); 

               RY(degree) = (-0.03611111111111111); 

               RZ(degree) = (0);

        @ M3R: RZ(mm) = (860.8);

    "

 

    KKG_ASACTIVE="

        @ PFP: park;

        @ SRP: TX = (-1.5);
@@ -119,12 +142,6 @@ 
        @ M3R: RZ(mm) = (860);

    "



    SSP="

        @ SRP: park;

        @ PFP: RY(mm) = (-25.95); TX(mm) = (-223); TZ(mm) = (-67);

        @ GFR: RZ(mm) = (-600);

        @ M3R: RZ(mm) = (860);

    "



    slaves="GFR, M3R, PFP, SRP"

>

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

+6 −6
Original line number Diff line number Diff line
@@ -77,16 +77,16 @@ 
</body>

</Procedure>



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

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

<body>

	antennaSetup=LP

    servoSetup=SSP

	antennaSetup=XB

    servoSetup=XB

	receiversSetup=CCB

	chooseBackend=TotalPower

	initialize=PPP

	initialize=XB

	device=0

	calOff

	restFrequency=0

    setLO=7500

	antennaAzEl=0d,0d

</body>	

</Procedure>

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

+2 −1
Original line number Diff line number Diff line
@@ -132,13 +132,14 @@ 
        <xs:attribute name="slaves" type="xs:string" use="required" />

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

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

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

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

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

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

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

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

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

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

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

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



    </xs:complexType>