From 60bf6fefec3517d9f77bd6eaeb45d697c8a8d42e Mon Sep 17 00:00:00 2001 From: x07maop Date: Thu, 24 Sep 2015 10:35:20 +0200 Subject: [PATCH] Closedown --- script/HystScan.py | 15 ++++++++++----- script/local.py | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/script/HystScan.py b/script/HystScan.py index 871f7f7..3a4c49d 100644 --- a/script/HystScan.py +++ b/script/HystScan.py @@ -11,6 +11,11 @@ MODE = 'CIRC +' OFFSET = -1.0 """ +controller.dataManager.openOutput() +print "Data folder: " + controller.dataManager.output +#TODO: Print filename + + FIELD_PRECISION = 0.01 #Pre-actions @@ -73,7 +78,7 @@ print "SKIPPED Waiting for start field" #caput("X07MA-PC-MAG:X:DMD", START_FIELD) #caput("X07MA-PC-MAG:STARTRAMP.PROC", 1) -#ramp_done.wait_for_value(1.0) +ramp_done.wait_for_value(1.0) cawait('X07MA-ID:DONE', 'DONE', type = 's') @@ -140,13 +145,13 @@ while(True): else: dif = tey_norm-first dif_series.appendData(field_readback,dif) - print [field_readback, setpoint2] - print [field_readback, readback2] - print [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm] + #print [field_readback, setpoint2] + #print [field_readback, readback2] + #print [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm] scan.append ([field_readback, setpoint2], [field_readback, readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm]) - print "Field = " + str(fieldReadback.get()) + #print "Field = " + str(fieldReadback.get()) if ramp_done.get() == 1: #If not ramping print "Not ramping, breaking execution" break diff --git a/script/local.py b/script/local.py index 27eb269..ddba574 100644 --- a/script/local.py +++ b/script/local.py @@ -16,7 +16,7 @@ class Strategy(ch.psi.pshell.data.ScanPersistenceStrategyTable): def getDatasetName(self, scan): global FILENAME name = controller.getExecutingContext() if FILENAME is None else FILENAME - return time.strftime('%Y%m%d%H%M%S') + '_' + FILENAME + '_' + str(controller.dataManager.getScanIndex()).zfill(4) + return time.strftime('%Y%m%d_%H%M') + '_' + FILENAME + '_' + str(controller.dataManager.getScanIndex()).zfill(4) controller.dataManager.setScanStrategy(Strategy())