Commit 566a56d7 authored by Holger Niemann's avatar Holger Niemann
Browse files

Merge branch 'Holgers' into 'master'

Update V3.6.0

See merge request !58
parents 0b155db3 0f09315d
......@@ -25,6 +25,10 @@ try:
if line.split("=")[0]=='archivedb':
database = eval(line.split("=")[1].strip())
archivepath = "http://archive-webapi.ipp-hgw.mpg.de/{0}/raw/".format(database)
if line.split("=")[0]=='cachepath':
cpath = database = eval(line.split("=")[1].strip())
if cpath == "":
cpath = parameter_file_path = ospath.join(ospath.dirname(__file__), 'cache')
cFile.close()
except Exception as E:
archivepath="http://archive-webapi.ipp-hgw.mpg.de/Test/raw/"
......
### specifications ###
port="AEF10"
local=True
delayupload=True
starttime="20:00:00"
singleupload=False
use_today=True
upload_only_lattest=False
dates=[[2017,11,9]]
singlelist=[]
### settings ###
logpath="C:\\QIR\\Upload\\"
temppath="C:\\QIR\\Upload\\"
delete_Files=True
rawdata=True
raw1=True
raw2=True
raw_parlog=True
back_parlog=False
background=False
nuc_parlog=False
nuc=False
metastream=True
temperature=False
cachepath=""
retry=2
### target database (ArchiveDB/Test/Sandbox) ###
archivedb='ArchiveDB'
### versioning ###
reupload=False
reason=""
This diff is collapsed.
# -*- coding: utf-8 -*-
"""
Created on Thu Nov 29 17:41:40 2018
V3.4.1
V3.6.0
@author: holn
"""
import numpy as np
......@@ -18,7 +18,7 @@ if __name__=='__main__':
#%% loading data
print(datetime.datetime.now(),"start")
status,times,images=IR.download_heatflux_by_program(port,program,time_window=[0,2],version=2,verbose=5,testmode=False)
status,times,images=IR.download_heatflux_by_program(port,program,time_window=[0,2],version=2,verbose=5,testmode=False,caching=True)
print('done')
#%% plotting data
......
......@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name = 'ir-data-access',
version = '3.5.0',
version = '3.6.0',
author = 'Holger Niemann, Peter Drewelow',
author_email = 'holger.niemann@ipp.mpg.de',
description = 'Access Frontend for IR camera data',
......
Markdown is supported
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