From a5d68b98597256c84eca302178c93e6de5a46807 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Fri, 4 Oct 2019 22:43:49 +0200 Subject: [PATCH] Closedown --- script/templates/EnergyScan.py | 5 +---- script/test/test2.py | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py index 7bad41e..5db255f 100644 --- a/script/templates/EnergyScan.py +++ b/script/templates/EnergyScan.py @@ -14,9 +14,6 @@ FILE = 'pshell-test' ALPHA=0 """ -FOLDER = 'XAS/20190930/o_XAS_NCM111' -#FILE = 'o_NCM111' - count.initialize() data.initialize() fdata.initialize() @@ -155,7 +152,7 @@ try: if not os.path.isfile(name): raise Exception("Data file not found: " + name) - convert_file_full(name, newName) + convert_file(name, newName) plot_file(newName) print("Success") diff --git a/script/test/test2.py b/script/test/test2.py index e0369f7..3646b49 100644 --- a/script/test/test2.py +++ b/script/test/test2.py @@ -1 +1,2 @@ -print('test') \ No newline at end of file +print('test') +otf(start=700, end=740, time=2, delay=10.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Test', folder='XAS/20190930/o_XAS_NCM111') \ No newline at end of file