Commit eb0c367f authored by Laurent Claustre's avatar Laurent Claustre

Merge branch 'falconx_info' into 'master'

refined info for mca

Closes #1335

See merge request !2001
parents dbd8bf69 6909fe44
Pipeline #21203 failed with stages
in 53 minutes and 37 seconds
......@@ -180,29 +180,31 @@ class BaseMCA(CounterController):
about objects.
"""
info_str = " ---=== MCA ===---\n"
info_str += f"object: {self.__class__}\n\n"
info_str += f"Detector brand : {self.detector_brand.name}\n"
info_str = "MCA: \n"
info_str += f" object: {self.__class__}\n"
info_str += f" Detector brand : {self.detector_brand.name}\n"
try:
info_str += f"Detector type : {self.detector_type.name}\n"
info_str += f" Detector type : {self.detector_type.name}\n"
except Exception:
info_str += f"Detector type : UNKNOWN\n"
# info_str += f"\nConfig:\n"
# info_str += f"Counters: {self.counters}\n"
info_str += f"\nROIS:\n"
info_str += "{0}\n".format(self.rois.__info__())
info_str += f"\n"
info_str += f"Acquisition mode : {self.acquisition_mode.name}\n"
info_str += f" Detector type : UNKNOWN\n"
info_str += f" Acquisition mode : {self.acquisition_mode.name}\n"
try:
info_str += f"Spectrum size : {self.spectrum_size}\n"
info_str += f" Spectrum size : {self.spectrum_size}\n"
except Exception:
pass
try:
info_str += f"Calib type : {self.calibration_type}\n"
except Exception:
pass
# info_str += f"\nConfig:\n"
# info_str += f"Counters: {self.counters}\n"
info_str += f"\nROIS:\n"
info_str_shifted = ""
for line in self.rois.__info__().split("\n"):
info_str_shifted += " " + line + "\n"
info_str += info_str_shifted
info_str += f"\n"
return info_str
......
......@@ -129,9 +129,10 @@ class BaseXIA(BaseMCA):
def __info__(self):
info_str = super().__info__()
info_str += "XIA configuration file:\n"
info_str += f" - default : {self.default_configuration}\n"
info_str += f" - current : {self.current_configuration}\n"
info_str += "XIA:\n"
info_str += f" configuration file:\n"
info_str += f" - default : {self.default_configuration}\n"
info_str += f" - current : {self.current_configuration}\n"
return info_str
......@@ -565,7 +566,7 @@ class FalconX(BaseXIA):
def __info__(self):
info_str = super().__info__()
info_str += "\nFalconX info:\n"
info_str += "\nFALCONX:\n"
info_str += f"ip address: ???\n"
info_str += f" address: {self.url}\n"
return info_str
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment