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

[add] multiple eventIDs possible as eventID pylot_parameter (testing needed)

Browse Source
This commit is contained in:
Marcel Paffrath 2017-08-03 14:49:32 +02:00
parent cab9061030
commit ddb1fb8b97
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
autoPyLoT.py
View File

@ -164,9 +164,14 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
# multiple event processing # multiple event processing
# read each event in database # read each event in database
events = [events for events in glob.glob(os.path.join(datapath, '*')) if os.path.isdir(events)] events = [events for events in glob.glob(os.path.join(datapath, '*')) if os.path.isdir(events)]
elif fnames == 'None' and parameter['eventID'] is not '*': elif fnames == 'None' and parameter['eventID'] is not '*' and not type(parameter['eventID']) == list:
# single event processing # single event processing
events = glob.glob(os.path.join(datapath, parameter['eventID'])) events = glob.glob(os.path.join(datapath, parameter['eventID']))
elif fnames == 'None' and type(parameter['eventID']) == list:
# multiple event processing
events = []
for eventID in parameter['eventID']:
events.append(os.path.join(datapath, eventID))
else: else:
# autoPyLoT was initialized from GUI # autoPyLoT was initialized from GUI
events = [] events = []
@ -450,7 +455,7 @@ if __name__ == "__main__":
parser.add_argument('-f', '-F', '--fnames', type=str, parser.add_argument('-f', '-F', '--fnames', type=str,
action='store', action='store',
help='''optional, list of data file names''') help='''optional, list of data file names''')
parser.add_argument('-e', '-E', '--eventid', type=str, parser.add_argument('-e', '--eventid', type=str,
action='store', action='store',
help='''optional, event path incl. event ID''') help='''optional, event path incl. event ID''')
parser.add_argument('-s', '-S', '--spath', type=str, parser.add_argument('-s', '-S', '--spath', type=str,

7
pylot/core/util/widgets.py
View File

@ -2898,8 +2898,15 @@ class AutoPickDlg(QDialog):
def exportParameter(self): def exportParameter(self):
pylot_params = self.parent()._inputs pylot_params = self.parent()._inputs
self.addEvents2pp(pylot_params)
pylot_params.export2File(self.pp_export) pylot_params.export2File(self.pp_export)
def addEvents2pp(self, pylot_parameter):
eventIDs = []
for event in self.parent().project.eventlist:
eventIDs.append(event.pylot_id)
pylot_parameter['eventID'] = eventIDs
def accept(self): def accept(self):
self.exportParameter() self.exportParameter()
self.job_widget.start(self.pp_export, self.sb_ncores.value()) self.job_widget.start(self.pp_export, self.sb_ncores.value())