From 51108ea2a6004239cc7225eabc97ba8e99c7d161 Mon Sep 17 00:00:00 2001 From: x07maop Date: Wed, 30 Mar 2016 14:06:53 +0200 Subject: [PATCH] Closedown --- script/local.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/script/local.py b/script/local.py index ce52603..d9c8fe0 100644 --- a/script/local.py +++ b/script/local.py @@ -1,9 +1,6 @@ ################################################################################################### # Deployment specific global definitions - executed after startup.py ################################################################################################### -FILENAME = None -data_file = None - energy.setBlockingWrite(True) @@ -14,11 +11,7 @@ class DataLayout( ch.psi.pshell.data.LayoutTable): return time.strftime('%Y%m%d%H%M%S') + '_' + get_context().name + '_logs' def getDatasetName(self, scan): - global FILENAME, data_file - #name = get_context().name if (FILENAME is None) else FILENAME - name = get_context().name - data_file = time.strftime('%Y%m%d_%H%M') + '_' + name + '_' + str(get_context().index).zfill(4) - print FILENAME + data_file = time.strftime('%Y%m%d_%H%M') + '_' + get_context().name + '_' + str(get_context().index).zfill(4) print "Opened data file: " + get_context().path + "/" + data_file return data_file controller.dataManager.setLayout(DataLayout()) @@ -348,8 +341,6 @@ def wait_inj (value, delay=0.5): def set_file(file_name): """ """ - #global FILENAME - #FILENAME = file_name set_context(name = file_name) class pol_mod(Readable):