ChessAnalysisPipeline 0.0.15__py3-none-any.whl → 0.0.16__py3-none-any.whl

CHAP/tomo/processor.py

@@ -146,6 +146,8 @@ class TomoCHESSMapConverter(Processor):
 
         # Validate map
         map_config = MapConfig(**loads(str(tomofields.map_config)))
+        assert len(map_config.spec_scans) == 1
+        num_tomo_stack = len(map_config.spec_scans[0].scan_numbers)
 
         # Check available independent dimensions
         independent_dimensions = tomofields.data.attrs['axes']
@@ -165,8 +167,6 @@ class TomoCHESSMapConverter(Processor):
                              f'({rotation_angle_data_type})')
         matched_dimensions.pop(matched_dimensions.index('rotation_angles'))
         if 'x_translation' in independent_dimensions:
-            x_translation_index = \
-                tomofields.data.axes.index('x_translation')
             x_translation_data_type = \
                 tomofields.data.x_translation.attrs['data_type']
             x_translation_name = \
@@ -178,8 +178,6 @@ class TomoCHESSMapConverter(Processor):
         else:
             x_translation_data_type = None
         if 'z_translation' in independent_dimensions:
-            z_translation_index = \
-                tomofields.data.axes.index('z_translation')
             z_translation_data_type = \
                 tomofields.data.z_translation.attrs['data_type']
             z_translation_name = \
@@ -224,17 +222,12 @@ class TomoCHESSMapConverter(Processor):
 
         # Add an NXdetector to the NXinstrument
         # (do not fill in data fields yet)
+        detector_names = list(np.asarray(tomofields.detector_names, dtype=str))
         detector_prefix = detector_config.prefix
-        detectors = list(
-            set(tomofields.data.entries) - set(independent_dimensions))
-        if detector_prefix not in detectors:
-            raise ValueError(f'Data for detector {detector_prefix} is '
-                             f'unavailable (available detectors: {detectors})')
-        tomo_stacks = tomofields.data[detector_prefix]
-        tomo_stack_shape = tomo_stacks.shape
-        assert len(tomo_stack_shape) == 2+len(independent_dimensions)
-        assert tomo_stack_shape[-2] == detector_config.rows
-        assert tomo_stack_shape[-1] == detector_config.columns
+        if detector_prefix not in detector_names:
+            raise ValueError(
+                f'Data for detector {detector_prefix} is unavailable '
+                f'(available detectors: {detector_names})')
         nxdetector = NXdetector()
         nxinstrument.detector = nxdetector
         nxdetector.local_name = detector_prefix
@@ -272,10 +265,9 @@ class TomoCHESSMapConverter(Processor):
         x_translations = []
         z_translations = []
         if darkfield is not None:
-            nxentry.dark_field_config = darkfield.spec_config
+            nxentry.dark_field_config = darkfield.config
             for scan_name, scan in darkfield.spec_scans.items():
                 for scan_number, nxcollection in scan.items():
-                    scan_columns = loads(str(nxcollection.scan_columns))
                     data_shape = nxcollection.data[detector_prefix].shape
                     assert len(data_shape) == 3
                     assert data_shape[1] == detector_config.rows
@@ -284,7 +276,7 @@ class TomoCHESSMapConverter(Processor):
                     image_keys += num_image*[2]
                     sequence_numbers += list(range(num_image))
                     image_stacks.append(
-                        nxcollection.data[detector_prefix])
+                        nxcollection.data[detector_prefix].nxdata)
                     rotation_angles += num_image*[0.0]
                     if (x_translation_data_type == 'spec_motor' or
                             z_translation_data_type == 'spec_motor'):
@@ -312,10 +304,9 @@ class TomoCHESSMapConverter(Processor):
                                 num_image*[smb_pars[z_translation_name]]
 
         # Collect bright field data
-        nxentry.bright_field_config = brightfield.spec_config
+        nxentry.bright_field_config = brightfield.config
         for scan_name, scan in brightfield.spec_scans.items():
             for scan_number, nxcollection in scan.items():
-                scan_columns = loads(str(nxcollection.scan_columns))
                 data_shape = nxcollection.data[detector_prefix].shape
                 assert len(data_shape) == 3
                 assert data_shape[1] == detector_config.rows
@@ -324,7 +315,7 @@ class TomoCHESSMapConverter(Processor):
                 image_keys += num_image*[1]
                 sequence_numbers += list(range(num_image))
                 image_stacks.append(
-                    nxcollection.data[detector_prefix])
+                    nxcollection.data[detector_prefix].nxdata)
                 rotation_angles += num_image*[0.0]
                 if (x_translation_data_type == 'spec_motor' or
                         z_translation_data_type == 'spec_motor'):
@@ -352,65 +343,46 @@ class TomoCHESSMapConverter(Processor):
                             num_image*[smb_pars[z_translation_name]]
 
         # Collect tomography fields data
-        if x_translation_data_type is None:
-            x_trans = [0.0]
-            if z_translation_data_type is None:
-                z_trans = [0.0]
-                tomo_stacks = np.reshape(tomo_stacks, (1,1,*tomo_stacks.shape))
-            else:
-                z_trans = tomofields.data.z_translation.nxdata
-#                if len(list(tomofields.data.z_translation)):
-#                    z_trans = list(tomofields.data.z_translation)
-#                else:
-#                    z_trans = [float(tomofields.data.z_translation)]
-                if rotation_angles_index < z_translation_index:
-                    tomo_stacks = np.swapaxes(
-                        tomo_stacks, rotation_angles_index,
-                        z_translation_index)
-                tomo_stacks = np.expand_dims(tomo_stacks, z_translation_index)
-        elif z_translation_data_type is None:
-            z_trans = [0.0]
-            if rotation_angles_index < x_translation_index:
-                tomo_stacks = np.swapaxes(
-                    tomo_stacks, rotation_angles_index, x_translation_index)
-            tomo_stacks = np.expand_dims(tomo_stacks, 0)
-        else:
-            x_trans = tomofields.data.x_translation.nxdata
-            z_trans = tomofields.data.z_translation.nxdata
-            #if tomofields.data.x_translation.size > 1:
-            #    x_trans = list(tomofields.data.x_translation)
-            #else:
-            #    x_trans = [float(tomofields.data.x_translation)]
-            #if len(list(tomofields.data.z_translation)):
-            #    z_trans = list(tomofields.data.z_translation)
-            #else:
-            #    z_trans = [float(tomofields.data.z_translation)]
-            if (rotation_angles_index
-                    < max(x_translation_index, z_translation_index)):
-                tomo_stacks = np.swapaxes(
-                    tomo_stacks, rotation_angles_index,
-                    max(x_translation_index, z_translation_index))
-            if x_translation_index < z_translation_index:
-                tomo_stacks = np.swapaxes(
-                    tomo_stacks, x_translation_index, z_translation_index)
+        tomo_stacks = tomofields.data.detector_data.nxdata[
+            detector_names.index(detector_prefix)]
+        tomo_stack_shape = tomo_stacks.shape
+        assert len(tomo_stack_shape) == 3
+        assert tomo_stack_shape[-2] == detector_config.rows
+        assert tomo_stack_shape[-1] == detector_config.columns
+        assert not tomo_stack_shape[0] % num_tomo_stack
         # Restrict to 180 degrees set of data for now to match old code
-        thetas = tomofields.data.rotation_angles.nxdata
-        assert len(thetas) > 2
-        delta_theta = thetas[1]-thetas[0]
-        if thetas[-1]-thetas[0] > 180-delta_theta:
-            image_end = index_nearest(thetas, thetas[0]+180)
+        thetas_stacks = tomofields.data.rotation_angles.nxdata
+        num_theta = tomo_stack_shape[0] // num_tomo_stack
+        assert num_theta > 2
+        thetas = thetas_stacks[0:num_theta]
+        delta_theta = thetas[1] - thetas[0]
+        if thetas[num_theta-1] - thetas[0] > 180 - delta_theta:
+            image_end = index_nearest(thetas, thetas[0] + 180)
         else:
-            image_end = len(thetas)
+            image_end = thetas.size
         thetas = thetas[:image_end]
-        num_image = len(thetas)
-        for i, z in enumerate(z_trans):
-            for j, x in enumerate(x_trans):
-                image_keys += num_image*[0]
-                sequence_numbers += list(range(num_image))
-                image_stacks.append(tomo_stacks[i,j,:image_end,:,:])
-                rotation_angles += list(thetas)
-                x_translations += num_image*[x]
-                z_translations += num_image*[z]
+        num_image = thetas.size
+        n_start = 0
+        image_keys += num_tomo_stack * num_image * [0]
+        sequence_numbers += num_tomo_stack * list(range(num_image))
+        if x_translation_data_type is None:
+            x_translations += num_tomo_stack * num_image * [0.0]
+        if z_translation_data_type is None:
+            z_translations += num_tomo_stack * num_image * [0.0]
+        for i in range(num_tomo_stack):
+            image_stacks.append(tomo_stacks[n_start:n_start+num_image])
+            if not np.array_equal(
+                    thetas, thetas_stacks[n_start:n_start+num_image]):
+                raise RuntimeError(
+                    'Inconsistent thetas among tomography image stacks')
+            rotation_angles += list(thetas)
+            if x_translation_data_type is not None:
+                x_translations += list(
+                    tomofields.data.x_translation[n_start:n_start+num_image])
+            if z_translation_data_type is not None:
+                z_translations += list(
+                    tomofields.data.z_translation[n_start:n_start+num_image])
+            n_start += num_theta
 
         # Add image data to NXdetector
         nxinstrument.detector.image_key = image_keys
@@ -456,7 +428,7 @@ class TomoDataProcessor(Processor):
             for tomographic image reduction.
         :type data: list[PipelineData]
         :param outputdir: Output folder name, defaults to '.'.
-        :type outputdir:: str, optional
+        :type outputdir: str, optional
         :param interactive: Allows for user interactions,
             defaults to False.
         :type interactive: bool, optional
@@ -664,7 +636,7 @@ class Tomo:
         :param num_core: Number of processors.
         :type num_core: int
         :param outputdir: Output folder name, defaults to '.'.
-        :type outputdir:: str, optional
+        :type outputdir: str, optional
         :param save_figs: Safe figures to file ('yes' or 'only') and/or
             display figures ('yes' or 'no'), defaults to 'no'.
         :type save_figs: Literal['yes', 'no', 'only'], optional
@@ -2078,7 +2050,7 @@ class Tomo:
                 evaluate('-log(tomo_stack)', out=tomo_stack)
 
             # Get rid of nans/infs that may be introduced by normalization
-            np.where(np.isfinite(tomo_stack), tomo_stack, 0.)
+            tomo_stack = np.where(np.isfinite(tomo_stack), tomo_stack, 0.)
 
             # Downsize tomography stack to smaller size
             tomo_stack = tomo_stack.astype('float32', copy=False)

CHAP/utils/general.py

@@ -611,6 +611,24 @@ def string_to_list(
     return l_of_i
 
 
+def list_to_string(a):
+    """Return a list of pairs of integers marking consecutive ranges
+    of integers in string notation."""
+    int_ranges = get_consecutive_int_range(a)
+    if not len(int_ranges):
+        return ''
+    if int_ranges[0][0] == int_ranges[0][1]:
+        s = f'{int_ranges[0][0]}'
+    else:
+        s = f'{int_ranges[0][0]}-{int_ranges[0][1]}'
+    for int_range in int_ranges[1:]:
+        if int_range[0] == int_range[1]:
+            s += f', {int_range[0]}'
+        else:
+            s += f', {int_range[0]}-{int_range[1]}'
+    return s
+
+
 def get_trailing_int(string):
     """Get the trailing integer in a string."""
     index_regex = re_compile(r'\d+$')

CHAP/utils/models.py

@@ -4,19 +4,21 @@
 import numpy as np
 from pydantic import (
     BaseModel,
+    Field,
     PrivateAttr,
     StrictBool,
     conint,
     conlist,
     confloat,
     constr,
-    validator,
+    field_validator,
 )
 from typing import (
     Literal,
     Optional,
     Union,
 )
+from typing_extensions import Annotated
 
 # Local modules
 from CHAP.utils.general import not_zero, tiny
@@ -125,11 +127,13 @@ def rectangle(
     return amplitude*rect
 
 
-def validate_parameters(parameters, values):
+def validate_parameters(parameters, info):
     """Validate the parameters
 
     :param parameters: Fit model parameters.
     :type parameters: list[FitParameter]
+    :param info: Pydantic validator info object.
+    :type info: pydantic_core._pydantic_core.ValidationInfo
     :return: List of fit model parameters.
     :rtype: list[FitParameter]
     """
@@ -137,7 +141,10 @@ def validate_parameters(parameters, values):
     import inspect
     from copy import deepcopy
 
-    model = values.get('model', None)
+    if 'model' in info.data:
+        model = info.data['model']
+    else:
+        model = None
     if model is None or model == 'expression':
         return parameters
     sig = {
@@ -173,17 +180,18 @@ class FitParameter(BaseModel):
 
     """
     name: constr(strip_whitespace=True, min_length=1)
-    value: Optional[confloat(allow_inf_nan=False)]
+    value: Optional[confloat(allow_inf_nan=False)] = None
     min: Optional[confloat()] = -np.inf
     max: Optional[confloat()] = np.inf
     vary: StrictBool = True
-    expr: Optional[constr(strip_whitespace=True, min_length=1)]
+    expr: Optional[constr(strip_whitespace=True, min_length=1)] = None
     _default: float = PrivateAttr()
     _init_value: float = PrivateAttr()
     _prefix: str = PrivateAttr()
     _stderr: float = PrivateAttr()
 
-    @validator('min', always=True)
+    @field_validator('min')
+    @classmethod
     def validate_min(cls, value):
         """Validate the specified min.
 
@@ -196,7 +204,8 @@ class FitParameter(BaseModel):
             return -np.inf
         return value
 
-    @validator('max', always=True)
+    @field_validator('max')
+    @classmethod
     def validate_max(cls, value):
         """Validate the specified max.
 
@@ -309,11 +318,13 @@ class Constant(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['constant']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Linear(BaseModel):
@@ -331,11 +342,13 @@ class Linear(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['linear']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Quadratic(BaseModel):
@@ -353,11 +366,13 @@ class Quadratic(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['quadratic']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Exponential(BaseModel):
@@ -375,11 +390,13 @@ class Exponential(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['exponential']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Gaussian(BaseModel):
@@ -397,11 +414,13 @@ class Gaussian(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['gaussian']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Lorentzian(BaseModel):
@@ -419,11 +438,13 @@ class Lorentzian(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['lorentzian']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Rectangle(BaseModel):
@@ -441,11 +462,13 @@ class Rectangle(BaseModel):
     :type prefix: str, optional
     """
     model: Literal['rectangle']
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Expression(BaseModel):
@@ -467,20 +490,22 @@ class Expression(BaseModel):
     """
     model: Literal['expression']
     expr: constr(strip_whitespace=True, min_length=1)
-    parameters: conlist(item_type=FitParameter) = []
+    parameters: Annotated[
+        conlist(item_type=FitParameter),
+        Field(validate_default=True)] = []
     prefix: Optional[str] = ''
 
-    _validate_parameters_parameters = validator(
-        'parameters', always=True, allow_reuse=True)(validate_parameters)
+    _validate_parameters_parameters = field_validator(
+        'parameters')(validate_parameters)
 
 
 class Multipeak(BaseModel):
     model: Literal['multipeak']
-    centers: conlist(item_type=confloat(allow_inf_nan=False), min_items=1)
+    centers: conlist(item_type=confloat(allow_inf_nan=False), min_length=1)
     fit_type: Optional[Literal['uniform', 'unconstrained']] = 'unconstrained'
-    centers_range: Optional[confloat(allow_inf_nan=False)]
-    fwhm_min: Optional[confloat(allow_inf_nan=False)]
-    fwhm_max: Optional[confloat(allow_inf_nan=False)]
+    centers_range: Optional[confloat(allow_inf_nan=False)] = None
+    fwhm_min: Optional[confloat(allow_inf_nan=False)] = None
+    fwhm_max: Optional[confloat(allow_inf_nan=False)] = None
     peak_models: Literal['gaussian', 'lorentzian'] = 'gaussian'
 
 
@@ -538,30 +563,32 @@ class FitConfig(BaseModel):
     parameters: conlist(item_type=FitParameter) = []
     models: conlist(item_type=Union[
         Constant, Linear, Quadratic, Exponential, Gaussian, Lorentzian,
-        Rectangle, Expression, Multipeak], min_items=1)
+        Rectangle, Expression, Multipeak], min_length=1)
     method: Literal[
         'leastsq', 'trf', 'dogbox', 'lm', 'least_squares'] = 'leastsq'
-    rel_height_cutoff: Optional[confloat(gt=0, lt=1.0, allow_inf_nan=False)]
+    rel_height_cutoff: Optional[
+        confloat(gt=0, lt=1.0, allow_inf_nan=False)] = None
     num_proc: conint(gt=0) = 1
     plot: StrictBool = False
     print_report:  StrictBool = False
 
-    @validator('method', always=True)
-    def validate_method(cls, value, values):
+    @field_validator('method')
+    @classmethod
+    def validate_method(cls, method, info):
         """Validate the specified method.
 
-        :param value: Field value to validate (`method`).
-        :type value: str
-        :param values: Dictionary of validated class field values.
-        :type values: dict
+        :param method: The value of `method` to validate.
+        :type method: str
+        :param info: Pydantic validator info object.
+        :type info: pydantic_core._pydantic_core.ValidationInfo
         :return: Fit method.
         :rtype: str
         """
-        code = values['code']
+        code = info.data['code']
         if code == 'lmfit':
-            if value not in ('leastsq', 'least_squares'):
-                value = 'leastsq'
-        elif value == 'least_squares':
-            value = 'leastsq'
+            if method not in ('leastsq', 'least_squares'):
+                method = 'leastsq'
+        elif method == 'least_squares':
+            method = 'leastsq'
 
-        return value
+        return method

CHAP/utils/parfile.py

@@ -2,10 +2,13 @@
 as input
 """
 
+# System modules
 import csv
-import json
 import os
 
+# Third party modules
+import json
+
 class ParFile():
     """Representation of a .par file
 
@@ -78,9 +81,12 @@ class ParFile():
         :return: a map configuration
         :rtype: CHAP.common.models.map.MapConfig
         """
+        # Third party modules
         import numpy as np
+
+        # Local modules
         from CHAP.common.models.map import MapConfig
-        from CHAP.utils.scanparsers import SMBScanParser
+        from chess_scanparsers import SMBScanParser
 
         scanparser = SMBScanParser(self.spec_file, 1)
         good_scans = self.good_scan_numbers()
@@ -156,7 +162,9 @@ class ParFile():
         :return: reshaped array of values
         :rtype: np.ndarray
         """
+        # Third party modules
         import numpy as np
+
         good_scans = self.good_scan_numbers()
         if len(values) != len(good_scans):
             raise ValueError('number of values provided ({len(values)}) does '

{ChessAnalysisPipeline-0.0.15.dist-info → ChessAnalysisPipeline-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChessAnalysisPipeline
-Version: 0.0.15
+Version: 0.0.16
 Summary: CHESS analysis pipeline framework
 Home-page: https://github.com/CHESSComputing/ChessAnalysisPipeline
 Author: Keara Soloway, Rolf Verberg, Valentin Kuznetsov

{ChessAnalysisPipeline-0.0.15.dist-info → ChessAnalysisPipeline-0.0.16.dist-info}/RECORD

@@ -1,27 +1,32 @@
 CHAP/TaskManager.py,sha256=NEqg2jAq10kbScE18XtzY3liqkIdAtysaR-gMG5tBzs,6803
-CHAP/__init__.py,sha256=hMZq2tCAKpAjqjLuN2CzDgMqCVZ9qDExUkrrNDbpUTE,1073
-CHAP/pipeline.py,sha256=86Lxffg_1oOD0t96-EGjo2rCfypDkLwXh4O6n-eU7tU,8987
+CHAP/__init__.py,sha256=hadJMmJS333LbHm-fvaZqkB8KuMleckTibFgubmru3Q,1073
+CHAP/pipeline.py,sha256=zS4m2tfWn3g_5Pp0AtIHnAfQC6NnyH9-j8xlyXoQZDA,10363
 CHAP/processor.py,sha256=nqg1uK5jvADl35xuR6VIdU5uVGFVt-rzivnaZyOWruA,2639
 CHAP/reader.py,sha256=wGzAl_p5UnR7fC7Cie29S7RZTFFLcdOuhbViNDzH-4s,2534
-CHAP/runner.py,sha256=K_3ss0eLKZEJBnJTIoljq6ObpMHpI3BW187LnyeTY-Q,7913
+CHAP/runner.py,sha256=GB_0sCAbv-DpOFzaRvC-3he2uaCxOMSVo7axuT64-PI,11443
 CHAP/server.py,sha256=JAh5a7ZPh_Vx7fm0uI_g2WHLVxLn8s1uwBX8oMJ3G9c,3648
 CHAP/writer.py,sha256=9hed3_51AwSSH3kNisMR6Wq6mLInNGpgktPG5G_s-DM,2589
-CHAP/common/__init__.py,sha256=_vD2RcbP-6GGiiXgS9_Z1crqQBdCJYf0cZBDGIaEVNU,1279
-CHAP/common/processor.py,sha256=0uiMgVr_S_Vi9zkoW0jw8sI9VAoEwuNPpGig-gNvpQ0,90804
-CHAP/common/reader.py,sha256=Vp1pu9nKZkI2SvdzfZNV_b1OCiGwLNwHU14WAXdToeo,20408
-CHAP/common/writer.py,sha256=6RfRXXmKh3xouhzzfdRLCL7JD56wI4PAlx8zV2hOAiQ,19229
+CHAP/common/__init__.py,sha256=qxmX8YxggWmvFb1JBHidR_-jw_ZUr8qwjZcqViM1QDc,1369
+CHAP/common/processor.py,sha256=t9PHYlj0NnL_WOy8JcCaEsXAK2_-ZbAZTuuuWhr-fNA,124191
+CHAP/common/reader.py,sha256=lND31bcy1WpNYSGYcVZPiB8B0OSazgUcV08wHrw88sg,22937
+CHAP/common/writer.py,sha256=y4A_iQxwHcH15I3Hmrei0NcijDQ4Qxu7J0dZlR9iUbs,19485
 CHAP/common/models/__init__.py,sha256=MpmtY6biXgC7AaedznoSqFJJZ54YU8tBPgwzYJIVJ1c,200
-CHAP/common/models/integration.py,sha256=0WM2Q15XFQf-uydMALh3snbpoop-c5N6Pnf_O7ikXW0,27175
-CHAP/common/models/map.py,sha256=gWQXIs2qDjlJVpHiXNZwaWSSAkiDS0YD9YiC3MhmufY,50071
-CHAP/edd/__init__.py,sha256=6Xy1Eb5fFm1lTBHumsDsY4D-gSIjJaXM8qbTSsDk8CE,946
-CHAP/edd/models.py,sha256=O4W3KgvVyJIO_IszzIekoH2dKKwueLg367gVDApgvmo,53021
-CHAP/edd/processor.py,sha256=cQtom7myX_3y2RuAZvaVHRlkVb2YCg7GMullGmoDD0A,142268
-CHAP/edd/reader.py,sha256=WdLYjtwVwvOxUeMzMBPQf4XplSH3_5Jzkc5X5_uTvLY,28833
+CHAP/common/models/integration.py,sha256=sEFl8e8rF7-BMaaCmbephf0-86tdqR8rVXfioziulR8,27086
+CHAP/common/models/map.py,sha256=Z_v-vX1emOIbtxFhqmm9-AyHLO4iS0MmMDrlwep1hkA,47216
+CHAP/edd/__init__.py,sha256=BBOJLG4Hvbm6KLE0lKbIrJOQm8rExnfn0re3RPM1suU,923
+CHAP/edd/models.py,sha256=rfrymbYeuOoEYBm-A1bKg0Iso2jI0naQ9OT9kpvnuA4,45358
+CHAP/edd/processor.py,sha256=sJnJLYicv6RzBwLroUA46nc49XRYrtNtTu_PTTI6YZ0,151842
+CHAP/edd/reader.py,sha256=WVikplFGys5MGYK857vK8-buY85BqNTf8N7xZSKW8a8,38401
 CHAP/edd/utils.py,sha256=jF8kz-feR16QIc-MbZEgl0jmTcBs63Bfnb2a0DrS4vU,66377
 CHAP/edd/writer.py,sha256=Y1CXWMRU87XeeDp4g4-sUgPP2UbCguYZUR_Cg5Ci6l8,94
 CHAP/foxden/__init__.py,sha256=6H6mqd_-qu8BiBDM0aRx5edcYLOse6Z_x3TsDf7E4J0,149
 CHAP/foxden/processor.py,sha256=-wHpgtiru1zJYaf1zd9pUl5bxjetu-yH_cAIKaEnqB4,1058
 CHAP/foxden/writer.py,sha256=jijYSaVAK0EwIichgYFk2Bh3ytPbBAmL_wy8aQRKY8I,2151
+CHAP/giwaxs/__init__.py,sha256=-AOy8RUNunuC3Xh6jFeJHPtCRgJA1A_9Qaf6jmQ4k08,255
+CHAP/giwaxs/models.py,sha256=3ZTjRmpLZFjH6-ZKxl2qOhynrJwtW1YAoEZbtIo4DDI,3023
+CHAP/giwaxs/processor.py,sha256=dzKrD5KKpb7x_MNtp88WFAOLn0oG0w3oLYrQpRgzmn4,22957
+CHAP/giwaxs/reader.py,sha256=O0KeZcqACsZ8ngrliPU6I3u8SeQT0Aq866jCTbruXqc,94
+CHAP/giwaxs/writer.py,sha256=Y1CXWMRU87XeeDp4g4-sUgPP2UbCguYZUR_Cg5Ci6l8,94
 CHAP/inference/__init__.py,sha256=GwpEKEMHY1-3AE7HWKBdBz_i7N1sz7xwve6y9tZ7Skk,263
 CHAP/inference/processor.py,sha256=TYYPtZ3YlZS1kgvGr6I_9RvSaR0kn9PKL98A3QwqeDI,2065
 CHAP/inference/reader.py,sha256=O0KeZcqACsZ8ngrliPU6I3u8SeQT0Aq866jCTbruXqc,94
@@ -35,24 +40,23 @@ CHAP/sin2psi/processor.py,sha256=6ytGpsK5u6tyUTzOJqAlcRdaimA4QfXZ6xpwGf2QMFo,97
 CHAP/sin2psi/reader.py,sha256=O0KeZcqACsZ8ngrliPU6I3u8SeQT0Aq866jCTbruXqc,94
 CHAP/sin2psi/writer.py,sha256=Y1CXWMRU87XeeDp4g4-sUgPP2UbCguYZUR_Cg5Ci6l8,94
 CHAP/tomo/__init__.py,sha256=7cwm1ufJkDKqrp2OPH_z7tKAOQ0S_RJbNainK0soKNo,328
-CHAP/tomo/models.py,sha256=f8UMb1JpHtpEm1D5RsqnWJvioa3IzLde8UAvDTyUYfo,8472
-CHAP/tomo/processor.py,sha256=h3om_nN6W4E6uNhj3aXwZBJCTHPdWQd6E4bXGO-nfNk,159059
+CHAP/tomo/models.py,sha256=H9V6ypeKXYOEn09s-QFAqs5iKG8Y2xi2vQHzptp8I4g,8640
+CHAP/tomo/processor.py,sha256=DgrDx4BxZlIyZ0wfeaKLRZ-Mm6eqn0W5N3Yfs1t4HQQ,157631
 CHAP/tomo/reader.py,sha256=7nNP_KyIR-ghrrajCR2k5IsJnrLm6BIy-eAXIDXrQe8,123
 CHAP/tomo/writer.py,sha256=J7q_nmsqi_zbgAS-LvAciiBqtYD8hHJ4QmwS2oZAM2Q,123
 CHAP/utils/__init__.py,sha256=0bV7tjiTk1h9y0NQm92PNFrGcs40lFB6CzISEXMczqU,223
 CHAP/utils/fit.py,sha256=JZKx2n5GrPmtQFxxkorMD_mvtzrEvBUfRwgMCItp__E,122419
-CHAP/utils/general.py,sha256=wjdVHUr-zqODfeaVmoIS5_HLe3sg757oZ176x_pRG40,83450
+CHAP/utils/general.py,sha256=DId5ANyBKU3lMjab5uq_ZlxA16yjvbEYhSxzuGsZF2w,84011
 CHAP/utils/material.py,sha256=NnLHAin3PrDxZiG6of8v7vFma0nAeOIRZJuXxSN_xj8,11495
-CHAP/utils/models.py,sha256=UrccAjeuM1D6YbJTSX0fuhHXhFF6HeYHDRyi2i61qm4,18722
-CHAP/utils/parfile.py,sha256=GxBWG6EVKQnV1I_r_m4nfJrCb0VGAn6tjEfuxVTg-aA,7227
-CHAP/utils/scanparsers.py,sha256=IJXTHPDyCm_n41LfNdnd5kMXodroijm3ltXTLLWDEAk,61950
+CHAP/utils/models.py,sha256=XLdhFoYRjIQAY28U-g7HcpWLnNdgMrdVXUHmA7S7tfI,19321
+CHAP/utils/parfile.py,sha256=vQrfQwYWdsPlftjI83OBlnM6hnUxjrL3Yp3yKo3ilcw,7348
 MLaaS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 MLaaS/ktrain.py,sha256=SPDUOQgjBDSx7sI8vZNXog9orvSyKmzpe6TdGHol9qM,7467
 MLaaS/mnist_img.py,sha256=ppDtlo6yrNQy0oIhFZVOnLvHJrR3ZPZ3PjZTtJY8l0E,2738
 MLaaS/tfaas_client.py,sha256=zpZ201wwcQBW1XkzDakD9Kl_NRSESAUdbnN6k6Ey15A,14889
-ChessAnalysisPipeline-0.0.15.dist-info/LICENSE,sha256=IbeOUUh4pqaZbUvtbkPFMfTH2YYFlRUNtRKr0TQeUpg,3076
-ChessAnalysisPipeline-0.0.15.dist-info/METADATA,sha256=VoAlJGQY01DwuEAUlr8td8zVVfHlxotJOjHlAMdwyo8,1542
-ChessAnalysisPipeline-0.0.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ChessAnalysisPipeline-0.0.15.dist-info/entry_points.txt,sha256=w-KIKdUjmj5GCobrFC4_jexCsFB4yMXYjrsMWrhI6Co,42
-ChessAnalysisPipeline-0.0.15.dist-info/top_level.txt,sha256=BKhggOWLb9dD6oQm1RXrkJPnXm-zJxVzQef1iXYtt2k,11
-ChessAnalysisPipeline-0.0.15.dist-info/RECORD,,
+ChessAnalysisPipeline-0.0.16.dist-info/LICENSE,sha256=IbeOUUh4pqaZbUvtbkPFMfTH2YYFlRUNtRKr0TQeUpg,3076
+ChessAnalysisPipeline-0.0.16.dist-info/METADATA,sha256=sN1mSsF8G4Xiy_A9Qgbfq1Y47Rite7_4HOUXU-LHEZM,1542
+ChessAnalysisPipeline-0.0.16.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+ChessAnalysisPipeline-0.0.16.dist-info/entry_points.txt,sha256=w-KIKdUjmj5GCobrFC4_jexCsFB4yMXYjrsMWrhI6Co,42
+ChessAnalysisPipeline-0.0.16.dist-info/top_level.txt,sha256=BKhggOWLb9dD6oQm1RXrkJPnXm-zJxVzQef1iXYtt2k,11
+ChessAnalysisPipeline-0.0.16.dist-info/RECORD,,

{ChessAnalysisPipeline-0.0.15.dist-info → ChessAnalysisPipeline-0.0.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any