diff --git a/script/local.py b/script/local.py index 76567e50..4f37b700 100644 --- a/script/local.py +++ b/script/local.py @@ -293,11 +293,11 @@ def wait_beam(): def before_readout(): sample_scienta = False - for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix"]: + for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix", "Counts"]: if dev in SENSORS: sample_scienta = True break - for dev in [Scienta.spectrum,EnergyDistribution, AngleDistribution, Scienta.dataMatrix]: + for dev in [Scienta.spectrum,EnergyDistribution, AngleDistribution, Scienta.dataMatrix, Counts]: if dev in SENSORS: sample_scienta = True break diff --git a/script/optics/FrontEndBladeFlyScanKei.py b/script/optics/FrontEndBladeFlyScanKei.py deleted file mode 100644 index b33ab3f2..00000000 --- a/script/optics/FrontEndBladeFlyScanKei.py +++ /dev/null @@ -1,70 +0,0 @@ -""" -front end calibration scans - -keithley 2: RMU -set keithley manually to "poll curr fast" -""" - -import time - -SENSORS = (RefCurrent,) -STARTPOS = (-1.5) -ENDPOS = (+1.5) -# requested positioner travel per dwell time -STEPS = 0.02 -# measurement interval = polling interval of keithley -DWELL = 0.1 -# speed must be >= 0.1 -SPEED = STEPS / DWELL - -KEI_RMU = "X03DA-KEITHLEY-2:" - -FrontendHSize.write(2.0) -FrontendVSize.write(2.0) -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) -#MonoTheta.waitValueInRange(+86.9, +87.1, 100000) -print("mono in range") - -POSITIONERS = (FrontendBladeUp) -FrontendBladeUp.write(STARTPOS) -FrontendBladeDown.write(-2.0) -time.sleep(5.0) -fly_time = (ENDPOS - STARTPOS) / SPEED -cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=fly_time, check_positions = False) - -POSITIONERS = (FrontendBladeDown) -FrontendBladeDown.write(STARTPOS) -FrontendBladeUp.write(+2.0) -time.sleep(5.0) -fly_time = (ENDPOS - STARTPOS) / SPEED -cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=fly_time, check_positions = False) - -FrontendHSize.write(2.0) -FrontendVSize.write(2.0) -time.sleep(10.0) - -STARTPOS = (-4.0) -ENDPOS = (+4.0) -STEPS = 0.1 -SPEED = STEPS / DWELL - -POSITIONERS = (FrontendBladeRing) -FrontendBladeRing.write(STARTPOS) -FrontendBladeWall.write(-4.0) -time.sleep(5.0) -fly_time = (ENDPOS - STARTPOS) / SPEED -cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=fly_time, check_positions = False) - -POSITIONERS = (FrontendBladeWall) -FrontendBladeWall.write(STARTPOS) -FrontendBladeRing.write(+4.0) -time.sleep(5.0) -fly_time = (ENDPOS - STARTPOS) / SPEED -cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=fly_time, check_positions = False) - -FrontendHSize.write(0.0) -FrontendVSize.write(0.0)