mxcubecore 1.400.0__py3-none-any.whl → 1.401.0__py3-none-any.whl

mxcubecore/HardwareObjects/ESRF/ESRFXRFSpectrum.py

@@ -63,7 +63,7 @@ class ESRFXRFSpectrum(AbstractXRFSpectrum):
     def __init__(self, name):
         super().__init__(name)
         self.cfgfile = None
-        self.config = None
+        self.config_fit = None
         self.ctrl_hwobj = None
         self.mcafit = None
         self.default_erange = None
@@ -77,7 +77,7 @@ class ESRFXRFSpectrum(AbstractXRFSpectrum):
             "cfgfile",
             "/users/blissadm/local/beamline_configuration/misc/15keV.cfg",
         )
-        self.config = ConfigDict.ConfigDict()
+        self.config_fit = ConfigDict.ConfigDict()
         self.mcafit = ClassMcaTheory.McaTheory(self.cfgfile)
         self.default_erange = literal_eval(
             self.get_property("default_energy_range", "[2.0, 15.0]"),
@@ -147,22 +147,24 @@ class ESRFXRFSpectrum(AbstractXRFSpectrum):
         if self.cfgfile != cfgfile:
             self.cfgfile = cfgfile
             change = True
-        self.config.read(self.cfgfile)
-        if "concentrations" not in self.config:
-            self.config["concentrations"] = {}
+        self.config_fit.read(self.cfgfile)
+        if "concentrations" not in self.config_fit:
+            self.config_fit["concentrations"] = {}
             change = True
-        if "attenuators" not in self.config:
-            self.config["attenuators"] = {"Matrix": [1, "Water", 1.0, 0.01, 45.0, 45.0]}
+        if "attenuators" not in self.config_fit:
+            self.config_fit["attenuators"] = {
+                "Matrix": [1, "Water", 1.0, 0.01, 45.0, 45.0]
+            }
             change = True
         if "flux" in config:
-            self.config["concentrations"]["flux"] = float(config["flux"])
+            self.config_fit["concentrations"]["flux"] = float(config["flux"])
             change = True
         if "time" in config:
-            self.config["concentrations"]["time"] = float(config["time"])
+            self.config_fit["concentrations"]["time"] = float(config["time"])
             change = True
 
         if change:
-            self.mcafit.configure(self.config)
+            self.mcafit.configure(self.config_fit)
 
     def spectrum_analyse(
         self,
@@ -207,8 +209,8 @@ class ESRFXRFSpectrum(AbstractXRFSpectrum):
                 ydata = data[1]
 
             try:
-                xmin = self.config["fit"]["xmin"]
-                xmax = self.config["fit"]["xmax"]
+                xmin = self.config_fit["fit"]["xmin"]
+                xmax = self.config_fit["fit"]["xmax"]
             except KeyError:
                 xmin = data[0][0]
                 xmax = data[0][-1]

{mxcubecore-1.400.0.dist-info → mxcubecore-1.401.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.400.0
+Version: 1.401.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.400.0.dist-info → mxcubecore-1.401.0.dist-info}/RECORD

@@ -149,7 +149,7 @@ mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py,sha256=LljzIpsJYlH1hS_z9yfYjQb
 mxcubecore/HardwareObjects/ESRF/ESRFSC3.py,sha256=GoSntiorSYcbJT5z0jfJ-6-_OMlW74Bm6xPCeF7iLGw,9248
 mxcubecore/HardwareObjects/ESRF/ESRFSession.py,sha256=KnZ__trc7GE2eTpNTQ8B7ex1XQ4aRbq0cZHS7hZKRm0,4324
 mxcubecore/HardwareObjects/ESRF/ESRFSmallXrayCentring.py,sha256=YJFMtb3VxHchxTWi_pqrEz3ML1YunoYLkAseDZqF1JA,3617
-mxcubecore/HardwareObjects/ESRF/ESRFXRFSpectrum.py,sha256=4zN3F_VsmQWQVfNwIV9qcUlVLeB830FOl8I36y7xClc,12217
+mxcubecore/HardwareObjects/ESRF/ESRFXRFSpectrum.py,sha256=3bFdXCGhykA9Uv5vjJEG8GU-6Qz1MGie0QpYyuHzzwg,12295
 mxcubecore/HardwareObjects/ESRF/ID232BeamDefiner.py,sha256=4Piso4ftMDSBw3rZJpjoJtU-ARkxVa1Vy49BybleCyY,5030
 mxcubecore/HardwareObjects/ESRF/ID29HutchTrigger.py,sha256=czfwz-v7T8NhfoKw0LES_f3qUSopgavFZI9yFA4Kw2M,2939
 mxcubecore/HardwareObjects/ESRF/ID30A3BeamDefiner.py,sha256=V7gn4JTYhzG0ajeJwjR68MbJuDt26mHaNROHhd1Z0QI,3996
@@ -467,8 +467,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=DobjYIAhrixXoOH9oaus1-PsW5hSAI4nIyPp06Izw4U,14719
 mxcubecore/utils/tango.py,sha256=vwEVrIrWKEFaeaJUz3xbaC7XWHY8ZeJ-pfcSrTfZPIE,2114
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.400.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.400.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.400.0.dist-info/METADATA,sha256=ZOg31xVgDWT5D0KdM0Dip2EouNyRFRTD5ZRcAmqxYdw,4259
-mxcubecore-1.400.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.400.0.dist-info/RECORD,,
+mxcubecore-1.401.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.401.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.401.0.dist-info/METADATA,sha256=E7JwugqJOkZxShS7dS_tuqKds8hev_p0n-EbBhZbv9c,4259
+mxcubecore-1.401.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.401.0.dist-info/RECORD,,