diff --git a/config/variables.properties b/config/variables.properties index ea7a0667..648a49d4 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Fri Dec 06 17:47:45 CET 2019 -FileSequentialNumber=2385 +#Thu Feb 06 14:56:32 CET 2020 +FileSequentialNumber=2405 diff --git a/script/optics/ExitSlitYScan.py b/script/optics/ExitSlitYScan.py index b4c6b7bb..bb37ab9c 100644 --- a/script/optics/ExitSlitYScan.py +++ b/script/optics/ExitSlitYScan.py @@ -1,9 +1,9 @@ """ exit slit calibration scan -manual settings: photon energy 800 eV (G1200), FE = 1 x 1, ADC/Keithley averaging +manual settings: photon energy 400 eV (G1200), FE = 4 x 6 -set keithleys manually to "poll curr slow" and fixed range (20 nA for diode, 200 pA for RMU) +set keithleys manually to "poll curr fast" and fixed range (2 uA for diode, 2 nA for RMU) """ POSITIONERS = (ExitSlitY) diff --git a/script/optics/FrontEndBladeScanKei.py b/script/optics/FrontEndBladeScanKei.py index 38bdeca3..caf1b4d9 100644 --- a/script/optics/FrontEndBladeScanKei.py +++ b/script/optics/FrontEndBladeScanKei.py @@ -38,11 +38,10 @@ def trig(): FrontendHSize.write(2.0) FrontendVSize.write(2.0) -# disabled for monochromatic beam -#ExitSlit.write(25.0) -#caput("X03DA-PGM:ronbeta.A", -87.0) -#caput("X03DA-PGM:rontheta.A", +87.0) -#MonoBeta.waitValueInRange(-87.1, -86.9, 100000) +ExitSlit.write(25.0) +caput("X03DA-PGM:ronbeta.A", -87.0) +caput("X03DA-PGM:rontheta.A", +87.0) +MonoBeta.waitValueInRange(-87.1, -86.9, 100000) POSITIONERS = (FrontendBladeUp) FrontendBladeUp.write(STARTPOS)