diff --git a/script/optics/PhotonFluxSpectrum.py b/script/optics/PhotonFluxSpectrum.py
index 528e5d03..e422e4f0 100644
--- a/script/optics/PhotonFluxSpectrum.py
+++ b/script/optics/PhotonFluxSpectrum.py
@@ -9,7 +9,7 @@ AuxCurrent: not connected
 import time
 
 RANGE = "C K-edge"
-BEAM = "G1200 1x1"
+BEAM = "G600 1x1"
 
 if RANGE == "G600 full":
     # G600 full spectrum
@@ -88,12 +88,13 @@ def trig():
     caput(KEI_DIODE + "DOFETCH", 1)
     caput(KEI_RMU + "DOFETCH", 1)
 
-value = DWELL * 10.0
-SampleCurrentAveraging.write(value)
-RefCurrentAveraging.write(value)
+#value = DWELL * 10.0
+#SampleCurrentAveraging.write(value)
+#RefCurrentAveraging.write(value)
 
 POSITIONERS = (Eph)
 SENSORS = (Keithley1, Keithley2, SampleCurrent, RefCurrent, MachineCurrent)
 
-lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, 0.0, before_read=trig, after_read=after_readout)
+prepare_keithleys(DWELL)
+lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=before_readout, after_read=after_readout)