From 7676d0f44a7f439023b128d6a5c709bb8499c482 Mon Sep 17 00:00:00 2001 From: x07maop Date: Thu, 17 Mar 2016 11:57:54 +0100 Subject: [PATCH] Closedown --- script/HystScanMult.py | 2 +- script/local.py | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/script/HystScanMult.py b/script/HystScanMult.py index b88539d..6c415b8 100644 --- a/script/HystScanMult.py +++ b/script/HystScanMult.py @@ -24,7 +24,7 @@ if OFFSET is not None: caputq('X07MA-PC:CSCALER.INPB', '1') if len(ENERGIES) ==2: - dif_series = plot([],"Dif", context="Dif")[0].getSeries(0) + dif_series = plot([],"Dif", title="Dif")[0].getSeries(0) else: dif_series = None diff --git a/script/local.py b/script/local.py index 00cf814..7f3ecc6 100644 --- a/script/local.py +++ b/script/local.py @@ -17,24 +17,10 @@ class DataLayout( ch.psi.pshell.data.LayoutTable): global FILENAME, data_file name = get_context().name if FILENAME is None else FILENAME data_file = time.strftime('%Y%m%d_%H%M') + '_' + name + '_' + str(get_context().index).zfill(4) - print "Opened data file: " + str(controller.dataManager.output) + "/" + data_file + print "Opened data file: " + get_context().file + "/" + data_file return data_file controller.dataManager.setLayout(DataLayout()) -""" - import ch.psi.pshell.data.LayoutTable -class Layout( ch.psi.pshell.data.LayoutTable): - def getLogFileName(self): - 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 - data_file = time.strftime('%Y%m%d_%H%M') + '_' + name + '_' + str(get_context().index).zfill(4) - print "Opened data file: " + get_context().file + "/" + data_file - return data_file -controller.dataManager.setLayout(Layout()) -""" #Reading Energy Scan configuration file def getPars(element): @@ -149,11 +135,11 @@ def convert_file(input_file_name, output_file_name): traceback.print_exc() -def plot_file(file, context = None): +def plot_file(file, title = None): """ """ table = Table.load(file, "\t", '#') - plots = plot(table, context = context) + plots = plot(table, title = title)