Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop

Conflicts:
	autoPyLoT.py
This commit is contained in:
Sebastian Wehling-Benatelli 2015-05-20 11:05:53 +02:00
commit 0a6cff5f23

View File

@ -64,20 +64,22 @@ def autoPyLoT(inputfile):
datastructure.setExpandFields(exf) datastructure.setExpandFields(exf)
# process each event in database
# process each event in database # process each event in database
datapath = datastructure.expandDataPath() datapath = datastructure.expandDataPath()
if not parameter.hasParam('eventID'): if not parameter.hasParam('eventID'):
for event in [events for events in glob.glob(os.path.join(datapath, '*')) if os.path.isdir(events)]: for event in [events for events in glob.glob(os.path.join(datapath, '*')) if os.path.isdir(events)]:
data.setWFData(os.path.join(datapath, event, '*')) data.setWFData([os.path.join(datapath, event, '*')])
print data print data
else: else:
data.setWFData(os.path.join(datapath, '*')) data.setWFData([os.path.join(datapath, '*')])
print data
if __name__ == "__main__": if __name__ == "__main__":
# parse arguments # parse arguments
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='''This program visualizes Probabilistic Power Spectral Densities.''') description='''This program ''')
parser.add_argument('-i', '-I', '--inputfile', type=str, parser.add_argument('-i', '-I', '--inputfile', type=str,
action='store', action='store',