marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2017-05-18 13:22:13 +02:00
commit 77153bc8e9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autoPyLoT.py
View File

@ -56,7 +56,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
print(splash) print(splash)
locflag = 1 locflag = 1
if input_dict: if input_dict and isinstance(input_dict, dict):
if input_dict.has_key('parameter'): if input_dict.has_key('parameter'):
parameter = input_dict['parameter'] parameter = input_dict['parameter']
if input_dict.has_key('fig_dict'): if input_dict.has_key('fig_dict'):
@ -85,15 +85,13 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, save
print('Parameters set and input file given. Choose either of both.') print('Parameters set and input file given. Choose either of both.')
return return
# reading parameter file
data = Data() data = Data()
evt = None evt = None
# getting information on data structure
# reading parameter file
if parameter.hasParam('datastructure'): if parameter.hasParam('datastructure'):
# getting information on data structure
datastructure = DATASTRUCTURE[parameter.get('datastructure')]() datastructure = DATASTRUCTURE[parameter.get('datastructure')]()
dsfields = {'root': parameter.get('rootpath'), dsfields = {'root': parameter.get('rootpath'),
'dpath': parameter.get('datapath'), 'dpath': parameter.get('datapath'),