Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Holger Niemann
IR_data_access
Commits
26600ee8
Commit
26600ee8
authored
Jun 23, 2020
by
Holger Niemann
Browse files
Merge branch 'Holgers' into 'master'
Update V3.4.3 See merge request
!49
parents
3698f89a
95f0faa1
Changes
5
Hide whitespace changes
Inline
Side-by-side
IR_data_access_flow_chart.png
View replaced file @
3698f89a
View file @
26600ee8
526 KB
|
W:
|
H:
534 KB
|
W:
|
H:
2-up
Swipe
Onion skin
IR_image_tools.py
View file @
26600ee8
# -*- 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"
)
...
...
ToDo.txt
View file @
26600ee8
...
...
@@ -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
downloadversionIRdata.py
View file @
26600ee8
...
...
@@ -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
...
...
setup.py
View file @
26600ee8
...
...
@@ -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'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment