camcheck.py

@@ -42,7 +42,8 @@ pvs = [epics.get_pv(c) for c in fpics]
 pv_states = [pv.wait_for_connection(timeout=0.5) for pv in pvs]
 
 
-bs_chans = dispatcher.get_current_channels()
+base_url = "https://dispatcher-api.psi.ch/sf-imagebuffer" # needed due to data/image buffer split (Jan 2022)
+bs_chans = dispatcher.get_current_channels(base_url)
 bs_chans = set(x["name"] for x in bs_chans)
 
 bs_states = [(i in bs_chans) for i in fpics]

channels.py

@@ -42,13 +42,13 @@ channels_ks = [
     "SATES21-GES1:B4_VALUES",
 ]
 
-#channels_ioxos = [
+channels_ioxos = [
 #    "SATES20-LSCP10:CH0:0",
-#    "SATES20-LSCP10:CH0:1",
+    "SATES20-LSCP10:CH0:1",
 #    "SATES20-LSCP10:CH0:2",
 #    "SATES20-LSCP10:CH6:1",
 #    "SATES20-LSCP10:CH6:2",
-#]
+]
 
 
 #channels_cam_gige = [
@@ -64,13 +64,13 @@ channels_cam_gige = [
 channels_cam_pco = [
     "SATES21-CAMS154-M1:FPICTURE",
     "SATES24-CAMS161-M1:FPICTURE",
-    #"SATES21-CAMS-PATT1:FPICTURE",
+#    "SATES21-CAMS-PATT1:FPICTURE",
 ]
 
 names_cam_pco = [
     "SATES21-CAMS154-M1",
     "SATES24-CAMS161-M1",
-    #"SATES21-CAMS-PATT1",
+#    "SATES21-CAMS-PATT1",
 ]
 suffices_proc = [
     "processing_parameters",
@@ -85,7 +85,7 @@ for n in names_cam_pco:
 
 
 # combine all channels:
-channels = channels_nbs + channels_inten + channels_cam_pco + channels_cam_gige + channels_ks
+channels = channels_nbs + channels_inten + channels_cam_pco + channels_cam_gige + channels_ioxos #+ channels_ks
 
 
 

maloja.py

@@ -4,7 +4,7 @@ from time import sleep
 from datetime import datetime
 import numpy as np
 from tqdm import trange
-from epics import PV
+#from epics import PV
 
 from slic.gui import GUI
 from slic.core.adjustable import Adjustable, PVAdjustable, DummyAdjustable
@@ -31,12 +31,16 @@ dummy = DummyAdjustable(units="au")
 
 #gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", name="Gas Attenuator")
 
-gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", process_time=20, name="Gas Attenuator")
+gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", process_time=20, name="Gas Attenuator Volts")
+
+gas_attenuator_trans = PVAdjustable("SATFE10-OGAT053:TRANSMISSION", process_time=20, name="Gas Attenuator Transmission")
 
 #jet_delay = PVAdjustable("SATES20-CVME-EVR0:Pul6-Delay-SP", "SATES20-CVME-EVR0:Pul6-Delay-RB", accuracy=1, name="Jet Delay")
 
 source_delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-SP", "SATES20-CVME-EVR0:Pul14-Delay-RB", accuracy=1, name="Source Delay")
 
+mono_coupled = PVAdjustable("SATOP11-OSGM087:SetEnergy", "SATOP11-OSGM087:photonenergy", accuracy=0.1, process_time=11, name="Mono Coupled")
+
 waveplate = Motor("SLAAT21-LMOT-M702:MOT", name="Laser Waveplate")
 TT_delay = Motor("SLAAT21-LMOT-M704:MOT", name="TT_delay")
 #laser_comp21 = Motor("SLAAT21-LMOT-M701:MOT", name="Laser Comp T2")
@@ -130,7 +134,8 @@ instrument = "maloja"
 #pgroup = "p19583" # permalloy 2.0
 #pgroup = "p20073" # alvise
 #pgroup = "p20194" # TOF beamtime heated valve
-pgroup = "p20276" # COLTRIMS commissioning
+#pgroup = "p20276" # COLTRIMS commissioning
+pgroup = "p20553"
 
 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)