Commit 3f3fda2b authored by Holger Niemann's avatar Holger Niemann
Browse files

update of version number, include function download_wetted_area,...

update of version number, include function download_wetted_area, download_peak_heatflux, download_peaking_factor, download_strikeline_width (all not fully functional, preparations for V3.5), change of upload_config to download_config and change in the IR_constants to allow sandbox use. More or less V3.4.4
parent 95f0faa1
# -*- 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: 3.3.0 Version: 3.4.4
@author: holn @author: holn
constants and config parameters constants and config parameters
""" """
...@@ -18,15 +18,13 @@ parameter_file_path = ospath.join(ospath.dirname(__file__), 'data') ...@@ -18,15 +18,13 @@ parameter_file_path = ospath.join(ospath.dirname(__file__), 'data')
try: try:
# import sys # import sys
path=str(repr(__file__)).split("IR_config_constants")[0].split("'")[1]+"upload_config" path=str(repr(__file__)).split("IR_config_constants")[0].split("'")[1]+"download_config"
cFile=open(path.replace('\\\\',"\\"))#+"upload_config") cFile=open(path.replace('\\\\',"\\"))#+"upload_config")
for line in cFile: for line in cFile:
if line[0:3]!="###": if line[0:3]!="###":
if line.split("=")[0]=='archivedb': if line.split("=")[0]=='archivedb':
if eval(line.split("=")[1].split("\n")[0]): database = eval(line.split("=")[1].strip())
archivepath="http://archive-webapi.ipp-hgw.mpg.de/ArchiveDB/raw/" archivepath = "http://archive-webapi.ipp-hgw.mpg.de/{0}/raw/".format(database)
else:
archivepath="http://archive-webapi.ipp-hgw.mpg.de/Test/raw/"
cFile.close() cFile.close()
except Exception as E: except Exception as E:
archivepath="http://archive-webapi.ipp-hgw.mpg.de/Test/raw/" archivepath="http://archive-webapi.ipp-hgw.mpg.de/Test/raw/"
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
Created on Wed May 9 14:56:32 2018 Created on Wed May 9 14:56:32 2018
Version: 3.4.3 Version: 3.4.4
@author: Holger Niemann, Peter Drewelow, Yu Gao @author: Holger Niemann, Peter Drewelow, Yu Gao
mainly to clean up the downloadversionIRdata code mainly to clean up the downloadversionIRdata code
...@@ -833,7 +833,8 @@ def get_work_list(pipepath,typ="q"): ...@@ -833,7 +833,8 @@ def get_work_list(pipepath,typ="q"):
the path to the folder where the files are located the path to the folder where the files are located
typ: string typ: string
the typ of data which is requested in the working list\n the typ of data which is requested in the working list\n
possiblities: q, Aw, qpeak, width, load\n possiblities: q, Aw, qpeak, width, load. q_old, load_old\n
both old parameters are opening the files bevore version 3.4.1\n
or anything else for the problematic programs or anything else for the problematic programs
RESULT RESULT
------ ------
......
### specifications ###
local=True
### settings ###
retry=2
### target database (ArchiveDB/Test/Sandbox) ###
archivedb='ArchiveDB'
This diff is collapsed.
...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages ...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name = 'ir-data-access', name = 'ir-data-access',
version = '3.4.3', version = '3.4.4',
author = 'Holger Niemann, Peter Drewelow', author = 'Holger Niemann, Peter Drewelow',
author_email = 'holger.niemann@ipp.mpg.de', author_email = 'holger.niemann@ipp.mpg.de',
description = 'Access Frontend for IR camera data', description = 'Access Frontend for IR camera data',
...@@ -16,7 +16,7 @@ setup( ...@@ -16,7 +16,7 @@ setup(
'plot_heatflux_example' 'plot_heatflux_example'
], ],
data_files=[ data_files=[
('',['upload_config','CHANGELOG','ToDo.txt','README.md']), ('',['download_config','CHANGELOG','ToDo.txt','README.md']),
('data',['data/AEF10_coldframes_background_fails_real.txt', ('data',['data/AEF10_coldframes_background_fails_real.txt',
'data/AEF11_coldframes_background_fails_real.txt', 'data/AEF11_coldframes_background_fails_real.txt',
'data/AEF20_coldframes_background_fails_real.txt', 'data/AEF20_coldframes_background_fails_real.txt',
......
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