Closedown
This commit is contained in:
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user