parse unit fiber correctly

Author: Edgar

src/pyFAI/gui/widgets/WorkerConfigurator.py

@@ -596,7 +596,7 @@ def normalizeFiles(filenames):
             self.do_oop_range.setChecked(wc.do_oop_range)
             self.vertical_integration.setChecked(wc.vertical_integration)
             self.do_1d_integration.setChecked(wc.integration_1d)
-            unit_ip = parse_fiber_unit(**wc.unit_ip)
+            unit_ip = wc.unit_ip
 
             # In UnitSelector, searching the unit is made with 'is' not '==', not valid for FiberUnit (which are copies)
             for index in range(self.ip_unit.count()):
@@ -605,7 +605,7 @@ def normalizeFiles(filenames):
                     self.ip_unit.setCurrentIndex(index)
                     break
 
-            unit_oop = parse_fiber_unit(**wc.unit_oop)
+            unit_oop = wc.unit_oop
             for index in range(self.oop_unit.count()):
                 item = self.oop_unit.itemData(index)
                 if item == unit_oop: 

src/pyFAI/io/__init__.py

@@ -330,9 +330,9 @@ def init(self, fai_cfg=None, lima_cfg=None):
             self.config_grp["type"] = "text/json"
             self.config_grp["data"] = json.dumps(self.fai_cfg.as_dict(), indent=2, separators=(",\r\n", ": "))
 
-            if isinstance(fai_cfg, WorkerConfig):
+            if type(fai_cfg) is WorkerConfig:
                 self._init_azimuthal()
-            elif isinstance(fai_cfg, WorkerFiberConfig):
+            elif type(fai_cfg) is WorkerFiberConfig:
                 self._init_fiber()
 
     def _init_azimuthal(self):
@@ -415,22 +415,31 @@ def _init_fiber(self):
         oop_name = oop.space
         ip_unit = ip.unit_symbol
         oop_unit =oop.unit_symbol
+
+        if self.fai_cfg.do_2D:
+            self.do2D = True
 
         if self.fai_cfg.do_2D or (not self.fai_cfg.do_2D and self.fai_cfg.vertical_integration):
             self.outofplane_ds = self.nxdata_grp.require_dataset("out-of-plane", (self.fai_cfg.npt_oop,), numpy.float32)
+            kw = {
+                "unit" : oop_unit,
+                "interpretation" : "scalar",
+                "name" : oop_name,
+                "long_name" : f"Diffraction out-of-plane direction {oop_name} ({oop_unit})"
+            }
             self.outofplane_ds.attrs.update({
                 "unit" : oop_unit,
                 "interpretation" : "scalar",
                 "name" : oop_name,
-                "long_name" : "Diffraction out-of-plane direction %s (%s)" % (oop_name, oop_unit)
+                "long_name" : f"Diffraction out-of-plane direction {oop_name} ({oop_unit})"
             })
         if self.fai_cfg.do_2D or (not self.fai_cfg.do_2D and not self.fai_cfg.vertical_integration):
             self.inplane_ds = self.nxdata_grp.require_dataset("in-plane", (self.fai_cfg.npt_ip,), numpy.float32)
             self.inplane_ds.attrs.update({
                 "unit" : ip_unit,
                 "interpretation" : "scalar",
                 "name" : ip_name,
-                "long_name" : "Diffraction in-plane direction %s (%s)" % (ip_name, ip_unit)
+                "long_name" : f"Diffraction out-of-plane direction {ip_name} ({ip_unit})"
             })
 
         if self.fai_cfg.do_2D:
@@ -445,26 +454,26 @@ def _init_fiber(self):
             if self.fai_cfg.do_2D:
                 chunk = 1, self.fast_scan_width, self.fai_cfg.npt_oop, self.fai_cfg.npt_ip
                 self.ndim = 4
-                axis_definition = [".", "fast", "oop", "ip"]
+                axis_definition = [".", "fast", "out-of-plane", "in-plane"]
             elif self.fai_cfg.vertical_integration:
                 chunk = 1, self.fast_scan_width, self.fai_cfg.npt_oop
                 self.ndim = 3
-                axis_definition = [".", "fast", "oop"]
+                axis_definition = [".", "fast", "out-of-plane"]
             elif not self.fai_cfg.vertical_integration:
                 chunk = 1, self.fast_scan_width, self.fai_cfg.npt_ip
                 self.ndim = 3
-                axis_definition = [".", "fast", "ip"]
+                axis_definition = [".", "fast", "in-plane"]
         else:
             if self.fai_cfg.do_2D:
-                axis_definition = [".", "oop", "ip"]
+                axis_definition = [".", "out-of-plane", "in-plane"]
                 chunk = 1, self.fai_cfg.npt_oop, self.fai_cfg.npt_ip
                 self.ndim = 3
             elif self.fai_cfg.vertical_integration:
-                axis_definition = [".", "ip"]
+                axis_definition = [".", "in-plane"]
                 chunk = 1, self.fai_cfg.npt_ip
                 self.ndim = 2
             elif not self.fai_cfg.vertical_integration:
-                axis_definition = [".", "oop"]
+                axis_definition = [".", "out-of-plane"]
                 chunk = 1, self.fai_cfg.npt_oop
                 self.ndim = 2
 

src/pyFAI/io/integration_config.py

@@ -83,7 +83,7 @@
 from .. import method_registry
 from ..integrator import load_engines as load_integrators
 from ..utils import decorators
-from ..units import Unit, UnitFiber, parse_fiber_unit
+from ..units import Unit, UnitFiber, parse_fiber_unit, get_unit_fiber
 _logger = logging.getLogger(__name__)
 CURRENT_VERSION = 5
 
@@ -541,6 +541,8 @@ def from_dict(cls, dico, inplace=False):
                     else:
                         _logger.warning(f"Unable to construct class {klass} with input {value} for key {key} in WorkerConfig.from_dict()")
                         to_init[key] = value
+                    if klass is UnitFiber:
+                        to_init[key] = get_unit_fiber(**value)
                 else:
                     to_init[key] = value
         self = cls(**to_init)
@@ -808,6 +810,7 @@ class WorkerFiberConfig(WorkerConfig):
                                 "oop_range_min", "oop_range_max",
                                 ]
     GUESSED: ClassVar[list] = ["do_ip_range", "do_oop_range"]
+    ENFORCED: ClassVar[list] = ["polarization_description", "poni", "error_model", "unit_ip", "unit_oop"]
 
     @property
     def do_ip_range(self):
@@ -886,7 +889,7 @@ def save(self, filename, pop_azimuthal_params:bool=True):
         # Serialize fiber units
         for key in ("unit_ip", "unit_oop"):
             if key in config:
-                unit = parse_fiber_unit(config[key])
+                unit = get_unit_fiber(**config[key])
                 config[key] = unit.get_config()
 
         if pop_azimuthal_params:

src/pyFAI/units.py

@@ -321,7 +321,8 @@ def ne_equation(
 
             self.equation = ne_equation
         else:
-            self.equation = self._equation
+            self._equation_ne = None
+            self.equation = self._equation_np
 
     def __repr__(self):
         incident_angle_degs = numpy.rad2deg(self.incident_angle)
@@ -386,17 +387,19 @@ def get_config(self) -> dict:
                 "incident_angle" : self._incident_angle,
                 "tilt_angle" : self._tilt_angle,
                 "sample_orientation" : self._sample_orientation,
-                "unit" : self.name,
+                "name" : self.name,
             }
         )
         return fiberunit_config
+    
+    as_dict = get_config
 
     def get_config_shared(self) -> dict:
         """Get a config without name, whose parameters can be shared between FiberUnits
         :return: dictionary with fiber parameters
         """
         config = self.get_config()
-        config.pop("unit")
+        config.pop("name")
         return config
 
     def set_config(self, config:dict=None, **kwargs) -> None:
@@ -410,7 +413,7 @@ def set_config(self, config:dict=None, **kwargs) -> None:
         kwargs = {k:v for k,v in kwargs.items() if k in FIBERUNIT_CONFIG_TEMPLATE}
         config = {k:v for k,v in config.items() if k in FIBERUNIT_CONFIG_TEMPLATE}
         config.update(kwargs)
-        if config.get("unit") is not None:
+        if config.get("name") is not None:
             logger.error("The unit itself cannot be set. Create a new UnitFiber instance.")
             return
 
@@ -431,7 +434,7 @@ def set_config(self, config:dict=None, **kwargs) -> None:
     "incident_angle" : None,
     "tilt_angle" : None,
     "sample_orientation" : None,
-    "unit" : None,
+    "name" : None,
 }
 
 
@@ -1805,7 +1808,7 @@ def get_unit_fiber(
 
 
 def parse_fiber_unit(
-    unit, incident_angle=None, tilt_angle=None, sample_orientation=None
+    unit, incident_angle=None, tilt_angle=None, sample_orientation=None,
 ):
     if isinstance(unit, str):
         unit = get_unit_fiber(name=unit)

src/pyFAI/worker.py

@@ -922,8 +922,8 @@ def set_config(self, config:dict | WorkerFiberConfig, consume_keys:bool=False):
 
         self.npt_oop = int(config.npt_oop)
         self.npt_ip = int(config.npt_ip)
-        self.unit_ip = units.parse_fiber_unit(**config.unit_ip.get_config())
-        self.unit_oop = units.parse_fiber_unit(**config.unit_oop.get_config())
+        self.unit_ip = config.unit_ip
+        self.unit_oop = config.unit_oop
         config_unit = self.unit_ip.get_config_shared()
         self._incident_angle = config_unit["incident_angle"]
         self._tilt_angle = config_unit["tilt_angle"]