Commit 5e2fb6b1 authored by Holger Niemann's avatar Holger Niemann
Browse files

update V2.9.1, bugfixes for AEF50

parent 223c9c77
download:
- implement the work around for AEF50 in the download to make the NUC
- change multiprocessing to multi-threading
- change multiprocessing to multi-threading --> done in Version V2.9.0
- implement multi-emissivity calculation
- implement absolute calibration
- implement download of the stored temperature data (After the upload)
- implement download of the stored heat flux data (After the upload)
- implement download of FLIR data
- implement download of FLIR data --> Done in V2.8.0, in testing phase
upload:
- upload the new nucing files for AEF50 (the workaround)
......
......@@ -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.0
Version: 2.9.1
(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
"""
......@@ -1049,11 +1049,13 @@ def download_raw_parlog_by_program(port,program,version=0):
return False,0,0
def download_raw_parlog_by_times(port,starttime,stoptime,version=0):
if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
OP=IR_tools.get_OP_by_time(time_ns=stoptime)
if OP=="OP1.2a" and port==50:
# if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
if version==0:
version=get_latest_version("QRT_INFRATEC/"+"AEF"+str(port)+"_raw_PARLOG")
larchivepath=archivepath+"W7X/QRT_INFRATEC/"+"AEF"+str(port)+"_raw_PARLOG/V"+str(version)
elif port in [10,11,20,21,30,31,40,41,51]:#elif camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
elif port in [10,11,20,21,30,31,40,41,50,51]:#elif camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
if version==0:
version=get_latest_version("QRT_IRCAM/"+"AEF"+str(port)+"_raw_PARLOG")
larchivepath=archivepath+"W7X/QRT_IRCAM/"+"AEF"+str(port)+"_raw_PARLOG/V"+str(version)
......@@ -1150,10 +1152,12 @@ def get_camera_temp_by_program(port,program,version=0):
return False,0,0
def get_camera_temp_by_times(port,starttime,stoptime,version=0):
if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
OP=IR_tools.get_OP_by_time(time_ns=stoptime)
if OP=="OP1.2a" and port==50:
# if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
stream="QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
elif port in [10,11,20,21,30,31,40,41,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
elif port in [10,11,20,21,30,31,40,41,50,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
stream="QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
else:
......@@ -1181,10 +1185,12 @@ def get_sensor_temp_by_program(port,program,version=0):
return False,0,0
def get_sensor_temp_by_times(port,starttime,stoptime,version=0):
if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
OP=IR_tools.get_OP_by_time(time_ns=stoptime)
if OP=="OP1.2a" and port==50:
# if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
stream="QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
elif port in [10,11,20,21,30,31,40,41,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
elif port in [10,11,20,21,30,31,40,41,50,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
stream="QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
if version==0:
......@@ -1206,10 +1212,12 @@ def get_camera_framerate_by_program(port,program,version=0):
return False,0,0
def get_camera_framerate_by_times(port,starttime,stoptime,version=0):
if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
OP=IR_tools.get_OP_by_time(time_ns=stoptime)
if OP=="OP1.2a" and port==50:
# if port==50:#camera=="INFRATEC" or camera=="infratec" or camera=="Infratec":
stream="QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_INFRATEC/"+"AEF"+str(port)+"_meta_"
elif port in [10,11,20,21,30,31,40,41,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
elif port in [10,11,20,21,30,31,40,41,50,51]:#camera=="IRCAM" or camera=="IRcam" or camera=="ircam":
stream="QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
if version==0:
......@@ -1237,6 +1245,25 @@ def get_frametype_by_times(port,starttime,stoptime,version=0):
version=get_latest_version(stream+"DATASTREAM")
return read_restdb(larchivepath+"DATASTREAM/V"+str(version)+"/5/frametype/_signal.json?from="+str(starttime)+"&upto="+str(stoptime))
def get_framenumber_by_program(port,program,version=0):
# prog=AKF_1.get_program_from_PID(program)
try:
t_program = AKF_2.get_program_from_to(program)
prog =AKF_2.get_program_list(t_program[0], t_program[1])
# if prog[0]:
starttime=prog[0]['trigger']['1'][0]
stoptime=prog[0]['trigger']['6'][0]
return get_framenumber_by_times(port,starttime,stoptime,version)
except:
print("cannot find the program")
return False,0,0
def get_framenumber_by_times(port,starttime,stoptime,version=0):
stream="QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
larchivepath=archivepath+"W7X/QRT_IRCAM/"+"AEF"+str(port)+"_meta_"
if version==0:
version=get_latest_version(stream+"DATASTREAM")
return read_restdb(larchivepath+"DATASTREAM/V"+str(version)+"/4/framenumber/_signal.json?from="+str(starttime)+"&upto="+str(stoptime))
def get_average_divertor_TC_for_camtemp(port,starttime,endtime,part="all",TC=0):
urlstart="http://archive-webapi.ipp-hgw.mpg.de/ArchiveDB/raw/W7X/CoDaStationDesc.115/"
......
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