From ecb761563f8ad530868aa78e288b6255b5a458ea Mon Sep 17 00:00:00 2001
From: Holger Niemann <holger.niemann@ipp.mpg.de>
Date: Wed, 1 Nov 2017 17:02:00 +0100
Subject: [PATCH] bugfixes
---
.../downloadversionIRdata.cpython-35.pyc | Bin 18822 -> 18898 bytes
downloadversionIRdata.py | 23 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/__pycache__/downloadversionIRdata.cpython-35.pyc b/__pycache__/downloadversionIRdata.cpython-35.pyc
index fa26c2986a078ec587bcfc017ae984bffd23feb5..dd04967c8b4f34771ae91084397951b550534f6d 100644
GIT binary patch
delta 900
zcmZph%y?-sBc~WIFIUsMpOO6=IWxKVZ!t13)G#olFfwE_F%%_FZsamFDq&)%VPa@z
z1R?Phb_VehMurk*h8kv&Kr<tQcr80aUMg6dB11MCL(z`O_qbF<vFe&E&Yi`0baE4S
zEaSS(54hu)c#1?A7#MD`rsd=(mQ42I+r((S`7hrTiOEw;L?$m)7hsH-yiMJVCxwln
zhLNF}g(0|vd9sm=I(tzJ0|P^m?qoTQZH&T`uWBeWzMuS4<25HgLvRWML$Id6<d>T1
zOhrtS8QnxD2WWLON=&|^CCQ@5RFpMYM)~^WbJ|IaHk%D~E-*5>ZD!I7VPy23Y^Wo?
zIZyuqBV+hxf5Tu##ze5lE~BlCjM<wDOyU?Bi@+k!OxH3p)@+_)ZpOkGHTkslWyYw<
z^KDe>D;O9Us<<-pi!!V7^GXtPimE_vtY%<f&}1&E1xa$0r52TBCMV_;)q_NtiW)#F
z8bNH9qGk}g1w^!h)G}pcYH}Abg7{1zf*C}xfQTj#(GDUyKtv6Q=wx6JXDI3dG4(;l
zF;}q#XXd5nq!#r|j<Zc-jbaLMj+%Vbb`oRD<OsW7#+j3!+1+EjJo%{oME*;R3=G8}
zlNlIw7>gE6PIXXX;$)fJ>5$9#ee!pQc*bXw!yUC5uTE}uRM#nCVW{C}Na13TXl7)9
zbHtk&8ERNS5mYO{P$R&Q!o(n1lr;I2qY2~d$^RWyB=$0vFfyd@f|3kliWEa|2@^vT
zBSYb($<|J3jJGB)ayrKNcygw*7t;~u$%~y#CjWOz6_;ZOF8sm_(kBYhr@#<g$jUM~
z*d<LI<kOc@An$fEFfgPuFfcHro;~Y0`HYK|vP^JEVo`}gN`84>PJUvFLVlV;QDV75
zW^Q77YH^i3NPM%pYYijg%*jjK95@z$!b`kp!sIt@=Pa&)!eR=@I7S{uenu`vUM4n1
zE=Eo!Hbx;vE=E2^W=1VWX+|zaE=FcXQ4r0<#mK{`Ir)>jC!^40D-RjQZIi=2_HfSx
exea7=(YDEQp24F0{9OF({9IrNqB(^8cvt|@w&^hd
delta 900
zcmcaKnXzp$Bc~WIFPGG<pOHx$IWxKVuP`z&)G#olFfwE_F%-p4ZsamFs$pViW@Hdg
zVP_C8VPq&_VyIyT34p|E*%|Uu!5S19ve_7lHZhbiFr)}hUMMRv`5zaTC^G{@Ge|95
z|72P2EXMtlJGf&RS8RU99mm9Ti#07LKe41pgn@x!asb~ZM$^sA{8J>jSQr=>oEaDx
ziqj`ARF`55oxDfgjJ1Z5p_zH|ROQskDH?T*0+SzWC^NpE%&z&Gm4P8xlXvoO&2%PB
z-pT)k9VhS6@{kf^U|?WiRAOXi)MJ!m<YMGvlwjmylw@RM+^nE&&B$mq`GSV{=3<?l
zjEpXub@f6R8NI<GGxZ-ZGKOxhG7M&9j0cN6HQLI^n7MhjNgN|%0a!%PY%L>W)#m-?
zW-N@iCV#WO%zBGCKE!!4qp)m{CQDHz0|P@9S4MtOW>tP(Nn%b>H3I`fQ4IqFgC=uP
z9Y~U+EVZa4GdVG*3c|`x%+X}3V$R6PENTKNW2s`!$jB^e1?g*>Y+);>*9>BIfQU{I
zQ41ovKtwl)&<AN^u3`($%uCNnE$W@zVw=Qziz&qU*5uc=lNg&O*V*+l&YjF-e~<Cv
z<k$8S`7basFcgD=nSoJ<v1rNUZU-f%*UXdGJLEFnoGj}Y&v;^Tt)n*M_Q@+9)fH;^
z8B(|yBw!Q^Lo*9QtpG!f07D8BgJe<I<UfukjQ1xSI;lu(WGrE1NZ|#g6UG!NhTsw=
zh9*Xa!Yz|?ozj@jF-?B%Y%-bCc_QP{$+MlkgqJbbh%%(GFi6&NF@RXi43d)-oXaLR
zxUdLcV+NTd3NcB6A-M24^W^C+X~H1?zLWxa8sz;<hEubwCyTgRDM|;IBo>t@q~w?9
z<R_*m<fkbVC6+5><|d}67FWro<d<(Qbgf}zoIClQn*+xZP<V+KO_^-weohjU_KPQh
zlM4?MKO+|-FB2Oh7b7S0WLXb6M%l?W9-cBHj6#eOjQoszjJ!--jO<9bXxHS$9(x4l
mf?NbLwrCfK#WVS$yYS>DPis+LelC7?el9Qs(Hug4JS+f0I_g{i
diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py
index fecedb8..9740cb0 100644
--- a/downloadversionIRdata.py
+++ b/downloadversionIRdata.py
@@ -79,7 +79,7 @@ def download_LUT(port,time,exposure=0,emissivity=0,camera_filter=0,version=1):
"""
if port==50:# camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
larchivepath=archivepath+"QRT_INFRATEC/"+"AEF"+str(port)+"_LUT_"
- query="Filter_"+str(camera_filter)+"_Texp_"+str(exposure)+"us_e_"+str(float(emissivity))
+ query="Filter_"+str(camera_filter)+"_Texp_"+str(int(exposure))+"us_e_"+str(float(emissivity))
elif port in [10,11,20,21,30,31,40,41,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
larchivepath=archivepath+"QRT_IRCAM/"+"AEF"+str(port)+"_LUT_"
query="Texp_"+str(int(exposure))+"us_e_"+str(float(emissivity))
@@ -229,7 +229,7 @@ def download_raw_images_by_times(port,starttime,stoptime,version=1):
intervalls.append(stoptime)
for i in range(nrinterv):
try:
- res = urllib.request.urlopen(larchivepath+"/_signal.json?from="+str(starttime-10)+"&upto="+str(stoptime))
+ res = urllib.request.urlopen(larchivepath+"/_signal.json?from="+str(intervalls[i])+"&upto="+str(intervalls[i+1]))
signal_list = json.loads(res.read().decode('utf-8'))
res.close()
signal=np.array(signal_list['values'],dtype=np.uint16)
@@ -293,7 +293,7 @@ def get_INFRATEC_filter_by_program(program,version=1):
if prog[0]:
starttime=prog[1]['trigger']['1'][0]
stoptime=prog[1]['trigger']['6'][0]
- return get_INFRATEC_filter_by_times(starttime,stoptime,version)
+ return get_INFRATEC_filter_by_times(starttime,stoptime,50,version)
else:
print("cannot find the program")
return False,0,0
@@ -309,7 +309,9 @@ def get_INFRATEC_filter_by_times(starttime,stoptime,port=50,version=1):
print(e)
goon=False
if goon:
- return True, signal_list['dimensions'],signal_list['values'][0]['meta-data']['filter']
+ return True, signal_list['dimensions'],signal_list['values'][0]['meta-data']['filter']
+ else:
+ return False, 0,-1
def get_exposure_by_program(port,program,version=1):
prog=AKF_1.get_program_from_PID(program)
@@ -467,7 +469,6 @@ def apply_LUT_to_images(LUT,images):
def get_temp_from_raw_by_program_V1(portnr,program,time_s=0,emi=0.8,divertorpart="all",version=1):
if portnr==50:
- #camera="INFRATEC"
cf=get_INFRATEC_filter_by_program(program,version)
if cf[0]:
cfilter=cf[2]
@@ -476,7 +477,6 @@ def get_temp_from_raw_by_program_V1(portnr,program,time_s=0,emi=0.8,divertorpart
print("Filter not found for INFRATEC Camera")
raise Exception
else:
- #camera="IRCAM"
cfilter=0
expoDL=get_exposure_by_program(portnr,program,version)
if expoDL[0]:
@@ -493,7 +493,7 @@ def get_temp_from_raw_by_program_V1(portnr,program,time_s=0,emi=0.8,divertorpart
# background=background.swapaxes(0,1)
backtime=back_dl[1]
backtime=backtime.tolist()
- TCT_dl=get_average_divertor_TC_for_camtemp(portnr,backtime-1000000000,backtime-1000000000,divertorpart)
+ TCT_dl=get_average_divertor_TC_for_camtemp(portnr,int(backtime-1e9),int(backtime+1e9),divertorpart)
if TCT_dl[0]:
TCT=np.average(TCT_dl[2])
else:
@@ -512,9 +512,9 @@ def get_temp_from_raw_by_program_V1(portnr,program,time_s=0,emi=0.8,divertorpart
# gain=gain.swapaxes(0,1)
offset=NUC_DL[1][1]
# offset=offset.swapaxes(0,1)
- print(datetime.datetime.now(),"Start dowload of raw images")
+ print(datetime.datetime.now(),"Start download of raw images")
raw_dl=download_raw_images_by_program(portnr,program,time_s,version)
- print(datetime.datetime.now(),"dowload of raw images finished")
+ print(datetime.datetime.now(),"download of raw images finished")
if raw_dl[0]:
time=raw_dl[1]
images=raw_dl[2]
@@ -533,12 +533,13 @@ def get_temp_from_raw_by_program_V1(portnr,program,time_s=0,emi=0.8,divertorpart
return False,0,-1
else:
#tempcalc for infratec
- print(datetime.datetime.now(),"Start dowload of raw images")
+ print(datetime.datetime.now(),"Start download of raw images")
raw_dl=download_raw_images_by_program(portnr,program,time_s,version)
- print(datetime.datetime.now(),"dowload of raw images finished")
+ print(datetime.datetime.now(),"download of raw images finished")
if raw_dl[0]:
time=raw_dl[1]
images=raw_dl[2]
+ images=images.swapaxes(1,2)
images=images[:]-background
images=images.clip(min=0)
images=np.array(images,dtype=np.uint16)
--
GitLab