From cb9956c0bd1b55a9a27ddbc53438f660cfabd8cc Mon Sep 17 00:00:00 2001 From: x07maop Date: Mon, 30 May 2016 18:27:30 +0200 Subject: [PATCH] Closedown --- script/E_N.py | 14 ++++++++++++++ script/local.py | 6 +++--- script/refill_1kpot.py | 35 +++++++++++++++++------------------ 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/script/E_N.py b/script/E_N.py index bf964c4..0f34ae4 100644 --- a/script/E_N.py +++ b/script/E_N.py @@ -11,9 +11,16 @@ set_hx(+6.5) while True: wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC +', offset = -0.7, name = 'NE_plus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC -', offset = 0.0, name = 'NE_minus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC -', offset = 0.0, name = 'NE_minus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC +', offset = -0.7, name = 'NE_plus') counter = counter +1 @@ -25,9 +32,16 @@ set_hx(-6.5) counter = 0 while True: wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC +', offset = -0.7, name = 'NE_plus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC -', offset = 0.0, name = 'NE_minus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC -', offset = 0.0, name = 'NE_minus') + wait_beam() + wait_temp() otf(start=385, end=435, time=2, delay=5,mode = 'CIRC +', offset = -0.7, name = 'NE_plus') counter = counter +1 diff --git a/script/local.py b/script/local.py index 4f55c7f..11b1485 100644 --- a/script/local.py +++ b/script/local.py @@ -294,15 +294,15 @@ def set_fe(opening): def refill_1k(): """ """ - print "in refill_1k" + #print "in refill_1k" run("refill_1kpot") def wait_temp(): - print "blabla" + #print "blabla" if (temperature.read() < 2.0): t=ct=temperature_readback.read() #hl=caget("X07MA-PC-HE:LEVELB", 'd') # TODO: not used - if (t > 0.7): + if (t > 3.7): print "Refilling 1K pot..." refill_1k() diff --git a/script/refill_1kpot.py b/script/refill_1kpot.py index 0a3e0ab..dbab2f2 100644 --- a/script/refill_1kpot.py +++ b/script/refill_1kpot.py @@ -1,10 +1,9 @@ -print "in blablksjf;lkaj ;fk" #path1=time.strftime("%Y_%m", time.localtime()) #path2=time.strftime("%Y%m%d", time.localtime()) #path="/sls/X07MA/data/x07maop/Data1/"+path1+"/"+path2 +"/"+"refill.log" sp = temperature.read() -print sp + if (sp<2.0): # open needle valve @@ -40,23 +39,23 @@ if (sp<2.0): time.sleep(30) - file=open(path,'a') - file.write(time.strftime("%d %b %Y %H:%M:%S", time.localtime())) - file.write( '# 1K pot refilled \n' ) - file.close() +# file=open(path,'a') +# file.write(time.strftime("%d %b %Y %H:%M:%S", time.localtime())) +# file.write( '# 1K pot refilled \n' ) +# file.close() -if ((sp >2.0) and (sp < 15)): - caput ("X07MA-PC-HE:PUMP", "ON") - time.sleep(60) - caput ("X07MA-PC-HE:PUMP", "AUTO") - while True: - time.sleep(20) - hlb=caget("X07MA-PC-HE:LEVELB", 'd') - if (hlb>110.0): - caput ("X07MA-PC-HE:PUMP", "OFF") - time.sleep(300) - break +#if ((sp >2.0) and (sp < 15)): + #caput ("X07MA-PC-HE:PUMP", "ON") + #time.sleep(60) + #caput ("X07MA-PC-HE:PUMP", "AUTO") + #while True: + # time.sleep(20) +# hlb=caget("X07MA-PC-HE:LEVELB", 'd') +# if (hlb>110.0): +# caput ("X07MA-PC-HE:PUMP", "OFF") +# time.sleep(300) +# break - time.sleep (3) +# time.sleep (3)