module-qc-tools 2.3.0__tar.gz → 2.4.1__tar.gz

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.3.0
+Version: 2.4.1
 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
 Project-URL: Source, https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools
-Project-URL: Documentation, https://atlas-itk-pixel-mqt.docs.cern.ch/2.3/
+Project-URL: Documentation, https://atlas-itk-pixel-mqt.docs.cern.ch/2.4/
 Author-email: Jay Chan <jay.chan@cern.ch>
 Maintainer-email: Giordon Stark <gstark@cern.ch>
 License: Copyright (c) 2018 ATLAS ITk Pixel Modules
@@ -34,18 +34,18 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7
 Requires-Dist: check-jsonschema
 Requires-Dist: importlib-resources; python_version < '3.9'
-Requires-Dist: module-qc-data-tools>=1.0.22
-Requires-Dist: module-qc-database-tools>=2.4.8
+Requires-Dist: module-qc-data-tools>=1.0.23
+Requires-Dist: module-qc-database-tools>=2.5.0rc0
 Requires-Dist: numpy
 Requires-Dist: pre-commit
 Requires-Dist: requests
 Requires-Dist: rich
 Requires-Dist: tabulate
 Requires-Dist: typer>=0.9.0
-Requires-Dist: urllib3<2,>=1.26.11; 'el7.x86_64' in platform_release
+Requires-Dist: urllib3<2,>=1.26.20; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# module-qc-tools v2.3.0
+# module-qc-tools v2.4.1
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/README.md

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

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/docs/config.md

@@ -19,6 +19,7 @@ modified when running standard module QC. Examples are provided in
 !!! note
 
     There are 4 example hardware configs for the different combinations of V1 or V2 modules and a merged or separate VMUX:
+
     - `hw_config_example_merged_vmux_itkpixv2.json`
     - `hw_config_example_merged_vmux_v1.json`
     - `hw_config_example_separate_vmux_itkpixv2.json`
@@ -30,7 +31,8 @@ modified when running standard module QC. Examples are provided in
 
     ```json title="$(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux_itkpixv2.json"
     --8<-- "hw_config_example_merged_vmux_itkpixv2.json"
-    json title="$(module-qc-tools --prefix)/configs/meas_config.json"
+    ```
+    ```json title="$(module-qc-tools --prefix)/configs/meas_config.json"
     --8<-- "meas_config.json"
     ```
 
@@ -41,28 +43,31 @@ following sections. The `task` block specifies the settings of each scan
 performed by the scripts, and will be explained in
 [measurements](measurements.md).
 
-## yarr
+## Hardware Configuration
+
+### yarr
 
 The `yarr` block specifies the path to the `YARR` repository as well as the
 corresponding YARR configuration files.
 
 **Configuration settings**
 
-| Name                 | Description                                                                                                                                                                                                                         |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `run_dir`            | path (relative or absolute) to the directory where `YARR` commands should be run                                                                                                                                                    |
-| `controller`         | path (relative to `run_dir` or absolute) to the controller file                                                                                                                                                                     |
-| `scanConsole_exe`    | path (relative to `run_dir` or absolute) to the `scanConsole` executable                                                                                                                                                            |
-| `write_register_exe` | path (relative to `run_dir` or absolute) to the `write_register` executable                                                                                                                                                         |
-| `read_register_exe`  | path (relative to `run_dir` or absolute) to the `read_register` executable                                                                                                                                                          |
-| `read_adc_exe`       | path (relative to `run_dir` or absolute) to the `read_adc` executable                                                                                                                                                               |
-| `switchLPM_exe`      | path (relative to `run_dir` or absolute) to the `switchLPM` executable                                                                                                                                                              |
-| `lpm_digitalscan`    | path (relative to `run_dir` or absolute) to the low-power mode digital scan in YARR; for ITkPix v2, make sure that the path points to the correct scan config directory, e.g. `"configs/scans/itkpixv2/lpm_digitalscan.json"`       |
-| `read_ringosc_exe`   | path (relative to `run_dir` or absolute) to the `Rd53bReadRingosc` or `Itkpixv2ReadRingosc` executable in YARR; for ITkPix v2, make sure the path points to the executable for the correct chip, e.g. `"./bin/Itkpixv2ReadRingosc"` |
-| `eyeDiagram_exe`     | path (relative to `run_dir` or absolute) to the `eyeDiagram` executable in YARR                                                                                                                                                     |
-| `success_code`       | exit status that indicates success. The default is 0 besides `configure`, which has exit status 1 for success. The user do not need to set the `success_code` as the default in QC software is synchronized with YARR.              |
-
-## power_supply
+| Name                   | Description                                                                                                                                                                                                                         |
+| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `run_dir`              | path (relative or absolute) to the directory where `YARR` commands should be run                                                                                                                                                    |
+| `controller`           | path (relative to `run_dir` or absolute) to the controller file                                                                                                                                                                     |
+| `scanConsole_exe`      | path (relative to `run_dir` or absolute) to the `scanConsole` executable                                                                                                                                                            |
+| `write_register_exe`   | path (relative to `run_dir` or absolute) to the `write_register` executable                                                                                                                                                         |
+| `read_register_exe`    | path (relative to `run_dir` or absolute) to the `read_register` executable                                                                                                                                                          |
+| `read_adc_exe`         | path (relative to `run_dir` or absolute) to the `read_adc` executable                                                                                                                                                               |
+| `switchLPM_exe`        | path (relative to `run_dir` or absolute) to the `switchLPM` executable                                                                                                                                                              |
+| `lpm_digitalscan`      | path (relative to `run_dir` or absolute) to the low-power mode digital scan in YARR; for ITkPix v2, make sure that the path points to the correct scan config directory, e.g. `"configs/scans/itkpixv2/lpm_digitalscan.json"`       |
+| `read_ringosc_exe`     | path (relative to `run_dir` or absolute) to the `Rd53bReadRingosc` or `Itkpixv2ReadRingosc` executable in YARR; for ITkPix v2, make sure the path points to the executable for the correct chip, e.g. `"./bin/Itkpixv2ReadRingosc"` |
+| `eyeDiagram_exe`       | path (relative to `run_dir` or absolute) to the `eyeDiagram` executable in YARR                                                                                                                                                     |
+| `dataMergingCheck_exe` | path (relative to `run_dir` or absolute) to the `dataMergingCheck` executable in YARR                                                                                                                                               |
+| `success_code`         | exit status that indicates success. The default is 0 besides `configure`, which has exit status 1 for success. The user do not need to set the `success_code` as the default in QC software is synchronized with YARR.              |
+
+### power_supply
 
 The `power_supply` block specifies the path and the commands for handling the
 low voltage power supply
@@ -83,7 +88,7 @@ low voltage power supply
 | `checkTarget_timeout` | after each `set_cmd` call, `measI_cmd` is called to check if the target is reached, if not after `checkTarget_timeout` (in sec.), an exception is raised                                                                                    |
 | `success_code`        | exit status that indicates success. The default is 0.                                                                                                                                                                                       |
 
-## high_voltage
+### high_voltage
 
 Similar to the `power_supply` block, the `high_voltage` block specifies the path
 and the commands for handling the high voltage power supply needed for leakage
@@ -98,7 +103,7 @@ current vs. bias voltage (IV) measurements.
 | `polarity`            | indicator if normal polarity (default 1) or reverse polarity (-1) is used. Can also take a command that returns a value, e.g. `"polarity": "echo 1"`. For power supplies that accept and output both positive and negative values of the bias voltage, the polarity is `1`. For power supplies that only accept and output a single polarity, this setting is `-1` and the wiring should be adapted accordingly. |
 | `checkTarget_timeout` | after each `set_cmd` call, `measV_cmd` is called to check if the target is reached, if not after `checkTarget_timeout` (in sec.), an exception is raised                                                                                                                                                                                                                                                         |
 
-## multimeter
+### multimeter
 
 The `multimeter` block specifies the path and the commands for handling the
 multimeter
@@ -112,7 +117,7 @@ multimeter
 | `n_try`        | number of re-tries in case the script fails to read from the multimeter                                                                                                                                                                                                                                                                         |
 | `success_code` | exit status that indicates success. The default is 0.                                                                                                                                                                                                                                                                                           |
 
-## ntc
+### ntc
 
 The `ntc` block specifies the path and the commands for handling the NTC
 
@@ -125,7 +130,9 @@ The `ntc` block specifies the path and the commands for handling the NTC
 | `n_try`        | number of re-tries in case the script fails to read from the ntc                                                                                                                                                                    |
 | `success_code` | exit status that indicates success. The default is 0.                                                                                                                                                                               |
 
-## tasks
+## Measurement Configuration
+
+### tasks
 
 The `tasks` block starts with the `GENERAL` section that specifies the
 layer-dependent power settings:

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/docs/history.md

@@ -16,6 +16,68 @@ and this project adheres to
 
 **_Fixed:_**
 
+## [2.4.1](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.4.1) - 2025-xx-yy ## {: #mqt-v2.4.1 }
+
+**_Changed:_**
+
+**_Added:_**
+
+**_Fixed:_**
+
+- eye diagram parsing (!228)
+
+## [2.4.0](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.4.0) - 2025-03-11 ## {: #mqt-v2.4.0 }
+
+**_Changed:_**
+
+- reduce number of steps in VCAL calibration (!215)
+- increase voltage compliance during SLDO scan (!219)
+- improve compatibility of mqt with Felix (!186)
+
+**_Added:_**
+
+- add BOM information to output of SLDO, LP and ADC calibration (!220)
+- add ability to enable/disable LPM on targeted TX channels (!207)
+- add data merging substest to data transmission test (!218)
+
+<!-- prettier-ignore -->
+> [!IMPORTANT]
+> Requires update of the `yarr` section in the hardware config file:
+> `"dataMergingCheck_exe": "./bin/dataMergingCheck",`
+
+- add Iref trim information to output of the AR test (!221)
+- add protection when ramping HV down (!211)
+- CLI to retrieve input current based on chip version (!210)
+
+**_Fixed:_**
+
+- fix write register issue when running with separate vmux (!208)
+- fixed number of points in SLDO (!213)
+
+## [2.3.0](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.3.0) - 2024-07-12 ## {: #mqt-v2.3.0 }
+
+**_Changed:_**
+
+**_Added:_**
+
+**_Fixed:_**
+
+## [2.2.8](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.2.8) - 2024-12-17 ## {: #mqt-v2.2.8 }
+
+**_Changed:_**
+
+**_Added:_**
+
+**_Fixed:_**
+
+## [2.2.7](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.2.7) - 2024-10-03 ## {: #mqt-v2.2.7 }
+
+**_Changed:_**
+
+**_Added:_**
+
+**_Fixed:_**
+
 ## [2.2.6](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.2.6) - 2024-07-12 ## {: #mqt-v2.2.6 }
 
 **_Changed:_**

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/docs/install.md

@@ -92,7 +92,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.3.0
+$ python -m pip install -U pip module-qc-tools==2.4.1
 ```
 
 ### via uv
@@ -101,7 +101,7 @@ $ python -m pip install -U pip module-qc-tools==2.3.0
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-tools==2.3.0
+$ uv pip install module-qc-tools==2.4.1
 ```
 
 # Usage

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/docs/measurements.md

@@ -18,15 +18,16 @@ modules to be tested are already powered on.
 
 ### Time Estimates
 
-| Measurement     | Duration |
-| --------------- | -------- |
-| ADC calib       | 00:02:12 |
-| Analog Readback | 00:18:27 |
-| SLDO VI         | 00:08:45 |
-| Vcal calib      | 00:04:50 |
-| Injection Cap.  | 00:00:50 |
-| LP Mode         | 00:00:53 |
-| OVP             | 00:00:27 |
+| Measurement       | Duration |
+| ----------------- | -------- |
+| ADC calib         | 00:02:12 |
+| Analog Readback   | 00:18:27 |
+| SLDO VI           | 00:08:45 |
+| Vcal calib        | 00:04:50 |
+| Injection Cap.    | 00:00:50 |
+| LP Mode           | 00:00:53 |
+| OVP               | 00:00:27 |
+| DATA_TRANSMISSION | 00:00:26 |
 
 ### Local Filesystem
 
@@ -410,9 +411,10 @@ specified in the input configuration json file (i.e. '$(module-qc-tools
 
 **Configuration settings**
 
-| Name       | Description                     |
-| ---------- | ------------------------------- |
-| `MonitorV` | list of VMUX channels to be set |
+| Name          | Description                             |
+| ------------- | --------------------------------------- |
+| `MonitorV`    | list of VMUX channels to be set         |
+| `DataMerging` | list of data merging modes to be tested |
 
 ??? example
 

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/pyproject.toml

@@ -20,11 +20,11 @@ dependencies = [
     "tabulate",
     "pre-commit",
     "check-jsonschema",
-    "module-qc-data-tools >= 1.0.22",
-    "module-qc-database-tools >= 2.4.8",
+    "module-qc-data-tools >= 1.0.23",
+    "module-qc-database-tools >= 2.5.0rc0",
     'importlib_resources; python_version < "3.9"',
     "requests",
-    'urllib3>=1.26.11,<2; "el7.x86_64" in platform_release',
+    'urllib3>=1.26.20,<2; "el7.x86_64" in platform_release',
     "typer>=0.9.0",
     "rich",
 ]
@@ -38,7 +38,7 @@ classifiers = [
 "Homepage" = "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools"
 "Bug Tracker" = "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/issues"
 "Source" = "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools"
-"Documentation" = "https://atlas-itk-pixel-mqt.docs.cern.ch/2.3/"
+"Documentation" = "https://atlas-itk-pixel-mqt.docs.cern.ch/2.4/"
 
 [project.scripts]
 module-qc-tools = "module_qc_tools.cli:app"
@@ -48,6 +48,7 @@ emulator-write-register = "module_qc_tools.cli.hardware_emulator:run_write_regis
 emulator-read-register = "module_qc_tools.cli.hardware_emulator:run_read_register"
 emulator-read-adc = "module_qc_tools.cli.hardware_emulator:run_read_adc"
 emulator-read-ringosc = "module_qc_tools.cli.hardware_emulator:run_read_ringosc"
+emulator-data-merging-check = "module_qc_tools.cli.hardware_emulator:run_dataMergingCheck"
 emulator-eye-diagram = "module_qc_tools.cli.hardware_emulator:run_eyeDiagram"
 emulator-switch-lpm = "module_qc_tools.cli.hardware_emulator:run_switchLPM"
 emulator-control-ps = "module_qc_tools.cli.hardware_emulator:run_control_PS"
@@ -87,6 +88,11 @@ dependencies = [
 ]
 installer = "uv"
 
+[tool.hatch.envs.hatch-uv]
+dependencies = [
+  "uv!=0.6.7", # https://github.com/astral-sh/uv/issues/12260
+]
+
 [tool.hatch.envs.default.scripts]
 tag = "tbump {args}"
 lint = "pylint src"

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.4.1'
+__version_tuple__ = version_tuple = (2, 4, 1)

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/ADC_CALIBRATION.py

@@ -12,6 +12,7 @@ from module_qc_data_tools import (
     save_dict_list,
 )
 from module_qc_database_tools.utils import (
+    get_BOMCode_from_file,
     get_chip_type_from_serial_number,
 )
 
@@ -102,8 +103,14 @@ def main(
 
     ps.set(v=config["v_max"], i=config["i_config"][layer])
 
+    # try to retrieve the BOM information from the config files
+    BOM_file = (
+        Path(config_hw["yarr"]["connectivity"]).parent / f"{module_serial}_info.json"
+    )
+    bom = get_BOMCode_from_file(BOM_file, layer)
+
     try:
-        data = run(config, ps, yr, layer, debug_gnd)
+        data = run(config, ps, yr, layer, bom, debug_gnd)
     except KeyboardInterrupt:
         logger.info("KeyboardInterrupt")
         yr.remove_tmp_connectivity()

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/ANALOG_READBACK.py

@@ -22,6 +22,7 @@ from module_qc_tools.cli.globals import (
 )
 from module_qc_tools.console import console
 from module_qc_tools.measurements.analog_readback import (
+    run_readregister,
     run_tmeas,
     run_vdda_vddd_vs_trim,
     run_vmeas,
@@ -137,6 +138,20 @@ def main(
         raise typer.Exit(1) from err
     add_identifiers_metadata(data_vdda_vddd_vs_trim, module_serial, institution)
 
+    # Read register values
+    if "itkpixv2" in chip_type.lower():
+        try:
+            data_register = run_readregister(config, ps, yr, layer)
+        except KeyboardInterrupt:
+            logger.info("KeyboardInterrupt")
+            yr.remove_tmp_connectivity()
+        except Exception as err:
+            logger.info("Error in reading registers.")
+            logger.exception(err)
+            yr.remove_tmp_connectivity()
+            raise typer.Exit(1) from err
+        add_identifiers_metadata(data_register, module_serial, institution)
+
     # Measure temperature at the end of the measurement to ensure temperature stability
     try:
         data_tempmeas = run_tmeas(config, ps, yr, layer, use_calib_adc)
@@ -183,6 +198,14 @@ def main(
             outputDF_tempmeas.to_dict(),
             outputDF_vdda_vddd_vs_trim.to_dict(),
         ]
+
+        if "itkpixv2" in chip_type.lower():
+            outputDF_register = outputDataFrame()
+            outputDF_register.set_test_type(TEST_TYPE)
+            outputDF_register.set_subtest_type("AR_REGISTER")
+            outputDF_register.set_results(data_register[chip])
+            alloutput += [outputDF_register.to_dict()]
+
         chipnames += [chip_name]
 
     with TemporaryDirectory() as tmpdirname:

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/DATA_TRANSMISSION.py

@@ -22,7 +22,10 @@ from module_qc_tools.cli.globals import (
     LogLevel,
 )
 from module_qc_tools.console import console
-from module_qc_tools.measurements.data_transmission import run
+from module_qc_tools.measurements.data_transmission import (
+    run_datamerging,
+    run_eyediagram,
+)
 from module_qc_tools.utils.misc import (
     add_identifiers_metadata,
     copytree,
@@ -103,7 +106,7 @@ def main(
     ps.set(v=config["v_max"], i=config["i_config"][layer])
 
     try:
-        data = run(
+        data = run_eyediagram(
             config,
             ps,
             yr,
@@ -118,19 +121,46 @@ def main(
         logger.exception(err)
         yr.remove_tmp_connectivity()
         raise typer.Exit(1) from err
-
     add_identifiers_metadata(data, module_serial, institution)
 
+    if layer in ["L1", "L2"]:
+        try:
+            data_merging = run_datamerging(
+                config,
+                ps,
+                yr,
+                layer,
+            )
+        except KeyboardInterrupt:
+            logger.info("KeyboardInterrupt")
+            yr.remove_tmp_connectivity()
+        except Exception as err:
+            logger.exception(err)
+            yr.remove_tmp_connectivity()
+            raise typer.Exit(1) from err
+        add_identifiers_metadata(data_merging, module_serial, institution)
+
     alloutput = []
     chipnames = []
 
     for chip in yr._enabled_chip_positions:
         chip_name = data[chip]._meta_data["Name"]
+
         console.print(data[chip])
-        outputDF = outputDataFrame()
-        outputDF.set_test_type(TEST_TYPE)
-        outputDF.set_results(data[chip])
-        alloutput += [outputDF.to_dict()]
+        outputDF_eye = outputDataFrame()
+        outputDF_eye.set_test_type(TEST_TYPE)
+        outputDF_eye.set_subtest_type("DT_EYE")
+        outputDF_eye.set_results(data[chip])
+        alloutput += [outputDF_eye.to_dict()]
+
+        if layer in ["L1", "L2"]:
+            console.print(data_merging[chip])
+            outputDF_merge = outputDataFrame()
+            outputDF_merge.set_test_type(TEST_TYPE)
+            outputDF_merge.set_subtest_type("DT_MERGE")
+            outputDF_merge.set_results(data_merging[chip])
+            alloutput += [outputDF_merge.to_dict()]
+
         chipnames += [chip_name]
 
     with TemporaryDirectory() as tmpdirname:

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/LP_MODE.py

@@ -12,6 +12,7 @@ from module_qc_data_tools import (
     save_dict_list,
 )
 from module_qc_database_tools.utils import (
+    get_BOMCode_from_file,
     get_chip_type_from_serial_number,
 )
 
@@ -99,8 +100,14 @@ def main(
     if not use_pixel_config:
         yr.omit_pixel_config()
 
+    # try to retrieve the BOM information from the config files
+    BOM_file = (
+        Path(config_hw["yarr"]["connectivity"]).parent / f"{module_serial}_info.json"
+    )
+    bom = get_BOMCode_from_file(BOM_file, layer)
+
     try:
-        data = run(config, ps, yr, layer, use_calib_adc)
+        data = run(config, ps, yr, layer, bom, use_calib_adc)
     except KeyboardInterrupt:
         logger.info("KeyboardInterrupt")
         yr.switchLPM("off")

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/SLDO.py

@@ -12,6 +12,7 @@ from module_qc_data_tools import (
     save_dict_list,
 )
 from module_qc_database_tools.utils import (
+    get_BOMCode_from_file,
     get_chip_type_from_serial_number,
 )
 
@@ -94,8 +95,14 @@ def main(
     if not use_pixel_config:
         yr.omit_pixel_config()
 
+    # try to retrieve the BOM information from the config files
+    BOM_file = (
+        Path(config_hw["yarr"]["connectivity"]).parent / f"{module_serial}_info.json"
+    )
+    bomcode = get_BOMCode_from_file(BOM_file, layer)
+
     try:
-        data = run(config, ps, yr, layer, use_calib_adc)
+        data = run(config, ps, yr, layer, bomcode, use_calib_adc)
     except KeyboardInterrupt:
         logger.info("KeyboardInterrupt")
         yr.remove_tmp_connectivity()

module_qc_tools-2.4.1/src/module_qc_tools/cli/get_nominal_current.py

@@ -0,0 +1,46 @@
+import json
+import logging
+from pathlib import Path
+
+import typer
+from module_qc_data_tools import (
+    get_layer_from_sn,
+    get_nominal_current,
+)
+from module_qc_database_tools.utils import (
+    get_chip_type_from_serial_number,  # TODO move to data tools?
+)
+
+from module_qc_tools.cli.globals import (
+    CONTEXT_SETTINGS,
+    OPTIONS,
+)
+
+app = typer.Typer(context_settings=CONTEXT_SETTINGS)
+
+logger = logging.getLogger("measurement")
+
+
+@app.command()
+def main(
+    meas_config_path: Path = OPTIONS["config_meas"],
+    serial_number: str = OPTIONS["serial_number"],
+    n_chips_input: int = OPTIONS["nchips"],
+):
+    """Print the nominal current value required for the given module."""
+
+    # Taking the module SN from YARR path to config in the connectivity file.
+    layer = get_layer_from_sn(serial_number)
+    chip_type = get_chip_type_from_serial_number(serial_number)
+
+    # Load the  measurement config just to retrieve general info
+    # could be improved, need to see the requirements
+    meas_config = json.loads(meas_config_path.read_text())
+
+    nom_current = get_nominal_current(meas_config, layer, chip_type, n_chips_input)
+
+    typer.echo(f"{nom_current:.2f}")
+
+
+if __name__ == "__main__":
+    typer.run(main)

{module_qc_tools-2.3.0 → module_qc_tools-2.4.1}/src/module_qc_tools/cli/globals.py

@@ -5,6 +5,7 @@ from typing import Optional
 
 import typer
 from click.exceptions import MissingParameter
+from module_qc_data_tools import check_sn_format
 
 from module_qc_tools import data
 from module_qc_tools.utils.misc import get_institution
@@ -198,7 +199,19 @@ OPTIONS["test_size"]: int = typer.Option(
     None,
     "-t",
     "--test-size",
-    help="Test size for eye diagram.",
+    help="Test size for eye diagram or data merging check.",
+)
+OPTIONS["mode"]: str = typer.Option(
+    "4-to-1",
+    "-m",
+    "--mode",
+    help="Mode of data merging check: '4-to-1' or '2-to-1'",
+)
+OPTIONS["quiet"]: bool = typer.Option(
+    False,
+    "-q",
+    "--quiet",
+    help="Quiet mode, no logger in data merging check.",
 )
 OPTIONS["debug_gnd"]: bool = typer.Option(
     False,
@@ -213,3 +226,27 @@ OPTIONS["poweroff"]: bool = typer.Option(
     False,
     help="Whether to turn off power supplies (low-voltage, high-voltage) after measurement is done",
 )
+OPTIONS["nchips"]: int = typer.Option(
+    0,
+    "-n",
+    "--nChips",
+    help="Number of chips powered in parallel (e.g. 4 for a quad module, 3 for a triplet, 1 for an SCC.) If no argument is provided, the number of chips is assumed from the layer.",
+)
+
+
+def sn_callback(value: str):
+    try:
+        check_sn_format(value)
+    except SystemExit as e:
+        msg = f"Invalid serial number format: {value}"
+        raise typer.BadParameter(msg) from e
+    return value
+
+
+OPTIONS["serial_number"]: str = typer.Option(
+    "",
+    "-sn",
+    "--serial-number",
+    help="Module serial number",
+    callback=sn_callback,
+)