module-qc-tools 2.9.0__tar.gz → 2.9.2__tar.gz

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/.gitlab-ci.yml

@@ -16,10 +16,10 @@ cache:
     - .cache/pre-commit
     - venv/
 
-image: registry.cern.ch/docker.io/library/python:3.11-buster
+image: registry.cern.ch/docker.io/library/python:3.12-bookworm
 before_script:
   # want to set up a virtualenv to cache
-  - apt-get install -y --no-install-recommends git
+  - apt-get update && apt-get install -y --no-install-recommends git
   - python -V
   - git config --global credential.helper 'cache'
   - |

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/.zenodo.json

@@ -1,8 +1,8 @@
 {
     "description": " general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests for the ATLAS ITk project",
     "license": "MIT",
-    "title": "atlas-itk-pixel-modules/mqt: v2.9.0",
-    "version": "v2.9.0",
+    "title": "atlas-itk-pixel-modules/mqt: v2.9.2",
+    "version": "v2.9.2",
     "upload_type": "software",
     "creators": [
     {
@@ -120,7 +120,7 @@
     "related_identifiers": [
         {
             "scheme": "url",
-            "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tree/v2.9.0",
+            "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tree/v2.9.2",
             "relation": "isSupplementTo"
         }
     ]

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/CITATION.cff

@@ -77,6 +77,6 @@ keywords:
 license:
 - mit
 message: If you use this software, please cite it using the metadata from this file.
-title: 'atlas-itk-pixel-modules/mqt: v2.9.0'
+title: 'atlas-itk-pixel-modules/mqt: v2.9.2'
 type: software
-version: v2.9.0
+version: v2.9.2

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.9.0
+Version: 2.9.2
 Summary: Module qc tools
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools
 Project-URL: Bug Tracker, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/issues
@@ -45,7 +45,7 @@ Requires-Dist: typer>=0.18.0
 Requires-Dist: urllib3<2,>=1.26.20; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# module-qc-tools v2.9.0
+# module-qc-tools v2.9.2
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/README.md

@@ -1,4 +1,4 @@
-# module-qc-tools v2.9.0
+# module-qc-tools v2.9.2
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/docs/history.md

@@ -16,6 +16,17 @@ and this project adheres to
 
 **_Fixed:_**
 
+- Handle module communication loss from extreme VDDA/VDDD trim values (0, 1,
+  14, 15) in `ANALOG_READBACK` gracefully - pad the affected trim point with 0
+  and continue instead of crashing the measurement
+
+## [2.9.1](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.9.1) - 2006-07-23 ## {: #mqt-v2.9.1 }
+
+**_Changed:_**
+
+- Updated compliance for triplets to 120 uA in accordance with documentation
+  (!291)
+
 ## [2.9.0](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.9.0) - 2006-07-13 ## {: #mqt-v2.9.0 }
 
 **_Changed:_**

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/docs/install.md

@@ -94,7 +94,7 @@ package.
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install -U pip
-$ python -m pip install -U pip module-qc-tools==2.9.0
+$ python -m pip install -U pip module-qc-tools==2.9.2
 ```
 
 ### via uv
@@ -103,7 +103,7 @@ $ python -m pip install -U pip module-qc-tools==2.9.0
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-tools==2.9.0
+$ uv pip install module-qc-tools==2.9.2
 ```
 
 # Usage

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/src/module_qc_tools/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.9.0'
-__version_tuple__ = version_tuple = (2, 9, 0)
+__version__ = version = '2.9.2'
+__version_tuple__ = version_tuple = (2, 9, 2)
 
 __commit_id__ = commit_id = None

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/src/module_qc_tools/data/configs/meas_config.json

@@ -11,7 +11,7 @@
         "IV_MEASURE": {
             "v_min": {"L0": 0, "L1": 0, "L2": 0},
             "v_max": {"L0": -100, "L1": -200, "L2": -200},
-            "i_max": {"L0": 100e-6, "L1": 100e-6, "L2": 100e-6},
+            "i_max": {"L0": 120e-6, "L1": 100e-6, "L2": 100e-6},
             "n_points": {"L0": 101, "L1": 41, "L2": 41},
             "settling_time": {"L0": 2, "L1": 2, "L2": 2}
         },

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/src/module_qc_tools/measurements/analog_readback.py

@@ -484,65 +484,98 @@ def run_vdda_vddd_vs_trim(config, ps, hv, yr, debug_gnd, use_calib_adc):
             config_trim, _status = yr.read_register(name=trim_name, chip_position=chip)
 
             for trim in config[trim_name]:
-                # Set trim of all chips
-                yr.write_register(name=trim_name, value=trim, chip_position=chip)
-
-                # Run eye-diagram and update the delay in the controller config according to new trim values
-                logger.info(f"Running eye diagram for VMUX{v_mux}={trim}")
-                _eye, _status = yr.eyeDiagram(skipconfig=True, testsize=100000)
-
-                # if debug GND set, measure the GND for the first VMUX
-                if debug_gnd and n == 0:
-                    vmux_gnd = read_vmux(
-                        meter,
-                        yr,
-                        config,
-                        v_mux=vmux_value_gnd,
-                        use_adc=use_calib_adc,
-                        chip_position=chip,
-                    )
-                    imux_gnd = read_vmux(
-                        meter,
-                        yr,
-                        config,
-                        i_mux=imux_value_gnd,
-                        use_adc=use_calib_adc,
-                        chip_position=chip,
-                    )
-
                 v_mea_chips = {}
                 i_mea_chips = {}
-
-                ## read VDD
-                v_mea_chips[v_mux] = read_vmux(
-                    meter,
-                    yr,
-                    config,
-                    v_mux=v_mux,
-                    use_adc=use_calib_adc,
-                    chip_position=chip,
-                )
-
-                ## Read muxes vs trim
-                for _imux in imux_to_measure[domain]:
-                    i_mea_chips[_imux] = read_vmux(
+                rosc_mea = []
+
+                try:
+                    # Set trim of all chips
+                    yr.write_register(name=trim_name, value=trim, chip_position=chip)
+
+                    # Run eye-diagram and update the delay in the controller config according to new trim values
+                    logger.info(f"Running eye diagram for VMUX{v_mux}={trim}")
+                    _eye, _status = yr.eyeDiagram(skipconfig=True, testsize=100000)
+
+                    # if debug GND set, measure the GND for the first VMUX
+                    if debug_gnd and n == 0:
+                        vmux_gnd = read_vmux(
+                            meter,
+                            yr,
+                            config,
+                            v_mux=vmux_value_gnd,
+                            use_adc=use_calib_adc,
+                            chip_position=chip,
+                        )
+                        imux_gnd = read_vmux(
+                            meter,
+                            yr,
+                            config,
+                            i_mux=imux_value_gnd,
+                            use_adc=use_calib_adc,
+                            chip_position=chip,
+                        )
+
+                    ## read VDD
+                    v_mea_chips[v_mux] = read_vmux(
                         meter,
                         yr,
                         config,
-                        i_mux=_imux,
+                        v_mux=v_mux,
                         use_adc=use_calib_adc,
                         chip_position=chip,
                     )
 
-                for _vmux in vmux_to_measure[domain]:
-                    v_mea_chips[_vmux] = read_vmux(
-                        meter,
-                        yr,
-                        config,
-                        v_mux=_vmux,
-                        use_adc=use_calib_adc,
-                        chip_position=chip,
+                    ## Read muxes vs trim
+                    for _imux in imux_to_measure[domain]:
+                        i_mea_chips[_imux] = read_vmux(
+                            meter,
+                            yr,
+                            config,
+                            i_mux=_imux,
+                            use_adc=use_calib_adc,
+                            chip_position=chip,
+                        )
+
+                    for _vmux in vmux_to_measure[domain]:
+                        v_mea_chips[_vmux] = read_vmux(
+                            meter,
+                            yr,
+                            config,
+                            v_mux=_vmux,
+                            use_adc=use_calib_adc,
+                            chip_position=chip,
+                        )
+
+                    # Read ROSC vs trim
+                    if v_mux == 38:
+                        mea, _status = yr.read_ringosc(chip_position=chip)
+                        rosc_mea = [float(num) for num in mea[0].split()]
+
+                except Exception as e:
+                    # Extreme trim values (0, 1, 14, 15) can push VDDA/VDDD out of
+                    # range and cause the module to lose communication. Pad this
+                    # trim point with 0 and move on instead of crashing the scan.
+                    logger.error(e)
+                    logger.error(
+                        f"Problem running VDDA/VDDD vs Trim at chip {chip}, {trim_name}={trim} "
+                        "(likely lost communication due to an extreme trim value), "
+                        "padding with 0 and continuing to next trim point"
                     )
+                    if debug_gnd and n == 0:
+                        vmux_gnd = [0]
+                        imux_gnd = [0]
+                    v_mea_chips[v_mux] = [0]
+                    for _imux in imux_to_measure[domain]:
+                        i_mea_chips[_imux] = [0]
+                    for _vmux in vmux_to_measure[domain]:
+                        v_mea_chips[_vmux] = [0]
+                    if v_mux == 38:
+                        rosc_mea = [0.0] * 42
+
+                for j, item in enumerate(rosc_mea):
+                    if f"ROSC{j}" not in i_mea[chip]:
+                        i_mea[chip][f"ROSC{j}"] = []
+                    i_mea[chip][f"ROSC{j}"].append(item)
 
                 ## measure VDDA/D vs trim
                 if trim_name not in i_mea[chip]:
@@ -568,15 +601,6 @@ def run_vdda_vddd_vs_trim(config, ps, hv, yr, debug_gnd, use_calib_adc):
                     i_mea[chip][f"Vmux{vmux_value_gnd}"].extend(vmux_gnd)
                     i_mea[chip][f"Imux{imux_value_gnd}"].extend(imux_gnd)
 
-                # Read ROSC vs trim
-                if v_mux == 38:
-                    mea, _status = yr.read_ringosc(chip_position=chip)
-                    rosc_mea = [float(num) for num in mea[0].split()]
-                    for j, item in enumerate(rosc_mea):
-                        if f"ROSC{j}" not in i_mea[chip]:
-                            i_mea[chip][f"ROSC{j}"] = []
-                        i_mea[chip][f"ROSC{j}"].append(item)
-
             data[chip].add_data(i_mea[chip])
 
             i_mea = [{} for _ in range(yr._number_of_chips)]
@@ -585,10 +609,17 @@ def run_vdda_vddd_vs_trim(config, ps, hv, yr, debug_gnd, use_calib_adc):
             logger.info(
                 f"Set VMUX{v_mux} back to default and re-running :eye: diagram."
             )
-            yr.write_register(
-                name=trim_name, value=int(config_trim[0]), chip_position=chip
-            )
-            _eye, _status = yr.eyeDiagram(skipconfig=True)
+            try:
+                yr.write_register(
+                    name=trim_name, value=int(config_trim[0]), chip_position=chip
+                )
+                _eye, _status = yr.eyeDiagram(skipconfig=True)
+            except Exception as e:
+                logger.error(e)
+                logger.error(
+                    f"Problem resetting {trim_name} back to default on chip {chip} "
+                    "after communication loss - continuing anyway."
+                )
 
     logger.info("VDDA/VDDD measurement done!")
     logger.info(f"TimeEnd: {datetime.now().strftime('%Y-%m-%d_%H%M%S')}")

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/src/module_qc_tools/utils/yarr.py

@@ -311,7 +311,7 @@ class yarr(hardware_control_base):
 
     def dataMergingCheck(self, testsize=None, mode=None, verbose=False, quiet=False):
         if not self.dataMergingCheck_exe:
-            msg = "No `dataMergingCheck_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.9.0/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
+            msg = "No `dataMergingCheck_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.9.2/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
             raise RuntimeError(msg)
 
         _mode = "4-to-1"
@@ -362,7 +362,7 @@ class yarr(hardware_control_base):
         self, dryrun=False, skipconfig=False, testsize=None, connectivity=None
     ):
         if not self.eyeDiagram_exe:
-            msg = "No `eyeDiagram_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.9.0/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
+            msg = "No `eyeDiagram_exe` found in hardware config file! Check and compare to https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/blob/v2.9.2/src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json!"
             raise RuntimeError(msg)
         _dryrun = ""
         _skipconfig = ""

{module_qc_tools-2.9.0 → module_qc_tools-2.9.2}/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "2.9.0"
+current = "2.9.2"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before
@@ -17,7 +17,7 @@ regex = '''
 
 [git]
 # The current version will get updated when tbump is run
-message_template = "Bump version: 2.9.0 → {new_version}"
+message_template = "Bump version: 2.9.2 → {new_version}"
 tag_template = "v{new_version}"
 
 # For each file to patch, add a [[file]] config