clean up

maloja.py

@@ -21,7 +21,6 @@ from slic.utils import devices, Marker, as_shortcut
 
 from devices.attenuator import Attenuator
 from devices.undulator import Undulators, TwoColorChicane, Phases
-from devices.simone import Magnet, Frequency
 
 from channels import channels, pvs, detectors
 from spreadsheet import overview, print_overview, print_line_for_spreadsheet
@@ -126,8 +125,8 @@ instrument = "maloja"
 #pgroup = "p19582" # pilot 3 -- SPI
 #pgroup = "p19583" # permalloy 2.0
 #pgroup = "p20073" # alvise
-#pgroup = "p20194" #TOF beamtime heated valve
-pgroup = "p20276" #COLTRIMS commissioning
+#pgroup = "p20194" # TOF beamtime heated valve
+pgroup = "p20276" # COLTRIMS commissioning
 
 daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1, append_user_tag_to_data_dir=True)
 #daq = FakeAcquisition(instrument, pgroup)
@@ -143,54 +142,3 @@ gui = GUI(scan, show_goto=True, show_spec=True, show_run=True)
 
 
 
-
-from itertools import count
-from time import sleep
-
-magnet = Magnet()
-freq = Frequency()
-shutter = Shutter("SATOP21-OPSH138")
-
-def overnight():
-
-    pos_ref = -0.30145 #-0.857
-    pos_sig = -0.9516
-
-    for ii in range(1,4):
-
-        freq.set(ii)
-
-        frequency = 6.2832+0.1428*ii #6.2832 #GHz
-
-        delays1 = [ 0, 5/8,  1/8, 7/8]
-        delays2 = [3/8,  2/8, 6/8, 4/8]
-
-        n_pulses = 1000
-        Emin, Emax, Edelta = 708, 720, 2
-
-        for i in range(12):
-        #for i in count():
-            shutter.close()
-            mot3_x.set(pos_ref)
-            sleep(1)
-            shutter.open()
-            sleep(1)
-
-            magnet.set(0)
-            print("delay:", magnet)
-            scan.scan1D(und, Emin, Emax, Edelta, n_pulses, f"evening02_ref_{frequency}_{i:04}", return_to_initial_values=False)
-
-            shutter.close()
-            mot3_x.set(pos_sig)
-            sleep(1)
-            shutter.open()
-
-            for delay in delays1:
-                magnet.set(delay/frequency*1000)
-                print("delay:", magnet)
-                scan.scan1D(und, Emin, Emax, Edelta, n_pulses, f"evening02_sig_{frequency}_{i:04}_{delay}", return_to_initial_values=False)
-            delays1, delays2 = delays2, delays1
-
-        #shutter.open()
-
-

overnight.py

@@ -1150,3 +1150,57 @@ def focus_test(daq):
 
 
 
+
+from devices.simone import Magnet, Frequency
+
+from itertools import count
+from time import sleep
+
+magnet = Magnet()
+freq = Frequency()
+shutter = Shutter("SATOP21-OPSH138")
+
+def overnight():
+
+    pos_ref = -0.30145 #-0.857
+    pos_sig = -0.9516
+
+    for ii in range(1,4):
+
+        freq.set(ii)
+
+        frequency = 6.2832+0.1428*ii #6.2832 #GHz
+
+        delays1 = [ 0, 5/8,  1/8, 7/8]
+        delays2 = [3/8,  2/8, 6/8, 4/8]
+
+        n_pulses = 1000
+        Emin, Emax, Edelta = 708, 720, 2
+
+        for i in range(12):
+        #for i in count():
+            shutter.close()
+            mot3_x.set(pos_ref)
+            sleep(1)
+            shutter.open()
+            sleep(1)
+
+            magnet.set(0)
+            print("delay:", magnet)
+            scan.scan1D(und, Emin, Emax, Edelta, n_pulses, f"evening02_ref_{frequency}_{i:04}", return_to_initial_values=False)
+
+            shutter.close()
+            mot3_x.set(pos_sig)
+            sleep(1)
+            shutter.open()
+
+            for delay in delays1:
+                magnet.set(delay/frequency*1000)
+                print("delay:", magnet)
+                scan.scan1D(und, Emin, Emax, Edelta, n_pulses, f"evening02_sig_{frequency}_{i:04}_{delay}", return_to_initial_values=False)
+            delays1, delays2 = delays2, delays1
+
+        #shutter.open()
+
+
+