zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify getters of algorithm params

Browse Source
This commit is contained in:
usov_i 2020-07-22 23:30:30 +02:00
parent 73e7eddffa
commit a4a00f1b67
1 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pyzebra/anatric.py
View File

@ -203,13 +203,16 @@ class AnatricConfig:
self._root.remove(self._tree.find("Algorithm")) self._root.remove(self._tree.find("Algorithm"))
self._root.append(self._alg_elems[value]) self._root.append(self._alg_elems[value])
def _get_alg_attr(self, alg, tag, attr):
param_elem = self._alg_elems[alg].find(tag)
if param_elem is None:
return None
return param_elem.attrib[attr]
# --- adaptivemaxcog # --- adaptivemaxcog
@property @property
def threshold(self): def threshold(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("threshold") return self._get_alg_attr("adaptivemaxcog", "threshold", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@threshold.setter @threshold.setter
def threshold(self, value): def threshold(self, value):
@ -222,10 +225,7 @@ class AnatricConfig:
@property @property
def shell(self): def shell(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("shell") return self._get_alg_attr("adaptivemaxcog", "shell", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@shell.setter @shell.setter
def shell(self, value): def shell(self, value):
@ -238,10 +238,7 @@ class AnatricConfig:
@property @property
def steepness(self): def steepness(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("steepness") return self._get_alg_attr("adaptivemaxcog", "steepness", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@steepness.setter @steepness.setter
def steepness(self, value): def steepness(self, value):
@ -254,10 +251,7 @@ class AnatricConfig:
@property @property
def duplicateDistance(self): def duplicateDistance(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("duplicateDistance") return self._get_alg_attr("adaptivemaxcog", "duplicateDistance", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@duplicateDistance.setter @duplicateDistance.setter
def duplicateDistance(self, value): def duplicateDistance(self, value):
@ -270,10 +264,7 @@ class AnatricConfig:
@property @property
def maxequal(self): def maxequal(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("maxequal") return self._get_alg_attr("adaptivemaxcog", "maxequal", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@maxequal.setter @maxequal.setter
def maxequal(self, value): def maxequal(self, value):
@ -286,10 +277,10 @@ class AnatricConfig:
@property @property
def aps_window(self): def aps_window(self):
param_elem = self._alg_elems["adaptivemaxcog"].find("window") res = dict()
if param_elem is None: for coord in ("x", "y", "z"):
return None res[coord] = self._get_alg_attr("adaptivemaxcog", "window", coord)
return param_elem.attrib["value"] return res
@aps_window.setter @aps_window.setter
def aps_window(self, value): def aps_window(self, value):
@ -303,10 +294,10 @@ class AnatricConfig:
# --- adaptivedynamic # --- adaptivedynamic
@property @property
def adm_window(self): def adm_window(self):
param_elem = self._alg_elems["adaptivedynamic"].find("window") res = dict()
if param_elem is None: for coord in ("x", "y", "z"):
return None res[coord] = self._get_alg_attr("adaptivedynamic", "window", coord)
return param_elem.attrib["value"] return res
@adm_window.setter @adm_window.setter
def adm_window(self, value): def adm_window(self, value):
@ -319,10 +310,10 @@ class AnatricConfig:
@property @property
def border(self): def border(self):
param_elem = self._alg_elems["adaptivedynamic"].find("border") res = dict()
if param_elem is None: for coord in ("x", "y", "z"):
return None res[coord] = self._get_alg_attr("adaptivedynamic", "border", coord)
return param_elem.attrib["value"] return res
@border.setter @border.setter
def border(self, value): def border(self, value):
@ -335,10 +326,10 @@ class AnatricConfig:
@property @property
def minWindow(self): def minWindow(self):
param_elem = self._alg_elems["adaptivedynamic"].find("minWindow") res = dict()
if param_elem is None: for coord in ("x", "y", "z"):
return None res[coord] = self._get_alg_attr("adaptivedynamic", "minWindow", coord)
return param_elem.attrib["value"] return res
@minWindow.setter @minWindow.setter
def minWindow(self, value): def minWindow(self, value):
@ -351,10 +342,7 @@ class AnatricConfig:
@property @property
def reflectionFile(self): def reflectionFile(self):
param_elem = self._alg_elems["adaptivedynamic"].find("reflectionFile") return self._get_alg_attr("adaptivedynamic", "reflectionFile", "filename")
if param_elem is None:
return None
return param_elem.attrib["value"]
@reflectionFile.setter @reflectionFile.setter
def reflectionFile(self, value): def reflectionFile(self, value):
@ -367,10 +355,7 @@ class AnatricConfig:
@property @property
def targetMonitor(self): def targetMonitor(self):
param_elem = self._alg_elems["adaptivedynamic"].find("targetMonitor") return self._get_alg_attr("adaptivedynamic", "targetMonitor", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@targetMonitor.setter @targetMonitor.setter
def targetMonitor(self, value): def targetMonitor(self, value):
@ -383,10 +368,7 @@ class AnatricConfig:
@property @property
def smoothSize(self): def smoothSize(self):
param_elem = self._alg_elems["adaptivedynamic"].find("smoothSize") return self._get_alg_attr("adaptivedynamic", "smoothSize", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@smoothSize.setter @smoothSize.setter
def smoothSize(self, value): def smoothSize(self, value):
@ -399,10 +381,7 @@ class AnatricConfig:
@property @property
def loop(self): def loop(self):
param_elem = self._alg_elems["adaptivedynamic"].find("loop") return self._get_alg_attr("adaptivedynamic", "loop", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@loop.setter @loop.setter
def loop(self, value): def loop(self, value):
@ -415,10 +394,7 @@ class AnatricConfig:
@property @property
def minPeakCount(self): def minPeakCount(self):
param_elem = self._alg_elems["adaptivedynamic"].find("minPeakCount") return self._get_alg_attr("adaptivedynamic", "minPeakCount", "value")
if param_elem is None:
return None
return param_elem.attrib["value"]
@minPeakCount.setter @minPeakCount.setter
def minPeakCount(self, value): def minPeakCount(self, value):