diff --git a/script/EnergyMultiScan.py b/script/EnergyMultiScan.py index a8f7771..d5ea4a2 100644 --- a/script/EnergyMultiScan.py +++ b/script/EnergyMultiScan.py @@ -60,15 +60,8 @@ def _startPlot(type): #if (otf_start.read() == 0 or time.time() > t_end): break e = energy.read() - if (time.time() <= t_end and OTF_override == 1): + if (time.time() <= t_end): - cur_en = E1+(E2-E1)*(time.time()-t_start)/(TIME*60) - #caput ("X11MA-PHS:E_SP",cur_en) - cur_en1 = cur_en - dE1 - cur_en2 = cur_en - dE2 - caput ("X11MA-ID1:ENERGY",e-0.1) - caput ("X11MA-ID2:ENERGY",e-0.1) - time.sleep(0.0001) # pass #time.sleep(0.0001)''' ID1 = ID1_En.read() @@ -102,6 +95,7 @@ def _startPlot(type): except: pass print "Done Plotting" + """ output_file_TEY = output_path+"TEY_"+file_prefix+"_" + suffix + ".dat" TEYout = open(output_file_TEY, "w+") sTEY = sep.join(str(x) for x in TEY) #+ line_sep # MCP1.write("%s" + sep % i) @@ -110,6 +104,7 @@ def _startPlot(type): TEYout.write(sTEYout) TEYout.close() print "Saved TEY signal data" + """ def startPlot(type = 1): global task task = fork((_startPlot,(type,)),)