From fbd5e9f9dd5f793d20771aee655e44396fb74a9f Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sun, 10 Jul 2022 11:58:23 +0200 Subject: [PATCH] new motors; shutter --- maloja.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/maloja.py b/maloja.py index 58318da..43b6b8a 100644 --- a/maloja.py +++ b/maloja.py @@ -51,6 +51,7 @@ source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Aerosol Injector x") source_x = Motor("SATES20-MANIP1:MOTOR_2", name="Aerosol Injector y") att = Attenuator("SATFE10-OATT064") +shutter = Shutter("SATOP21-OPSH138") chic_delay = TwoColorChicane("zz Two Color Chicane") @@ -63,9 +64,12 @@ und1.set_limits(390, 1100) und2.set_limits(390, 1100) -xota_z_trans = Motor("SATES21-XOTA166:W_Z", name="Table 1: Z coordinated") -xota_y_trans = Motor("SATES21-XOTA166:W_Y", name="Table 1: Y coordinated") -#xota_hori_z = Motor("SATES21-XOTA166:MOTOR_Z", name="Table 1: Z raw") +xota1_z_trans = Motor("SATES21-XOTA166:W_Z", name="Table 1: Z coordinated") +xota1_y_trans = Motor("SATES21-XOTA166:W_Y", name="Table 1: Y coordinated") +#xota1_hori_z = Motor("SATES21-XOTA166:MOTOR_Z", name="Table 1: Z raw") + +xota3_z_trans = Motor("SATES23-XOTA169:W_Z", name="Table 3: Z coordinated") +xota3_y_trans = Motor("SATES23-XOTA169:W_Y", name="Table 3: Y coordinated") #mot1_x = SmarActAxis("SATES21-XSMA166:MOT4", name="Table 1: sma X") #mot1_y = SmarActAxis("SATES21-XSMA166:MOT5", name="Table 1: sma Y")