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

task: read also old autoPILOT parameter files

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2015-04-22 12:22:34 +02:00
parent 4b641f1b3c
commit 58aad840c8
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pylot/core/read/inputs.py
View File

@ -5,7 +5,7 @@
class AutoPickParameter(object):
'''
AutoPickParameters is a parameter type object capable to read and/or write
parameter ASCII and binary files.
parameter ASCII.
:param fn str: Filename of the input file
@ -50,6 +50,16 @@ class AutoPickParameter(object):
for line in lines:
parspl = line.split('\t')[:2]
parFileCont[parspl[0].strip()] = parspl[1]
else:
parFileCont = {}
except Exception, e:
self._printParameterError(e)
inputFile.seek(0)
lines = inputFile.readlines()
for line in lines:
if not line.startswith(('#', '%', '\n', ' ')):
parspl = line.split('#')[:2]
parFileCont[parspl[1].strip()] = parspl[0].strip()
for key, value in parFileCont.iteritems():
try:
val = int(value)
@ -57,8 +67,8 @@ class AutoPickParameter(object):
try:
val = float(value)
except:
if value.find(';') > 0:
vallist = value.strip().split(';')
if len(value.split(' ')) > 1:
vallist = value.strip().split(' ')
val = []
for val0 in vallist:
val0 = float(val0)
@ -66,11 +76,6 @@ class AutoPickParameter(object):
else:
val = str(value.strip())
parFileCont[key] = val
else:
parFileCont = {}
except Exception, e:
self._printParameterError(e)
parFileCont = {}
self.__parameter = parFileCont
# Human-readable string representation of the object
@ -129,7 +134,7 @@ class AutoPickParameter(object):
print self
def _printParameterError(self, errmsg):
print 'ParameterError:\n non-existent parameter %s' % errmsg
print 'ParameterReadError:\n non-existent parameter %s' % errmsg
class FilterOptions(object):