Tried to fix bug when calling autoPyLoT from GUI, still not working ...

This commit is contained in:
Ludger Küperkoch 2017-05-18 11:58:12 +02:00
parent 6405350dcc
commit 72f5f160c2
2 changed files with 4 additions and 6 deletions

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'):
@ -84,15 +84,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'),

View File

@ -1 +1 @@
b979-dirty 6405-dirty