diff --git a/IR_data_access_flow_chart.png b/IR_data_access_flow_chart.png index 61901e07620d0893e04f62bf6ee63c566918eca8..4d90b7801ccf716d1dae942afa519f1faa90b12b 100644 Binary files a/IR_data_access_flow_chart.png and b/IR_data_access_flow_chart.png differ diff --git a/IR_image_tools.py b/IR_image_tools.py index 8db98159013f85f76e223fe8aaef617168a48af7..32836862dbc89930e3edc0ccb0cb1d311cca4072 100644 --- a/IR_image_tools.py +++ b/IR_image_tools.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ Created on Wed May 9 14:56:32 2018 -Version: 3.4.2 +Version: 3.4.3 @author: Holger Niemann, Peter Drewelow, Yu Gao mainly to clean up the downloadversionIRdata code @@ -847,6 +847,7 @@ def get_work_list(pipepath,typ="q"): today=datetime.datetime.now() cam_programs=[] if typ in ('q_old','load_old'): + typ = typ.split("_")[0] f=open(pipepath+str(today.year)+str(today.month)+"_"+typ+"_requests.txt") elif typ in ('q','load','qpeak','Aw','width'): f=open(pipepath+"Auto_"+typ+"_requests.txt") diff --git a/ToDO.txt b/ToDO.txt index d03c20de5d2fff827541f84e955a1af730b55179..630d8ad8c19cd20bd21e98a7d17ab9aa029b6f2e 100644 --- a/ToDO.txt +++ b/ToDO.txt @@ -6,6 +6,6 @@ download: - implement download of the stored temperature data (After the upload) - implement download of the stored heat flux data --> done in V3.0.0 - implement download of FLIR data --> Done in V2.8.0, in testing phase -- implement caching +- implement caching --> done in V3.4.1 - implement download of wetted area, peak heat flux and average strike line width -- implement request of all ports +- implement request of all ports --> done in V3.4.1 diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py index 73ad4a575d2c90c03ab300646e577f3ae75cbff8..259ef258d1ffbc83ef3a062c38bf0403a881b567 100644 --- a/downloadversionIRdata.py +++ b/downloadversionIRdata.py @@ -4,7 +4,7 @@ Created on Wed Oct 25 15:51:46 2017 updated on Tue Aug 21 10:20:00 2018 last update on Fr Nov 23 15:37:00 2018 -Version: 3.4.2 +Version: 3.4.3 (Numbering: #of big changes(OP1.2a download V1, OP1.2b download V2, heatflux V3) . #of updates to add functionalities @@ -12,7 +12,7 @@ Version: 3.4.2 #number of updates for bug fixes ) @author: holn """ -version = "V3.4.2" +version = "V3.4.3" import numpy as np import IR_image_tools as IR_tools @@ -3160,6 +3160,8 @@ def get_temp_from_raw_by_program_V1(portnr, program, time_window=0, emi=0.8,dive a list containing the time stamp of each frame frames: list a list of frames, 2D numpy arrays + valid: boolean + True if the data can be used/trusted optional: error_frames: list a list of frames, 2D numpy arrays NOTE @@ -3290,6 +3292,8 @@ def get_temp_from_raw_by_program_V2(portnr, program, time_window=0, emi=0.8, ver a list containing the time stamp of each frame frames: list a list of frames, 2D numpy arrays + valid: boolean + True if the data can be used/trusted optional: error_frames: list a list of frames, 2D numpy arrays NOTE @@ -3348,6 +3352,8 @@ def get_temp_from_raw_by_program(portnr, program, time_window=0, emi=0.8, T_vers a list containing the time stamp of each frame frames: list a list of frames, 2D numpy arrays, values are in Kelvin + valid: boolean + True if the data can be used/trusted optional: error_frames: list a list of frames, 2D numpy arrays NOTE diff --git a/setup.py b/setup.py index 9bde9f6074bfb0fb77ff2a31a305fc5fb95e7ef5..7da927a31cc6fefedb892fc6ee719b4aa50ab81b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name = 'ir-data-access', - version = '3.4.0', + version = '3.4.3', author = 'Holger Niemann, Peter Drewelow', author_email = 'holger.niemann@ipp.mpg.de', description = 'Access Frontend for IR camera data',