Commit aea4b269 authored by Holger Niemann's avatar Holger Niemann
Browse files

update to V2.9.3: bugfixes for FLIR, using now by default the productive archive

parent 3e8cf516
......@@ -3,7 +3,7 @@
Created on Wed Oct 25 15:51:46 2017
updated on Tue Aug 21 10:20:00 2018
Version: 2.9.2
Version: 2.9.3
(Numbering: #of big changes(OP1.2a download V1, OP1.2b download V2, heatflux V3) . #of updates to add functionalities . #number of updates for bug fixes )
@author: holn
"""
......@@ -1564,29 +1564,54 @@ def get_temp_from_raw_by_program(portnr,program,time_s=0,emi=0.8,T_version=2,ver
if not goon:
raise Exception("the given port is neither a number or a valid String!")
else:
if FLIR:
print("to be implemented")
if FLIR:
exist,time,frames,mode,tsets,versions=download_raw_FLIR_images_via_png(t1=t1,t6=t6,time_s=time_s,version=version,threads=threads,verbose=verbose-1)
if exist:
if mode==1:
Psets=IR_tools.check_dublicates(tsets)
Radi_Co=[]
Temp_Co=[]
for PS in range(4):
if PS in Psets:
parlog=read_restdb_old(archivepath+"W7X/QSR07_FLIR/AEK51_raw_PS"+str(PS)+"_PARLOG/V"+str(versions[PS])+"/_signal.json?from="+str(t1-10)+"&upto="+str(t6+20))
if parlog[0]:
pari=parlog[2][0]['meta-data']
c1=[float(pari['Coeff0_'+str(PS)].split("\n")[0]),float(pari['Coeff1_'+str(PS)].split("\n")[0])]
c2=[float(pari['TempCoeff'+str(x)+'_'+str(PS)].split("\n")[0]) for x in range(7)]
Radi_Co.append(c1)
Temp_Co.append(c2)
else:
Radi_Co.append([])
Temp_Co.append([])
if len(Psets)==1:
single=True
else:
single=False
if single:
PS=Psets[0]
parlog=read_restdb_old(archivepath+"W7X/QSR07_FLIR/AEK51_raw_PS"+str(PS)+"_PARLOG/V"+str(versions[PS])+"/_signal.json?from="+str(t1-10)+"&upto="+str(t6+20))
tsets=[0 for i in range(len(frames))]
if parlog[0]:
pari=parlog[2][0]['meta-data']
ipi=0
for inti in range(4):
try:
dummy=pari['ITime_'+str(inti)]
ipi=inti
break
except:
ipi=-1
c1=[float(pari['Coeff0_'+str(ipi)].split("\n")[0]),float(pari['Coeff1_'+str(ipi)].split("\n")[0])]
c2=[float(pari['TempCoeff'+str(x)+'_'+str(ipi)].split("\n")[0]) for x in range(7)]
Radi_Co.append(c1)
Temp_Co.append(c2)
else:
Radi_Co.append([])
Temp_Co.append([])
else:
for PS in range(4):
if PS in Psets:
parlog=read_restdb_old(archivepath+"W7X/QSR07_FLIR/AEK51_raw_PS"+str(PS)+"_PARLOG/V"+str(versions[PS])+"/_signal.json?from="+str(t1-10)+"&upto="+str(t6+20))
if parlog[0]:
pari=parlog[2][0]['meta-data']
c1=[float(pari['Coeff0_'+str(PS)].split("\n")[0]),float(pari['Coeff1_'+str(PS)].split("\n")[0])]
c2=[float(pari['TempCoeff'+str(x)+'_'+str(PS)].split("\n")[0]) for x in range(7)]
Radi_Co.append(c1)
Temp_Co.append(c2)
else:
Radi_Co.append([])
Temp_Co.append([])
else:
Radi_Co.append([])
Temp_Co.append([])
### got the raw, knowing which frame needs which calibration, got the calibration, not we have to transform it
if verbose>0:
print(datetime.datetime.now(),"Converting the raw data into temperature, number of frames:",len(frames))
......
......@@ -23,7 +23,7 @@ nuc=False
metastream=True
temperature=False
retry=2
archivedb=False
archivedb=True
### versioning ###
reupload=False
reason=""
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment