solving merge conflicts

Create_HDF5_from_archive_data.py

@@ -11,15 +11,15 @@ if __name__=='__main__':
     import downloadversionIRdata as IR_DL
     import numpy as np
     localpath=""
-    time_s=13
+    time_s=1.5
 
-    programlist = ["20171121.013"]
-    ports=[10]
+    programlist = ["20171010.025"]
+    ports=[50]
     
     for program in programlist:
         for port in ports:
             try:
-                exist,dimof,data1,valid=IR_DL.get_temp_from_raw_by_program(portnr=port,program=program,time_s=time_s,threads=4,verbose=5)
+                exist,dimof,data1,valid=IR_DL.get_temp_from_raw_by_program(portnr=port,program=program,time_window=time_s,threads=4,verbose=5)
                 if exist:
                     print("data found")
                     stream="images"

IR_da_config_constants.py

 # -*- coding: utf-8 -*-
 """
 Created on Tue Jun  5 09:26:06 2018
-Version: 3.3.0
+Version: 3.4.4
 @author: holn
 constants and config parameters
 """
@@ -441,4 +441,4 @@ c2dict={
 c3dict=c2dict.copy()        
 exJet=cm.colors.LinearSegmentedColormap('mod_Jet', c2dict, 1024)
 c3dict['alpha']=((0.0,0.0,0.0),(0.33,0.99,0.99),(1.0,1.0,1.0))
-exJet_trans=cm.colors.LinearSegmentedColormap('mod_Jet_trans', c3dict, 1024)
\ No newline at end of file
+exJet_trans=cm.colors.LinearSegmentedColormap('mod_Jet_trans', c3dict, 1024)

IR_image_tools.py

 # -*- coding: utf-8 -*-
 """
 Created on Wed May  9 14:56:32 2018
-Version: 3.4.3
+Version: 3.4.4
 @author: Holger Niemann, Peter Drewelow, Yu Gao
 
 mainly to clean up the downloadversionIRdata code
@@ -833,7 +833,8 @@ def get_work_list(pipepath,typ="q"):
             the path to the folder where the files are located
         typ: string
             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
     RESULT
     ------
@@ -849,7 +850,7 @@ def get_work_list(pipepath,typ="q"):
     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'):
+    elif typ in ('q','load','qpeak','Aw','width','pf'):
         f=open(pipepath+"Auto_"+typ+"_requests.txt")
     else:
         reasons=[]
@@ -858,13 +859,13 @@ def get_work_list(pipepath,typ="q"):
         koline=line.split("\t")
         if len(koline)>1:
             prog = koline[0]
-            if typ in ('q','load','qpeak','Aw','width','q_old','load_old'):
+            if typ in ('q','load','qpeak','Aw','width','q_old','load_old','pf'):
                 cam_programs.append((prog,koline[1].split("\n")[0]))    
             else:
                 cam_programs.append((prog,koline[1]))                    
                 reasons.append(koline[2].split("\n")[0])
     f.close()
-    if typ in ('q','load','qpeak','Aw','width','q_old','load_old'):
+    if typ in ('q','load','qpeak','Aw','width','q_old','load_old','pf'):
         bla=check_dublicates_2(cam_programs)
         cam_programs=bla[0]
         return cam_programs
@@ -910,7 +911,7 @@ def read_finger_info(file_name=None, OP='OP1.2b', verbose=0):
         elif OP.startswith('OP2'):
             file_name='finger_info_HHF.csv'
     full_path = os.path.join(parameter_file_path, file_name)
-    print(full_path)
+    #print(full_path)
     if verbose > 0:
         print('read_finger_info: reading from file {0} in {1}'.format(file_name, parameter_file_path))
     if not os.path.isfile(full_path):

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
 	name = 'ir-data-access',
-	version = '3.4.3',
+	version = '3.4.4',
 	author = 'Holger Niemann, Peter Drewelow',
 	author_email = 'holger.niemann@ipp.mpg.de',
 	description = 'Access Frontend for IR camera data',
@@ -16,7 +16,7 @@ setup(
                 'plot_heatflux_example'
         ],
       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/AEF11_coldframes_background_fails_real.txt',
                            'data/AEF20_coldframes_background_fails_real.txt',