diff --git a/Stuff/Modules/parameters.py b/Stuff/Modules/parameters.py index 5a51ac4..f732729 100644 --- a/Stuff/Modules/parameters.py +++ b/Stuff/Modules/parameters.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"] diff --git a/Stuff/Modules/processor.py b/Stuff/Modules/processor.py index 583adb4..7001f00 100644 --- a/Stuff/Modules/processor.py +++ b/Stuff/Modules/processor.py @@ -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