diff --git a/config/variables.properties b/config/variables.properties index 2e7d4691..603162d7 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon Nov 15 15:24:52 CET 2021 +#Mon Nov 15 15:51:17 CET 2021 LastRunDate=211115 -FileSequentialNumber=10016 -DaySequentialNumber=15 +FileSequentialNumber=10022 +DaySequentialNumber=21 diff --git a/script/attic/ExitSlitScanKei.py b/script/attic/ExitSlitScanKei.py index 49fa7179..e275c964 100644 --- a/script/attic/ExitSlitScanKei.py +++ b/script/attic/ExitSlitScanKei.py @@ -8,7 +8,7 @@ keithley 2: RMU """ POSITIONERS = (ExitSlit) -SENSORS = (Keithley1, Keithley2, MachineCurrent) +SENSORS = (SampleCurrent, RefCurrent, MachineCurrent) STARTPOS = (-10.0) ENDPOS = (200.0) STEPS = 10.0 diff --git a/script/attic/ExitSlitYScanKei.py b/script/attic/ExitSlitYScanKei.py index 7e7ce689..33ae65cc 100644 --- a/script/attic/ExitSlitYScanKei.py +++ b/script/attic/ExitSlitYScanKei.py @@ -8,7 +8,7 @@ keithley 2: RMU """ POSITIONERS = (ExitSlitY) -SENSORS = (Keithley1, Keithley2, MachineCurrent) +SENSORS = (SampleCurrent, RefCurrent, MachineCurrent) STARTPOS = (-0.5) ENDPOS = (1.0) STEPS = 0.01 diff --git a/script/otf.py b/script/otf.py index 99296930..04cfbf62 100644 --- a/script/otf.py +++ b/script/otf.py @@ -98,9 +98,9 @@ try: print "Scanning...", try: if MODE=="ANGLE": - mscan(MonoBeta, sensors, -1, None, range="auto", take_initial=False, after_read=after_read) + mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, monitors=[MonoEnergy, SampleCurrent, MachineCurrent]) else: - mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy" ) + mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy", monitors=[MonoEnergy, SampleCurrent, MachineCurrent]) finally: ret[0].cancel(True)