channels.py

@@ -31,18 +31,24 @@ channels_inten += [
 
 
 channels_ks = [
-#    "SATES21-GES1:A1_VALUES", #SATES21-GES1:TD_VALUES.VALZ
+    "SATES21-GES1:PR1_SPIKES",
+    "SATES21-GES1:A1_VALUES",
     "SATES21-GES1:A2_VALUES",
-#    "SATES21-GES1:A3_VALUES",
-#    "SATES21-GES1:A4_VALUES",
+    "SATES21-GES1:A3_VALUES",
+    "SATES21-GES1:A4_VALUES",
+    "SATES21-GES1:B1_VALUES",
+    "SATES21-GES1:B2_VALUES",
+    "SATES21-GES1:B3_VALUES",
+    "SATES21-GES1:B4_VALUES",
+]
 
-#######   IOXOS Input  #####
+#channels_ioxos = [
 #    "SATES20-LSCP10:CH0:0",
 #    "SATES20-LSCP10:CH0:1",
 #    "SATES20-LSCP10:CH0:2",
 #    "SATES20-LSCP10:CH6:1",
 #    "SATES20-LSCP10:CH6:2",
-]
+#]
 
 
 #channels_cam_gige = [
@@ -56,15 +62,15 @@ channels_cam_gige = [
 
 
 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-CAMS-PATT1",
+    #"SATES21-CAMS154-M1",
+    #"SATES24-CAMS161-M1",
+    #"SATES21-CAMS-PATT1",
 ]
 suffices_proc = [
     "processing_parameters",
@@ -136,6 +142,7 @@ pvs = [
     "SLAAT21-LSPC-SPEC1:SPECTRUM", 
     "SATES20-CVME-EVR0:Pul14-Delay-SP",
     "SLAAT21-LENG-LAKE1:GET_TEMP",
+    "SATFE10-VMFR054-A050:PRESSURE",
 ]
 
 

devices/magnet.py → devices/simone.py

@@ -9,4 +9,11 @@ class Magnet(PVAdjustable):
         super().__init__(pvname_setvalue, pvname_readback=pvname_readback, name=name, accuracy=accuracy)
 
 
+class Frequency(PVAdjustable):
+
+    def __init__(self, name="Simone's Frequency", process_time=5):
+        pvname_setvalue = "SATES20-ES1-USER2:DAT"
+        super().__init__(pvname_setvalue, name=name, process_time=process_time)
+
+
 

spreadsheet.py

@@ -74,6 +74,7 @@ overview = SimpleDevice("Maloja Overview",
     SourceTemp            = PVAdjustable("SLAAT21-LENG-LAKE1:GET_TEMP", internal=True),
     skimmerRuppUpstream   = PVAdjustable("SATES22-XSMA168:MOT1:MOTRBV", internal=True),
     skimmerRuppDownstream = PVAdjustable("SATES22-XSMA168:MOT2:MOTRBV", internal=True),
+    pressattn40           = PVAdjustable("SATFE10-VMFR054-A050:PRESSURE", internal=True),
 
     **undulator_info
 )
@@ -81,21 +82,23 @@ overview = SimpleDevice("Maloja Overview",
 
 
 spreadsheet_line = [
-    "timeStamp", "File name", "run name", "comments", "static/scan", "start", "stop", "step size", "shots", "steps", "GasMixture", "concentration", "backing pressure",
-    "SourceTemp",
-    "skimmerRuppUpstream",
-    "skimmerRuppDownstream",
+    "timeStamp", "File name", "run name", "comments", "static/scan", "start", "stop", "step size", "shots", "Temperature", "Transmission", "Attenuation", "Sample","backing pressure",
+    "pressChamb1",
+    "pressJF",
+    "pressattn40",
+#    "SourceTemp",
+#    "skimmerRuppUpstream",
+#    "skimmerRuppDownstream",
 #    "Manip1_x",
 #    "Manip1_y",
 #    "Manip1_z",
 #    "Manip4_x",
 #    "Manip4_y", "type", "mobility density", "particle size", "flow rate", "n2", "co2", "voltage", "current", "upper skim","gap up", "lower skim", "gap low",
-    "trigger14Delay",
-    "ToFMCPRupp",
-    "ToFrepelerRupp",
-    "pressChamb1",
-    "pressJF",
-    "pressSkimmer",
+#    "trigger14Delay",
+#    "ToFMCPRupp",
+#    "ToFrepelerRupp",
+
+#    "pressSkimmer",
 #    "Gas cell / TOF",
 #    "standa","Sample",
 #    "pressChamb3",