diff --git a/downloadversionIRdata.py b/downloadversionIRdata.py index 741c100c5fbd8edecfc06508a47b4b8619642dcb..c284487e8d05fc0c3e68135763f0a25ea8a976ea 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.2.3 +Version: 3.2.4 (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 """ @@ -2970,7 +2970,7 @@ def get_heatflux_profile(port,profile,finger=None,timepoint=1,program=None,tstar ### if the program goes up to here, time okay, finger okay,port okay, lets download it exist,timo,frames=download_heatflux_by_times(port,tstart,tend,time_window=0,threads=1,testmode=False,version=version,verbose=verbose-1) if exist: - return extract_heatflux_profile_from_DL(time=(np.asarray(timo)-t1)/1e9,images=frames,profile=int(fingerID%100),finger=int(fingerID/100),inputchecked=inputcheck,verbose=verbose-1) + return extract_heatflux_profile_from_DL(time=(np.asarray(timo)-t1)/1e9,images=frames,profile=int(fingerID%100),finger=int(fingerID/100),time_window=timepoint,inputchecked=inputcheck,verbose=verbose-1) else: if verbose>0: print("get_heatflux_profile: heatflux data could not be downloaded") @@ -3419,9 +3419,9 @@ if __name__=='__main__': print("local function calling") #%% temperature download and plotting example - port=51#"AEF50"#"AEF51"'20171114.053'# - prog="20180906.012"#"20181011.033"#'20171122.035'#'20181011.010'#'20180823.037'#'20170927.020'#"20181011.036"#"20181016.037"#"20180920.042"#"20171109.021"#"20181010.036" - status,time,images,valid=get_temp_from_raw_by_program(port,prog,time_window=[6,6.1],emi=0.80,T_version=2,version=0,threads=1,give_ERROR=False,use_firstframe_as_background=False,verbose=5) + port=31#"AEF50"#"AEF51"'20171114.053'# + prog="20180911.008"#"20181011.033"#'20171122.035'#'20181011.010'#'20180823.037'#'20170927.020'#"20181011.036"#"20181016.037"#"20180920.042"#"20171109.021"#"20181010.036" + status,time,images,valid=get_temp_from_raw_by_program(port,prog,time_window=[5,5.1],emi=0.80,T_version=2,version=0,threads=1,give_ERROR=False,use_firstframe_as_background=False,verbose=5) # status2,time2,images2=download_raw_images_by_program(port,prog,time_window=0.02,verbose=5) # bla=get_calib_data(50,program=prog,verbose=5) # success,t,s,profile=extract_temperature_profile_from_DL(port,np.asarray(time-time[0])/1e9,images,profile="TM3h_5_5",verbose=10,reference_time=time[0]) diff --git a/setup.py b/setup.py new file mode 100644 index 0000000000000000000000000000000000000000..20a7ddc33c9d5ead02a2ea06a3a9346a4deb9ee0 --- /dev/null +++ b/setup.py @@ -0,0 +1,18 @@ +from setuptools import setup, find_packages + +setup( + name = 'ir-data-access', + version = '3.2.4', + author = 'Holger Niemann, Peter Drewelow', + author_email = 'holger.niemann@ipp.mpg.de', + description = 'Access Frontend for IR camera data', + py_modules = [ + 'downloadversionIRdata', + 'IR_image_tools', + 'IR_config_constants' + ], + install_requires = [ + 'archivedb>=0.2.0' + ] +); +