From 7ad0f716ba076b4a8133e24e0ffdc394461477be Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 1 Mar 2016 15:00:50 +0100 Subject: [PATCH] Closedown --- script/HystScanStep.py | 5 +---- script/local.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/script/HystScanStep.py b/script/HystScanStep.py index 5e1eea3..90e67ad 100644 --- a/script/HystScanStep.py +++ b/script/HystScanStep.py @@ -71,10 +71,7 @@ for setpoint1 in setpoints: detector6 = temperature.read() #temperature.get() detector7 = current.read() detector8 = signal_field_analog_x.read() # fieldAnalogX.get() - c = detector1 - d = detector2 - tey_norm = detector1/detector2 - + tey_norm = detector1/detector2 scan.append ([setpoint1, setpoint2], [readback1, readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm]) scan.end() diff --git a/script/local.py b/script/local.py index 200c7c9..3631e46 100644 --- a/script/local.py +++ b/script/local.py @@ -5,8 +5,7 @@ FILENAME = None data_file = None energy.setBlockingWrite(True) -field_x.setBlockingWrite(True) -field_z.setBlockingWrite(True) + #The persistence strategy is overriden to adjust file names import ch.psi.pshell.data.ScanPersistenceStrategyTable