Merge branch 'CLEANUP' into 'master'

Cleanup of structure and fixes See merge request slic/cristallina!2
2025-03-29 18:05:09 +01:00
parent dbf50d3eb9 22c061d83e
commit 64616cf98e
78 changed files with 4180 additions and 44639 deletions
--- a/spreadsheet.py
+++ b/spreadsheet.py
@ -24,49 +24,49 @@ n_unds = [6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22]  # 14 is t

 overview = SimpleDevice(
    "Cristallina Overview",
-    # OKHB154_X_trans       = PVAdjustable("SAROP31-OKBH154:W_X.RBV", internal=True),
-    # OKHB154_Y_trans       = PVAdjustable("SAROP31-OKBH154:W_Y.RBV", internal=True),
-    # OKHB154_X_rot         = PVAdjustable("SAROP31-OKBH154:W_RX.RBV", internal=True),
-    # OKHB154_Y_rot         = PVAdjustable("SAROP31-OKBH154:W_RY.RBV", internal=True),
-    # OKHB154_Z_rot         = PVAdjustable("SAROP31-OKBH154:W_RZ.RBV", internal=True),
-    # OKBV153_X_trans       = PVAdjustable("SAROP31-OKBV153:W_X.RBV", internal=True),
-    # OKBV153_Y_trans       = PVAdjustable("SAROP31-OKBV153:W_Y.RBV", internal=True),
-    # OKBV153_X_rot         = PVAdjustable("SAROP31-OKBV153:W_RX.RBV", internal=True),
-    # OKBV153_Y_rot         = PVAdjustable("SAROP31-OKBV153:W_RY.RBV", internal=True),
-    # OKBV153_Z_rot         = PVAdjustable("SAROP31-OKBV153:W_RZ.RBV", internal=True),
-    # ODMV152_X_trans       = PVAdjustable("SAROP31-OKBV153:W_X.RBV", internal=True),
-    # ODMV152_Y_trans       = PVAdjustable("SAROP31-OKBV153:W_Y.RBV", internal=True),
-    # ODMV152_X_rot         = PVAdjustable("SAROP31-OKBV153:W_RX.RBV", internal=True),
-    # ODMV152_Y_rot         = PVAdjustable("SAROP31-OKBV153:W_RY.RBV", internal=True),
-    # ODMV152_COATING       = PVAdjustable("SAROP31-ODMV152:COATING_SP", internal=True),
+    OKHB154_X_trans       = PVAdjustable("SAROP31-OKBH154:W_X.RBV", internal=True),
+    OKHB154_Y_trans       = PVAdjustable("SAROP31-OKBH154:W_Y.RBV", internal=True),
+    OKHB154_X_rot         = PVAdjustable("SAROP31-OKBH154:W_RX.RBV", internal=True),
+    OKHB154_Y_rot         = PVAdjustable("SAROP31-OKBH154:W_RY.RBV", internal=True),
+    OKHB154_Z_rot         = PVAdjustable("SAROP31-OKBH154:W_RZ.RBV", internal=True),
+    OKBV153_X_trans       = PVAdjustable("SAROP31-OKBV153:W_X.RBV", internal=True),
+    OKBV153_Y_trans       = PVAdjustable("SAROP31-OKBV153:W_Y.RBV", internal=True),
+    OKBV153_X_rot         = PVAdjustable("SAROP31-OKBV153:W_RX.RBV", internal=True),
+    OKBV153_Y_rot         = PVAdjustable("SAROP31-OKBV153:W_RY.RBV", internal=True),
+    OKBV153_Z_rot         = PVAdjustable("SAROP31-OKBV153:W_RZ.RBV", internal=True),
+    ODMV152_X_trans       = PVAdjustable("SAROP31-OKBV153:W_X.RBV", internal=True),
+    ODMV152_Y_trans       = PVAdjustable("SAROP31-OKBV153:W_Y.RBV", internal=True),
+    ODMV152_X_rot         = PVAdjustable("SAROP31-OKBV153:W_RX.RBV", internal=True),
+    ODMV152_Y_rot         = PVAdjustable("SAROP31-OKBV153:W_RY.RBV", internal=True),
+    ODMV152_COATING       = PVAdjustable("SAROP31-ODMV152:COATING_SP", internal=True),
    OATA150_transmission=PVAdjustable("SAROP31-OATA150:TRANS_SP", internal=True),
-    # PBPS149_motor_probe   = PVAdjustable("SAROP31-PBPS149:MOTOR_PROBE.RBV", internal=True),
-    # PBPS149_motor_X1      = PVAdjustable("SAROP31-PBPS149:MOTOR_X1.RBV", internal=True),
-    # PBPS149_motor_Y1      = PVAdjustable("SAROP31-PBPS149:MOTOR_Y1.RBV", internal=True),
-    # PBPS149_wafer         = PVAdjustable("SAROP31-PBPS149:PROBE_SP", internal=True),
-    # OAPU149_hor_pos       = PVAdjustable("SAROP31-OAPU149:MOTOR_X.VAL", internal=True),
-    # OAPU149_hor_width     = PVAdjustable("SAROP31-OAPU149:MOTOR_W.VAL", internal=True),
-    # OAPU149_vert_pos      = PVAdjustable("SAROP31-OAPU149:MOTOR_Y.VAL", internal=True),
-    # OAPU149_vert_width    = PVAdjustable("SAROP31-OAPU149:MOTOR_H.VAL", internal=True),
-    # OAPU107_hor_pos       = PVAdjustable("SAROP31-OAPU107:MOTOR_X.VAL", internal=True),
-    # OAPU107_hor_width     = PVAdjustable("SAROP31-OAPU107:MOTOR_W.VAL", internal=True),
-    # OAPU107_vert_pos      = PVAdjustable("SAROP31-OAPU107:MOTOR_Y.VAL", internal=True),
-    # OAPU107_vert_width    = PVAdjustable("SAROP31-OAPU107:MOTOR_H.VAL", internal=True),
-    # OOMH084_X_trans       = PVAdjustable("SAROP31-OOMH084:W_X.RBV", internal=True),
-    # OOMH084_Y_trans       = PVAdjustable("SAROP31-OOMH084:W_Y.RBV", internal=True),
-    # OOMH084_X_rot         = PVAdjustable("SAROP31-OOMH084:W_RX.RBV", internal=True),
-    # OOMH084_Y_rot         = PVAdjustable("SAROP31-OOMH084:W_RY.RBV", internal=True),
-    # OOMH084_Z_rot         = PVAdjustable("SAROP31-OOMH084:W_RZ.RBV", internal=True),
-    # OOMH084_COATING       = PVAdjustable("SAROP31-OOMH084:COATING_SP", internal=True),
-    # OOMH067_X_trans       = PVAdjustable("SAROP31-OOMH067:W_X.RBV", internal=True),
-    # OOMH067_Y_trans       = PVAdjustable("SAROP31-OOMH067:W_Y.RBV", internal=True),
-    # OOMH067_X_rot         = PVAdjustable("SAROP31-OOMH067:W_RX.RBV", internal=True),
-    # OOMH067_Y_rot         = PVAdjustable("SAROP31-OOMH067:W_RY.RBV", internal=True),
-    # OOMH067_Z_rot         = PVAdjustable("SAROP31-OOMH067:W_RZ.RBV", internal=True),
-    # OOMH067_COATING       = PVAdjustable("SAROP31-OOMH067:COATING_SP", internal=True),
-    SMARACT_MINI_X=PVAdjustable("SARES30-MCS2750:MOT_2.RBV", internal=True),
-    SMARACT_MINI_Y=PVAdjustable("SARES30-MCS2750:MOT_3.RBV", internal=True),
-    SMARACT_MINI_Z=PVAdjustable("SARES30-MCS2750:MOT_1.RBV", internal=True),
+    PBPS149_motor_probe   = PVAdjustable("SAROP31-PBPS149:MOTOR_PROBE.RBV", internal=True),
+    PBPS149_motor_X1      = PVAdjustable("SAROP31-PBPS149:MOTOR_X1.RBV", internal=True),
+    PBPS149_motor_Y1      = PVAdjustable("SAROP31-PBPS149:MOTOR_Y1.RBV", internal=True),
+    PBPS149_wafer         = PVAdjustable("SAROP31-PBPS149:PROBE_SP", internal=True),
+    OAPU149_hor_pos       = PVAdjustable("SAROP31-OAPU149:MOTOR_X.VAL", internal=True),
+    OAPU149_hor_width     = PVAdjustable("SAROP31-OAPU149:MOTOR_W.VAL", internal=True),
+    OAPU149_vert_pos      = PVAdjustable("SAROP31-OAPU149:MOTOR_Y.VAL", internal=True),
+    OAPU149_vert_width    = PVAdjustable("SAROP31-OAPU149:MOTOR_H.VAL", internal=True),
+    OAPU107_hor_pos       = PVAdjustable("SAROP31-OAPU107:MOTOR_X.VAL", internal=True),
+    OAPU107_hor_width     = PVAdjustable("SAROP31-OAPU107:MOTOR_W.VAL", internal=True),
+    OAPU107_vert_pos      = PVAdjustable("SAROP31-OAPU107:MOTOR_Y.VAL", internal=True),
+    OAPU107_vert_width    = PVAdjustable("SAROP31-OAPU107:MOTOR_H.VAL", internal=True),
+    OOMH084_X_trans       = PVAdjustable("SAROP31-OOMH084:W_X.RBV", internal=True),
+    OOMH084_Y_trans       = PVAdjustable("SAROP31-OOMH084:W_Y.RBV", internal=True),
+    OOMH084_X_rot         = PVAdjustable("SAROP31-OOMH084:W_RX.RBV", internal=True),
+    OOMH084_Y_rot         = PVAdjustable("SAROP31-OOMH084:W_RY.RBV", internal=True),
+    OOMH084_Z_rot         = PVAdjustable("SAROP31-OOMH084:W_RZ.RBV", internal=True),
+    OOMH084_COATING       = PVAdjustable("SAROP31-OOMH084:COATING_SP", internal=True),
+    OOMH067_X_trans       = PVAdjustable("SAROP31-OOMH067:W_X.RBV", internal=True),
+    OOMH067_Y_trans       = PVAdjustable("SAROP31-OOMH067:W_Y.RBV", internal=True),
+    OOMH067_X_rot         = PVAdjustable("SAROP31-OOMH067:W_RX.RBV", internal=True),
+    OOMH067_Y_rot         = PVAdjustable("SAROP31-OOMH067:W_RY.RBV", internal=True),
+    OOMH067_Z_rot         = PVAdjustable("SAROP31-OOMH067:W_RZ.RBV", internal=True),
+    OOMH067_COATING       = PVAdjustable("SAROP31-OOMH067:COATING_SP", internal=True),
+    # SMARACT_MINI_X=PVAdjustable("SARES30-MCS2750:MOT_2.RBV", internal=True),
+    # SMARACT_MINI_Y=PVAdjustable("SARES30-MCS2750:MOT_3.RBV", internal=True),
+    # SMARACT_MINI_Z=PVAdjustable("SARES30-MCS2750:MOT_1.RBV", internal=True),
 )