From f63307b151238d94cd25fb7a1074ac8492c13802 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Thu, 13 Feb 2025 15:56:39 +0000 Subject: [PATCH] Various KBANDTEST, MISTRAL and MISTRALOLD updates --- .../GFR/LookupTables/LookupTables.xml | 28 ++++---- .../SRP/LookupTables/LookupTables.xml | 14 ++++ .../DataBlock/PointingModel/PointingModel.xml | 72 ++++++++++++++++++- .../StationProcedures/StationProcedures.xml | 18 ++++- .../include/SRTMinorServoContainers.h | 1 + .../CDB/schemas/SRTMinorServoLookupTable.xsd | 2 + 6 files changed, 120 insertions(+), 15 deletions(-) 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 185c90d1e..55854cfe2 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/GFR/LookupTables/LookupTables.xml @@ -10,19 +10,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - ROTATION -88.70659 - ROTATION -88.70659 - ROTATION -159.8899 - ROTATION -159.8899 - ROTATION -159.8899 - ROTATION 90.971610 - ROTATION 90.971610 - ROTATION 162.771 - ROTATION 162.771 - ROTATION 55.373967 - ROTATION 55.373967 - ROTATION -51.821170 - ROTATION -51.821170 + ROTATION -88.70659 + ROTATION -88.70659 + ROTATION -159.8899 + ROTATION -159.8899 + ROTATION -159.8899 + ROTATION 90.971610 + ROTATION 90.971610 + ROTATION 162.771 + ROTATION 162.771 + ROTATION 55.373967 + ROTATION 55.373967 + ROTATION -51.821170 + ROTATION -51.821170 + ROTATION -51.821170 + ROTATION -51.821170 ROTATION 40 diff --git a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml index 7ef3172a9..ff8c421a1 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml @@ -101,6 +101,20 @@ RY-0.036111111111111108 RZ0 + TX-1.5 + TY28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958 + TZ9.530113849340003,-0.169826241752,0.000419997047,0.000003985237 + RX-0.011392527142374848,-0.0001426193499425,0.000039508844799,-0.000000131010010 + RY-0.03611111111111111 + RZ0 + + TX-1.5 + TY29.556666666666498,0.263472663139432,-0.018206701940039,0.000072373113855 + TZ-15.6669651675,1.9293068324,-0.0628990613,0.0007771141,-0.0000032940 + RX-0.0055555555555569409,0.00014822163433269445,0.000027586713698,-0.000000077732053 + RY-0.036111111111111108 + RZ0 + TX-1.5 TY28.256852219272844,-0.002707044952,-0.009870218853,0.000031617958 TZ9.530113849340003,-0.169826241752,0.000419997047,0.000003985237 diff --git a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 998546dc1..80c69ad84 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -70,6 +70,41 @@ 0 0.0 + + KBANDTEST + 90.0 + 1 -2.2941563129 + 0 0.0 + 1 -0.0093321120 + 1 -0.0093851285 + 1 -0.0008529911 + 1 -0.0014051557 + 1 -0.4696825146 + 1 0.2948508262 + 0 0.0 + 0 0.0 + 1 0.5207281112 + 0 0.0 + 1 0.0001423927 + 1 -0.0000103739 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + + LP 90.0 @@ -175,7 +210,7 @@ - MISTRAL + MISTRAL_OLD 90.0 1 -2.2956719398 0 0.0 @@ -209,4 +244,39 @@ 0 0.0 + + MISTRAL + 90.0 + 1 -2.2941563129 + 0 0.0 + 1 -0.0093321120 + 1 -0.0093851285 + 1 -0.0008529911 + 1 -0.0014051557 + 1 -0.4696825146 + 1 0.2948508262 + 0 0.0 + 0 0.0 + 1 0.5207281112 + 0 0.0 + 1 0.0001423927 + 1 -0.0000103739 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + + diff --git a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index ea50c5e6f..b8c9eb08b 100644 --- a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -51,7 +51,7 @@ - antennaSetup=KKG + antennaSetup=KBANDTEST servoSetup=KBAND_TEST receiversSetup=KKG receiversMode=SINGLEDISH @@ -159,6 +159,22 @@ + + + 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 + + + goTo=*,89.8d diff --git a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h index b903f270d..2c679b4df 100644 --- a/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h +++ b/SRT/Libraries/SRTMinorServoLibrary/include/SRTMinorServoContainers.h @@ -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)}, diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd index 895ab7aac..d26e8fe96 100644 --- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd +++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/SRTMinorServoLookupTable.xsd @@ -41,6 +41,8 @@ + + -- GitLab