diff --git a/__pycache__/downloadversionIRdata.cpython-35.pyc b/__pycache__/downloadversionIRdata.cpython-35.pyc
index fa26c2986a078ec587bcfc017ae984bffd23feb5..dd04967c8b4f34771ae91084397951b550534f6d 100644
Binary files a/__pycache__/downloadversionIRdata.cpython-35.pyc and b/__pycache__/downloadversionIRdata.cpython-35.pyc differ
diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py
index fecedb82fef0034b7634e7c6a96c9859a838515c..9740cb0a1491b9fcaaef7dc91492efd8c156eaa4 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)