diff --git a/app_config.py b/app_config.py
index 1755fd7..9e8239b 100644
--- a/app_config.py
+++ b/app_config.py
@@ -139,10 +139,39 @@ class AppCfg(QSettings):
       dflt.append((AppCfg.DAQ_LOC, {'end_station':"cristallina", 'p_group':"p20516"}))
     if AppCfg.DAQ_RUN not in keys:
       dflt.append((AppCfg.DAQ_RUN, {'prefix':'jf', 'padding':10, 'cell_name' : 'na'}))
-    if AppCfg.DAQ_BS_CH not in keys:
-      dflt.append((AppCfg.DAQ_BS_CH, ("SARES30-LSCP1-CRISTA1:CH0:1",))) #list of BS channels
-    if AppCfg.DAQ_PV_CH not in keys:
-      dflt.append((AppCfg.DAQ_PV_CH, () )) #list of PVs
+    #if AppCfg.DAQ_BS_CH not in keys:
+    dflt.append((AppCfg.DAQ_BS_CH, ("SARES30-LSCP1-CRISTA1:CH0:1","SAR-CVME-TIFALL6:EvtSet", "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG", "SARFE10-PBIG050-EVR0:CALCI", "SARFE10-PBPG050:HAMP-INTENSITY-CAL",
+                                    "SARFE10-PBPS053:INTENSITY", "SARFE10-PBPS053:XPOS", "SARFE10-PBPS053:YPOS", "SARFE10-PSSS059:SPECTRUM_X", "SARFE10-PSSS059:SPECTRUM_Y", "SARFE10-PSSS059:SPECTRUM_Y_SUM",
+                                    "SARFE10-PSSS059:FIT-COM", "SARFE10-PSSS059:FIT-FWHM", "SARFE10-PSSS059:FIT-RES", "SARFE10-PSSS059:FIT-RMS", "SARFE10-PSSS059:FIT_ERR", "SARFE10-PSSS059:SPECT-COM", "SARFE10-PSSS059:SPECT-RES",
+                                    "SARFE10-PSSS059:SPECT-RMS", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD1", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3", "SAROP31-PBPS113:XPOS",
+                                    "SAROP31-PBPS113:YPOS", "SAROP31-PBPS113:INTENSITY", "SAROP31-PBPS113:INTENSITY_UJ", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD1", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2",
+                                    "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3", "SAROP31-PBPS149:XPOS", "SAROP31-PBPS149:YPOS", "SAROP31-PBPS149:INTENSITY", "SAROP31-PBPS149:INTENSITY_UJ"))) #list of BS channels
+    #if AppCfg.DAQ_PV_CH not in keys:
+    dflt.append((AppCfg.DAQ_PV_CH, ("SARUN03-UIND030:K_SET.VAL", "SARUN04-UIND030:K_SET.VAL", "SARUN05-UIND030:K_SET.VAL", "SARUN06-UIND030:K_SET.VAL", "SARUN07-UIND030:K_SET.VAL", "SARUN08-UIND030:K_SET.VAL", "SARUN09-UIND030:K_SET.VAL",
+                                    "SARUN10-UIND030:K_SET.VAL", "SARUN11-UIND030:K_SET.VAL", "SARUN12-UIND030:K_SET.VAL", "SARUN13-UIND030:K_SET.VAL", "SARUN14-UIND030:K_SET.VAL", "SARUN15-UIND030:K_SET.VAL", "SARCL02-MBND100:P-READ",
+                                    "SARUN:FELPHOTENE.VAL", "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-DS", "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG", "SARFE10-OAPU044:MOTOR_X.RBV",
+                                    "SARFE10-OAPU044:MOTOR_Y.RBV", "SARFE10-OAPU044:MOTOR_W.RBV", "SARFE10-OAPU044:MOTOR_H.RBV", "SAROP31-OAPU107:MOTOR_X.RBV", "SAROP31-OAPU107:MOTOR_Y.RBV", "SAROP31-OAPU107:MOTOR_W.RBV", 
+                                    "SAROP31-OAPU107:MOTOR_H.RBV", "SAROP31-OAPU149:MOTOR_X.RBV", "SAROP31-OAPU149:MOTOR_Y.RBV", "SAROP31-OAPU149:MOTOR_W.RBV", "SAROP31-OAPU149:MOTOR_H.RBV", "SARFE10-OATT053:MOTOR_1.VAL", 
+                                    "SARFE10-OATT053:MOTOR_2.VAL", "SARFE10-OATT053:MOTOR_3.VAL", "SARFE10-OATT053:MOTOR_4.VAL", "SARFE10-OATT053:MOTOR_5.VAL", "SARFE10-OATT053:MOTOR_6.VAL", "SARFE10-OATT053:MOTOR_1.RBV",
+                                    "SARFE10-OATT053:MOTOR_2.RBV", "SARFE10-OATT053:MOTOR_3.RBV", "SARFE10-OATT053:MOTOR_4.RBV", "SARFE10-OATT053:MOTOR_5.RBV", "SARFE10-OATT053:MOTOR_6.RBV", "SARFE10-OATT053:ENERGY", 
+                                    "SARFE10-OATT053:TRANS_SP", "SARFE10-OATT053:TRANS_RB", "SAROP31-OATA150:MOTOR_1.VAL", "SAROP31-OATA150:MOTOR_2.VAL", "SAROP31-OATA150:MOTOR_3.VAL", "SAROP31-OATA150:MOTOR_4.VAL", 
+                                    "SAROP31-OATA150:MOTOR_5.VAL", "SAROP31-OATA150:MOTOR_6.VAL", "SAROP31-OATA150:MOTOR_1.RBV", "SAROP31-OATA150:MOTOR_2.RBV", "SAROP31-OATA150:MOTOR_3.RBV", "SAROP31-OATA150:MOTOR_4.RBV",
+                                    "SAROP31-OATA150:MOTOR_5.RBV", "SAROP31-OATA150:MOTOR_6.RBV", "SAROP31-OATA150:ENERGY", "SAROP31-OATA150:TRANS_SP", "SARFE31-OATA150:TRANS_RB", "SARFE10-PBPS053:MOTOR_X1.RBV",
+                                    "SARFE10-PBPS053:MOTOR_X2.RBV", "SARFE10-PBPS053:MOTOR_PROBE.RBV", "SAROP31-PBPS113:MOTOR_X1.RBV", "SAROP31-PBPS113:MOTOR_Y1.RBV", "SAROP31-PBPS113:MOTOR_PROBE.RBV", 
+                                    "SAROP31-PBPS149:MOTOR_X1.RBV", "SAROP31-PBPS149:MOTOR_Y1.RBV", "SAROP31-PBPS149:MOTOR_PROBE.RBV", "SARFE10-PPRM053:MOTOR_PROBE.RBV", "SAROP31-PSCR068:MOTOR_PROBE.RBV", "SAROP31-PPRM085:MOTOR_PROBE.RBV",
+                                    "SAROP31-PPRM113:MOTOR_PROBE.RBV", "SAROP31-PPRM150:MOTOR_PROBE.RBV", "SAROP31-PSCD153:MOTOR_PROBE.RBV", "SAROP31-OLAS147:MOTOR_1.RBV", "SAROP31-OPPI151:MOTOR_X1.RBV", "SAROP31-OPPI151:MOTOR_Y1.RBV",
+                                    "SARFE10-PSSS055:MOTOR_X1.RBV", "SARFE10-PSSS055:MOTOR_Y1.RBV", "SARFE10-PSSS055:MOTOR_ROT_X1.RBV", "SARFE10-PSSS055:MOTOR_PROBE.RBV", "SARFE10-PSSS059:MOTOR_X2.RBV", "SARFE10-PSSS059:MOTOR_X3.RBV",
+                                    "SARFE10-PSSS059:MOTOR_Y3.RBV", "SARFE10-PSSS059:MOTOR_ROT_X3.RBV", "SARFE10-PSSS059:MOTOR_Y4.RBV", "SARFE10-PSSS059:MOTOR_ROT_X4.RBV", "SARFE10-PSSS059:MOTOR_X5.RBV", "SARFE10-PSSS059:MOTOR_Y5.RBV",
+                                    "SARFE10-PSSS059:MOTOR_Z5.RBV", "SARFE10-PSSS055:GRATING_SP", "SARFE10-PSSS059:CRYSTAL_SP", "SARFE10-PSSS059:ENERGY", "SARFE10-PSSS059:SPC_ROI_YMIN", "SARFE10-PSSS059:SPC_ROI_YMAX",
+                                    "SAROP31-OOMH067:W_X.RBV", "SAROP31-OOMH067:W_Y.RBV", "SAROP31-OOMH067:W_RX.RBV", "SAROP31-OOMH067:W_RY.RBV", "SAROP31-OOMH067:W_RZ.RBV", "SAROP31-OOMH067:BU.RBV", "SAROP31-OOMH067:BD.RBV",
+                                    "SAROP31-OOMH067:VS1.RBV", "SAROP31-OOMH067:VS2.RBV", "SAROP31-OOMH067:VS3.RBV", "SAROP31-OOMH067:TX.RBV", "SAROP31-OOMH067:RY.RBV", "SAROP31-OOMH084:W_X.RBV", "SAROP31-OOMH084:W_Y.RBV",
+                                    "SAROP31-OOMH084:W_RX.RBV", "SAROP31-OOMH084:W_RY.RBV", "SAROP31-OOMH084:W_RZ.RBV", "SAROP31-OOMH084:BU.RBV", "SAROP31-OOMH084:BD.RBV", "SAROP31-OOMH084:VS1.RBV", "SAROP31-OOMH084:VS2.RBV",
+                                    "SAROP31-OOMH084:VS3.RBV", "SAROP31-OOMH084:TX.RBV", "SAROP31-OOMH084:RY.RBV", "SAROP31-ODMV152:W_X.RBV", "SAROP31-ODMV152:W_Y.RBV", "SAROP31-ODMV152:W_RX.RBV", "SAROP31-ODMV152:W_RZ.RBV", 
+                                    "SAROP31-ODMV152:BU.RBV", "SAROP31-ODMV152:BD.RBV", "SAROP31-ODMV152:VS1.RBV", "SAROP31-ODMV152:VS2.RBV", "SAROP31-ODMV152:VS3.RBV", "SAROP31-ODMV152:TX.RBV", "SAROP31-OKBV153:W_X.RBV", 
+                                    "SAROP31-OKBV153:W_Y.RBV", "SAROP31-OKBV153:W_RX.RBV", "SAROP31-OKBV153:W_RY.RBV", "SAROP31-OKBV153:W_RZ.RBV", "SAROP31-OKBV153:BU.RBV", "SAROP31-OKBV153:BD.RBV", "SAROP31-OKBV153:TY1.RBV",
+                                    "SAROP31-OKBV153:TY2.RBV", "SAROP31-OKBV153:TY3.RBV", "SAROP31-OKBV153:TX1.RBV", "SAROP31-OKBV153:TX2.RBV", "", "SAROP31-OKBH154:W_X.RBV", "SAROP31-OKBH154:W_Y.RBV", "SAROP31-OKBH154:W_RX.RBV", 
+                                    "SAROP31-OKBH154:W_RY.RBV", "SAROP31-OKBH154:W_RZ.RBV", "SAROP31-OKBH154:BU.RBV", "SAROP31-OKBH154:BD.RBV", "SAROP31-OKBH154:TY1.RBV", "SAROP31-OKBH154:TY2.RBV", "SAROP31-OKBH154:TY3.RBV", 
+                                    "SAROP31-OKBH154:TX2.RBV") )) #list of PVs
     if AppCfg.DFT_POS_GONIO not in keys:
       dflt.append((AppCfg.DFT_POS_GONIO, {'pos_mount':(0.,0.,0.,0.),'pos_align':(0.,0.,0.,0.)}))#default positions
     if AppCfg.DFT_POS_BKLGT not in keys:
diff --git a/psi_device.py b/psi_device.py
index 8b9f899..cfed55d 100644
--- a/psi_device.py
+++ b/psi_device.py
@@ -40,8 +40,7 @@ class Shutter:
       _log.info('open simulated shutter')
     elif mode==1:
       # open laser shutter
-      # epics.caput("SLAAR02-LMOT-M262:MOT.VAL", 1)
-      # time.sleep(4)
+      epics.caput("SLAAR31-LPSYS-ESC:LHX1_SHUT_OPEN", 1)
 
       # open fast shutter
       epics.caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 1)
@@ -56,7 +55,7 @@ class Shutter:
       epics.caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0)
 
       # close laser shutter
-      # caput("SLAAR02-LMOT-M262:MOT.VAL", 40)
+      epics.caput("SLAAR31-LPSYS-ESC:LHX1_SHUT_CLOSE", 1)
       _log.info('shutter closed')
 
 class Deltatau:
@@ -124,8 +123,8 @@ class Jungfrau:
       _log.warning(f'failed to get _pulse_id_start: {e}')
     if self._daq is not None:
       n_pulses_run = n_pulses + run['padding']
-      self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 5000), n_repeat=ceil(n_pulses_run/5000), wait=False, cell_name=run['cell_name'])
-      #self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False)
+      self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 800), n_repeat=ceil(n_pulses_run/800), wait=False, cell_name=run['cell_name'])
+      #self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False, cell_name=run['cell_name'])
       pass
     #run['id']+=1
     cfg.setValue(AppCfg.DAQ_RUN,run)
diff --git a/swissmx.py b/swissmx.py
index 684f3f4..84bb8d3 100755
--- a/swissmx.py
+++ b/swissmx.py
@@ -2367,7 +2367,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
       sp.wait_armed()  # wait until motors are at first position
       shutter.open()
       jf.acquire(num_pts)
-      sp.trigger(0.5)  # send a start trigger (if needed) after given time
+      sp.trigger(1.0)  # send a start trigger (if needed) after given time
       if dt._comm is None:
         dlg.setLabelText("run motion/acquisition (simulated)")
         dlg.setMaximum(num_pts)