From 60cf363a783c854ac0531c3d46cfb6f30b62f6fd Mon Sep 17 00:00:00 2001 From: x07maop Date: Tue, 30 Jun 2015 10:23:58 +0200 Subject: [PATCH] Closedown --- script/EnergyScan.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 01caa64..24bdf41 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -1,18 +1,6 @@ #Script imported from: MgE_plus.xml #Parameters -""" -E1 = 1290 -E2 = 1450 -TIME = 3 #min -DELAY = 10.0 #s -MODE = 'CIRC +' -OFFSET = -9.0 -FOLDER = '2015_04/20150417' -FILE = 'MgE_plus' -ALPHA=0 -""" - """ E1 = 710 E2 = 720 @@ -47,8 +35,6 @@ def wait_channel(name, value, type): print "Done" - - #Pre-actions #wait_channel('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's') caput('X07MA-ID:MODE', MODE) @@ -85,10 +71,6 @@ newName = folder + time.strftime("%Y%m%d_%H%M_", start) + FILE + "_0000.txt"; #name = caget("MSG").split(' ')[0] name = getNewestFile() -print "Newest was" + str(newest) -print "Now is" + str(name) -print "MSG = " + caget("MSG") - if name == newest: raise Exception("Data file not created")