From d8759752ea2789173be5ab623a129ef3eefc21e6 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Wed, 10 Apr 2024 15:19:07 +0000 Subject: [PATCH] Various updates, see changelog below Fix #861, increased SRP virtual ranges Fix #860, added setupMISTRAL procedure Fix #859, increased fields length for minor servo boss TUI Fix #858, modified SRT telescopePark procedure --- .../src/MinorServoBossTextClient.cpp | 2 +- .../SRP/LookupTables/LookupTables.xml | 18 +++++----- .../DataBlock/PointingModel/PointingModel.xml | 35 +++++++++++++++++++ SRT/CDB/alma/MINORSERVO/SRP/SRP.xml | 4 +-- .../StationProcedures/StationProcedures.xml | 23 +++++++++--- .../SRP/LookupTables/LookupTables.xml | 18 +++++----- .../DataBlock/PointingModel/PointingModel.xml | 35 +++++++++++++++++++ .../CDB/alma/MINORSERVO/SRP/SRP.xml | 4 +-- .../StationProcedures/StationProcedures.xml | 23 +++++++++--- 9 files changed, 131 insertions(+), 31 deletions(-) diff --git a/Common/Clients/MinorServoBossTextClient/src/MinorServoBossTextClient.cpp b/Common/Clients/MinorServoBossTextClient/src/MinorServoBossTextClient.cpp index c90158e95..9a5baeeab 100644 --- a/Common/Clients/MinorServoBossTextClient/src/MinorServoBossTextClient.cpp +++ b/Common/Clients/MinorServoBossTextClient/src/MinorServoBossTextClient.cpp @@ -279,7 +279,7 @@ int main(int argc, char *argv[]) { userInput=new TW::CInputCommand(); /** setting up the properties of the components of the frame controls */ - _TW_SET_COMPONENT(actualSetup_field,18,0,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(actualSetup_field,18,0,20,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); tracking_display->setPosition(CPoint(18,1)); tracking_display->setOrientation(TW::CPropertyLedDisplay::HORIZONTAL); tracking_display->setFormatFunction(boolFormat,NULL); diff --git a/SRT/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml b/SRT/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml index 6869a5c77..0cabed4bb 100644 --- a/SRT/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml +++ b/SRT/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml @@ -80,18 +80,18 @@ RY0 RZ0 - TX38 - TY31 - TZ-12.788622422210521 - RX-0.005254963341757046 + 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 - TX38 - TY31 - TZ-12.788622422210521 - RX-0.005254963341757046 - RY-0.03611111111111111 + 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 diff --git a/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 14a8fbca7..dfad02903 100644 --- a/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -174,4 +174,39 @@ 0 0 + + MISTRAL + 90.0 + 1 -2.2956719398 + 0 0.0 + 1 -0.0056679383 + 1 -0.0074789114 + 1 -0.0008009398 + 1 -0.0015651340 + 1 0.0572288483 + 1 0.1136546656 + 0 0.0 + 0 0.0 + 1 -0.0004978125 + 0 0.0 + 1 0.0002358370 + 1 0.0000537828 + 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/CDB/alma/MINORSERVO/SRP/SRP.xml b/SRT/CDB/alma/MINORSERVO/SRP/SRP.xml index eebfba2c7..d48d39ad4 100644 --- a/SRT/CDB/alma/MINORSERVO/SRP/SRP.xml +++ b/SRT/CDB/alma/MINORSERVO/SRP/SRP.xml @@ -11,8 +11,8 @@ virtual_axes="6" max_speed="4, 4, 4, 0.38, 0.38, 0.38" acceleration="8, 8, 8, 0.76, 0.76, 0.76" - min_range="-50, -110, -50, -0.25, -0.25, -0.25" - max_range="50, 110, 50, 0.25, 0.25, 0.25" + min_range="-125, -125, -125, -0.25, -0.25, -0.25" + max_range="125, 125, 125, 0.25, 0.25, 0.25" tracking_delta="1, 1, 1, 1, 1, 1"> diff --git a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 4d86ea178..4be2b1e2d 100644 --- a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -119,16 +119,31 @@ + + + antennaSetup=MISTRAL + servoSetup=MISTRAL + receiversSetup=KKG + receiversMode=SINGLEDISH + chooseBackend=TotalPower + initialize=CCG + device=0 + calOff + restFrequency=0 + azelOffsets=0d,0d + + + - goTo=180d,89.8d + goTo=*,89.8d + receiversPark + servoPark + asPark waitOnSource antennaStop wait=1 antennaPark - receiversPark - servoPark - asPark logMessage=Telescope is now parked 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 6869a5c77..0cabed4bb 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/MinorServo/SRP/LookupTables/LookupTables.xml @@ -80,18 +80,18 @@ RY0 RZ0 - TX38 - TY31 - TZ-12.788622422210521 - RX-0.005254963341757046 + 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 - TX38 - TY31 - TZ-12.788622422210521 - RX-0.005254963341757046 - RY-0.03611111111111111 + 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 diff --git a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 14a8fbca7..dfad02903 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -174,4 +174,39 @@ 0 0 + + MISTRAL + 90.0 + 1 -2.2956719398 + 0 0.0 + 1 -0.0056679383 + 1 -0.0074789114 + 1 -0.0008009398 + 1 -0.0015651340 + 1 0.0572288483 + 1 0.1136546656 + 0 0.0 + 0 0.0 + 1 -0.0004978125 + 0 0.0 + 1 0.0002358370 + 1 0.0000537828 + 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/MINORSERVO/SRP/SRP.xml b/SRT/Configuration/CDB/alma/MINORSERVO/SRP/SRP.xml index eebfba2c7..d48d39ad4 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/SRP/SRP.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/SRP/SRP.xml @@ -11,8 +11,8 @@ virtual_axes="6" max_speed="4, 4, 4, 0.38, 0.38, 0.38" acceleration="8, 8, 8, 0.76, 0.76, 0.76" - min_range="-50, -110, -50, -0.25, -0.25, -0.25" - max_range="50, 110, 50, 0.25, 0.25, 0.25" + min_range="-125, -125, -125, -0.25, -0.25, -0.25" + max_range="125, 125, 125, 0.25, 0.25, 0.25" tracking_delta="1, 1, 1, 1, 1, 1"> diff --git a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 4d86ea178..4be2b1e2d 100644 --- a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -119,16 +119,31 @@ + + + antennaSetup=MISTRAL + servoSetup=MISTRAL + receiversSetup=KKG + receiversMode=SINGLEDISH + chooseBackend=TotalPower + initialize=CCG + device=0 + calOff + restFrequency=0 + azelOffsets=0d,0d + + + - goTo=180d,89.8d + goTo=*,89.8d + receiversPark + servoPark + asPark waitOnSource antennaStop wait=1 antennaPark - receiversPark - servoPark - asPark logMessage=Telescope is now parked -- GitLab