Permalink
Browse files

corrected batch time for info parameters

  • Loading branch information...
1 parent ead7563 commit f560f4fc430256ddff770081736de722a5a238f1 @bahniks committed Aug 10, 2014
Showing with 12 additions and 4 deletions.
  1. +10 −1 Stuff/Modules/parameters.py
  2. +2 −3 Stuff/Modules/processor.py
@@ -115,6 +115,9 @@ def __init__(self):
})
self["Rotation speed"] = Par("getRotationSpeed", "info", {})
+ self.noBatch = ["Real minimum time", "Real maximum time", "Room frame filename",
+ "Angle of target sector", "Width of target sector"]
+
#self.findParameters()
@@ -191,6 +194,8 @@ def __init__(self):
})
self["Angle of the platform"] = ParametersCM()["Angle of target sector"]
+ self.noBatch = ParametersCM().noBatch + ["Angle of the platform"]
+
class ParametersOF(OrderedDict):
@@ -218,6 +223,8 @@ def __init__(self):
})
self["Mean distance from side"] = Par("getMeanDistanceFromSide", "basic", {})
+ self.noBatch = ParametersCM().noBatch
+
class ParametersCMSF(OrderedDict):
@@ -227,6 +234,8 @@ def __init__(self):
if name not in ("Room frame filename", "Rotation speed"):
self[name] = parameter
+ self.noBatch = ParametersCM().noBatch
+
class ParametersRA(OrderedDict):
@@ -273,7 +282,7 @@ def __init__(self):
"Width of brackets [in cm]")
})
-
+ self.noBatch = ParametersCM().noBatch + ["Robot filename"]
@@ -172,7 +172,7 @@ def processFun(self):
if not self.useBatchTimeVar.get():
methods[name] = [methodcaller(par.method, startTime = startTime,
time = time, **options)]
- elif par.group != "info" or name == "Rotation speed":
+ elif name not in parameters.noBatch:
methods[name] = [methodcaller(par.method, startTime = times[0],
time = times[1], **options)
for times in batchTime]
@@ -186,10 +186,9 @@ def processFun(self):
# results header
if self.useBatchTimeVar.get():
- info = {method for method, attr in parameters.items() if attr.group == "info"}
results = ["File"]
for method in methods:
- if method in info:
+ if method in parameters.noBatch:
results.append(method)
else:
results.extend([method + " ({}-{})".format(start, end) for

0 comments on commit f560f4f

Please sign in to comment.