Commit 25d7f832 authored by Holger Niemann's avatar Holger Niemann
Browse files

Update to V2.8.0: FLIR data now also downloadable, Port can be now a number or a string

parent 13971823
<<<<<<< HEAD <<<<<<< HEAD
26.09.2018:
update downloadversionIRdata:
- include FLIR into the downloadscript, Case1 (V2.8.0)
25.09.2018:
update downloadversionIRdata:
- improved performance (V2.7.1), implement switch between test and ArchiveDB (V2.7.0)
13.09.2018:
update downloadversionIRdata:
- bugfixes, verbose level passed now throw, V2.6.1
12.09.2018:
update downloadversionIRdata:
- ToDo list added
- file added to create temperature HDF5 files
21.08.2018: 21.08.2018:
update downloadversionIRdata: update downloadversionIRdata:
- remove dependency on readrestdb V2.6.0
- include version number, now 2.5.3 into the files - include version number, now 2.5.3 into the files
- bug fixes for downloadversion IRdata - bug fixes for downloadversion IRdata
- improvement of exception handling, replace some exception with warnings and improve error messages - improvement of exception handling, replace some exception with warnings and improve error messages
...@@ -19,4 +33,16 @@ changes in downloadversionIRdata: ...@@ -19,4 +33,16 @@ changes in downloadversionIRdata:
bugfixes in downloadversionIRdata: bugfixes in downloadversionIRdata:
- fixed: stepwise download of data in blocks of 2 seconds (used the wrong indices) - fixed: stepwise download of data in blocks of 2 seconds (used the wrong indices)
- fixed: not find the infratecfilter - fixed: not find the infratecfilter
- fixed: wrong time intervall for TC divertor data - fixed: wrong time intervall for TC divertor data
\ No newline at end of file
Versions:
V3.0.0: download of heat flux data not also possible
V2.8.0: add FLIR camera into the downloadroutine, adapt the port interface, that it accept strings and numbers, numbers are automatically used for QRT
V2.7.1: prove the temperature calculation, less ram usage
V2.7.0: implement dependency on upload_config; switch between ArchiveDB and Test archive possible
V2.6.1: bugfixes with verbose level
V2.6.0: dependency on read_restdb removed
V2.5.3: version number included; improved exception handeling
V2.0.0: upgrade an changes to download OP1.2b data, changes of the method and what is stored
V1.1.0: download of thermocouples implemented
V1.0.0: download test of OP1.2a data
\ No newline at end of file
...@@ -11,15 +11,15 @@ if __name__=='__main__': ...@@ -11,15 +11,15 @@ if __name__=='__main__':
import downloadversionIRdata as IR_DL import downloadversionIRdata as IR_DL
import numpy as np import numpy as np
localpath="" localpath=""
time_s=4 time_s=13
programlist = ["20171018.011"] programlist = ["20180920.010","20180920.049"]
ports=[51] ports=[31]
for program in programlist: for program in programlist:
for port in ports: for port in ports:
try: try:
exist,dimof,data1,valid=IR_DL.get_temp_from_raw_by_program_V2(portnr=port,program=program,time_s=time_s,threads=4) exist,dimof,data1,valid=IR_DL.get_temp_from_raw_by_program_V2(portnr=port,program=program,time_s=time_s,threads=4,verbose=5)
if exist: if exist:
print("data found") print("data found")
stream="images" stream="images"
...@@ -27,10 +27,13 @@ if __name__=='__main__': ...@@ -27,10 +27,13 @@ if __name__=='__main__':
data1=data1.swapaxes(0,2) data1=data1.swapaxes(0,2)
data1=data1.swapaxes(0,1) data1=data1.swapaxes(0,1)
dtype = str(data1.dtype) dtype = str(data1.dtype)
tmpfile = localpath+"AEF"+str(port)+"_"+program+"_int_temp_V2" tmpfile = localpath+"AEF"+str(port)+"_"+program+"_temp_V2"
tmpfile += ".h5" tmpfile += ".h5"
with h5.File(tmpfile, 'w') as f: with h5.File(tmpfile, 'w') as f:
f.create_dataset('timestamps', data=dimof, dtype='uint64' )#,compression="gzip") f.create_dataset('timestamps', data=dimof, dtype='uint64' )#,compression="gzip")
f.create_dataset(stream, data=data1, dtype='uint16' , chunks = (np.shape(data1)[0],np.shape(data1)[1],1)) dset=f.create_dataset(stream, shape=np.shape(data1),dtype=dtype , chunks = (np.shape(data1)[0],np.shape(data1)[1],1))
data1=np.ascontiguousarray(data1)
dset.write_direct(data1)
del data1
except Exception as E: except Exception as E:
print(E) print(E)
\ No newline at end of file
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
Created on Tue Jun 5 09:26:06 2018 Created on Tue Jun 5 09:26:06 2018
Version: 2.7.0 Version: 2.8.0
@author: holn @author: holn
constants and config parameters constants and config parameters
""" """
...@@ -50,7 +50,8 @@ portcamdict={ ...@@ -50,7 +50,8 @@ portcamdict={
'AEF40': 'IRCam_Caleo768kL_0701', 'AEF40': 'IRCam_Caleo768kL_0701',
'AEF41': 'IRCam_Caleo768kL_0902', 'AEF41': 'IRCam_Caleo768kL_0902',
'AEF50': 'Infratec_9312907', 'AEF50': 'Infratec_9312907',
'AEF51': 'IRCam_Caleo768kL_0905'} 'AEF51': 'IRCam_Caleo768kL_0905',
'AEK51': 'FLIR_SC8303_00037'}
} }
camlimdict={ camlimdict={
......
...@@ -5,6 +5,7 @@ download: ...@@ -5,6 +5,7 @@ download:
- implement absolute calibration - implement absolute calibration
- implement download of the stored temperature data (After the upload) - implement download of the stored temperature data (After the upload)
- implement download of the stored heat flux data (After the upload) - implement download of the stored heat flux data (After the upload)
- implement download of FLIR data
upload: upload:
- upload the new nucing files for AEF50 (the workaround) - upload the new nucing files for AEF50 (the workaround)
...@@ -12,5 +13,7 @@ upload: ...@@ -12,5 +13,7 @@ upload:
- upload scene models - upload scene models
- upload temperature - upload temperature
- upload heat flux data - upload heat flux data
- upload FLIR data
- upload FLIR LUT
This diff is collapsed.
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