channels.py

@@ -56,20 +56,20 @@ channels_ks = [
 #]
 
 channels_cam_gige = [
-#    "SATES21-CAMS154-GIGE4:FPICTURE"
+    "SATES21-CAMS154-GIGE4:FPICTURE"
 #    "SATES21-CAMS154-GIGE2:FPICTURE"
 ]
 
 
 channels_cam_pco = [
-    #"SATES21-CAMS154-M1:FPICTURE",
-    #"SATES24-CAMS161-M1:FPICTURE",
+    "SATES21-CAMS154-M1:FPICTURE",
+    "SATES24-CAMS161-M1:FPICTURE",
     #"SATES21-CAMS-PATT1:FPICTURE",
 ]
 
 names_cam_pco = [
-    #"SATES21-CAMS154-M1",
-    #"SATES24-CAMS161-M1",
+    "SATES21-CAMS154-M1",
+    "SATES24-CAMS161-M1",
     #"SATES21-CAMS-PATT1",
 ]
 suffices_proc = [

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")

overnight.py

@@ -1204,3 +1204,23 @@ def overnight():
 
 
 
+
+def smooth_attenuator():
+    photon_energies = [525, 600]
+    iterations = range(24)
+
+    for p in photon_energies:
+        und.set(p).wait()
+        und.set(p).wait()
+        for i in iterations:
+            name = f"n2o_{p}eV_{i:02}"
+            print(name)
+            daq.acquire(name, n_pulses=60000)
+
+    print("close shutter")
+    shutter.close()
+
+
+
+
+

spreadsheet.py

@@ -82,10 +82,10 @@ overview = SimpleDevice("Maloja Overview",
 
 
 spreadsheet_line = [
-    "timeStamp", "File name", "run name", "comments", "static/scan", "start", "stop", "step size", "shots", "Temperature", "Transmission", "Attenuation", "Sample","backing pressure",
-    "pressChamb1",
-    "pressJF",
-    "pressattn40",
+    "timeStamp", "run name", "File name", "comments", "static/scan", "start", "stop", "step size", "shots", "Liquid flow", "Gas flow", "Sample",
+    "ppressChamb3",
+#   "pressJF",
+#   "pressattn40",
 #    "SourceTemp",
 #    "skimmerRuppUpstream",
 #    "skimmerRuppDownstream",