module-qc-tools 2.7.1__tar.gz → 2.8.0__tar.gz

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/.pre-commit-config.yaml

@@ -1,6 +1,7 @@
 ci:
   autoupdate_commit_msg: "chore: update pre-commit hooks"
   autofix_commit_msg: "style: pre-commit fixes"
+  autoupdate_schedule: "monthly"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -43,7 +44,7 @@ repos:
         additional_dependencies: [black==22.3.0]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.1
+    rev: v0.14.13
     hooks:
       - id: ruff-check
         args: ["--fix", "--show-fixes"]
@@ -57,7 +58,7 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: "v3.6.2"
+    rev: "v3.8.0"
     hooks:
       - id: prettier
         types_or: [yaml, markdown, html, css, scss, javascript] #, json]
@@ -96,7 +97,7 @@ repos:
   #      additional_dependencies: ["repo-review[cli]"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
         args: ["--py38-plus"]

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/.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.7.1",
-    "version": "v2.7.1",
+    "title": "atlas-itk-pixel-modules/mqt: v2.8.0",
+    "version": "v2.8.0",
     "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.7.1",
+            "identifier": "https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tree/v2.8.0",
             "relation": "isSupplementTo"
         }
     ]

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/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.7.1'
+title: 'atlas-itk-pixel-modules/mqt: v2.8.0'
 type: software
-version: v2.7.1
+version: v2.8.0

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.7.1
+Version: 2.8.0
 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.7/
+Project-URL: Documentation, https://atlas-itk-pixel-mqt.docs.cern.ch/2.8/
 Author-email: Jay Chan <jay.chan@cern.ch>
 Maintainer-email: Giordon Stark <gstark@cern.ch>
 License: Copyright (c) 2018 ATLAS ITk Pixel Modules
@@ -33,8 +33,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Requires-Dist: check-jsonschema
-Requires-Dist: module-qc-data-tools>=1.4.0
-Requires-Dist: module-qc-database-tools>=2.9.0
+Requires-Dist: module-qc-data-tools>=1.5.0
+Requires-Dist: module-qc-database-tools>=2.10.0
 Requires-Dist: numpy
 Requires-Dist: packaging
 Requires-Dist: pre-commit
@@ -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.7.1
+# module-qc-tools v2.8.0
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/README.md

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

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/docs/config.md

@@ -74,19 +74,20 @@ low voltage power supply
 
 **Configuration settings**
 
-| Name                  | Description                                                                                                                                                                                                                                 |
-| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `run_dir`             | path (relative or absolute) to the directory where `power_supply` commands should be run                                                                                                                                                    |
-| `on_cmd`              | command to turn on the power supply with specified voltage and current. Use the syntax `{v}` and `{i}` to represent the voltage and current that are to be given as input arguments                                                         |
-| `off_cmd`             | command to turn off the power supply                                                                                                                                                                                                        |
-| `set_cmd`             | command to set voltage and current for power supply. Use the syntax `{v}` and `{i}` to represent the voltage and current that are to be given as input arguments                                                                            |
-| `getI_cmd`            | command to inquire the set current of the power supply. This command shall return a std output which represents the value of the current (float in the unit of [A]). For example, when I = 5.2A, `getI_cmd` returns std output = `5.2`.     |
-| `getV_cmd`            | command to inquire the set voltage of the power supply. This command shall return a std output which represents the value of the voltage (float in the unit of [V]). For example, when V = 1.8V, `getV_cmd` returns std output = `1.8`.     |
-| `measI_cmd`           | command to measure the output current of the power supply. This command shall return a std output which represents the value of the current (float in the unit of [A]). For example, when I = 5.2A, `measI_cmd` returns std output = `5.2`. |
-| `measV_cmd`           | command to measure the output voltage of the power supply. This command shall return a std output which represents the value of the voltage (float in the unit of [V]). For example, when V = 1.8V, `measV_cmd` returns std output = `1.8`. |
-| `n_try`               | number of re-tries in case the script fails to read from the 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.                                                                                                                                                                                       |
+| Name                  | Description                                                                                                                                                                                                                                                      |
+| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `run_dir`             | path (relative or absolute) to the directory where `power_supply` commands should be run                                                                                                                                                                         |
+| `on_cmd`              | command to turn on the power supply with specified voltage and current. Use the syntax `{v}` and `{i}` to represent the voltage and current that are to be given as input arguments                                                                              |
+| `off_cmd`             | command to turn off the power supply                                                                                                                                                                                                                             |
+| `set_cmd`             | command to set voltage and current for power supply. Use the syntax `{v}` and `{i}` to represent the voltage and current that are to be given as input arguments                                                                                                 |
+| `getI_cmd`            | command to inquire the set current of the power supply. This command shall return a std output which represents the value of the current (float in the unit of [A]). For example, when I = 5.2A, `getI_cmd` returns std output = `5.2`.                          |
+| `getV_cmd`            | command to inquire the set voltage of the power supply. This command shall return a std output which represents the value of the voltage (float in the unit of [V]). For example, when V = 1.8V, `getV_cmd` returns std output = `1.8`.                          |
+| `getState_cmd`        | command to inquire the state of the output channel. This command shall return a std output which represents the state of the channel. When the output is turned on, `getState_cmd` shall return `ON`. When the output is off, `getState_cmd` shall return `OFF`. |
+| `measI_cmd`           | command to measure the output current of the power supply. This command shall return a std output which represents the value of the current (float in the unit of [A]). For example, when I = 5.2A, `measI_cmd` returns std output = `5.2`.                      |
+| `measV_cmd`           | command to measure the output voltage of the power supply. This command shall return a std output which represents the value of the voltage (float in the unit of [V]). For example, when V = 1.8V, `measV_cmd` returns std output = `1.8`.                      |
+| `n_try`               | number of re-tries in case the script fails to read from the 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
 
@@ -179,6 +180,36 @@ the following:
     sys.exit(1)
     ```
 
+### LLS interlock
+
+The `lls_interlock` block specifies the path and the commands for reading
+information from the interlock system in a LLS setup. Always one module in a
+serial powering chain is connected directly to the interlock system to read the
+module NTC.
+
+**Configuration settings**
+
+| Name                            | Description                                                                                                                                                                                                                                                                                                                                                                     |
+| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `run_dir`                       | path (relative or absolute) to the directory where `lls_interlock` commands should be run                                                                                                                                                                                                                                                                                       |
+| `get_interlock_temperature_cmd` | command to read a temperature that is used as an input into the interlock system. This can be e.g. a module NTC from the interlock module of a serial powering chain. The command returns a std output which represents the value of measured temperature (float in the unit of [C]). For example: when T = 36.2C, `get_interlock_temperature_cmd` returns std output = `36.2`. |
+| `n_try`                         | number of re-tries in case the script fails to read from the interlock system                                                                                                                                                                                                                                                                                                   |
+| `success_code`                  | exit status that indicates success. The default is 0.                                                                                                                                                                                                                                                                                                                           |
+
+### MOPS
+
+The `mops_monitoring` block specifies the path and the commands for reading
+monitoring information from a MOPS chip
+
+**Configuration settings**
+
+| Name                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| ----------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `run_dir`                           | path (relative or absolute) to the directory where `mops_monitoring` commands should be run                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| `get_converted_adc_measurement_cmd` | command to measure temperature or voltage from the MOPS. Since several MOPS chips can be available in the setup, `{mops-id}` can be passed to the command, identifying the MOPS chip. The `{ch-id}` parameter is used to specify the ADC channel that is read. The command returns a std output which represents the ADC value for the specified channel converted into the measured temperature (float in the unit of [C]) or voltage (float in the unit of [V]). For example: when T = 36.2C, `get_converted_adc_measurement_cmd` returns std output = `36.2`. Note: When using an emulator, one can provide a `-C` flag for the temperature measurement or a `-V` flag for the voltage measurement (passed as the `{unit}` parameter). |
+| `n_try`                             | number of re-tries in case the script fails to read from the MOPS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| `success_code`                      | exit status that indicates success. The default is 0.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+
 ## Measurement Configuration
 
 ### tasks

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/docs/history.md

@@ -16,6 +16,36 @@ and this project adheres to
 
 **_Fixed:_**
 
+## [2.8.0](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.8.0) - 2006-03-06 ## {: #mqt-v2.8.0 }
+
+**_Added:_**
+
+- add checks into `IV_MEASURE` (!282)
+  - warning if measured points less than expected
+  - progress lock to protect from mixing progress output and measured values
+  - read current when HV not reached to trigger Keithley autorange - closes #177
+- Power supply emulator update (!283)
+- Add MOPS hardware class (!280)
+- Add LLS interlock hardware class (!281)
+- Allow sending channel identifier to power supply for fine-grained channel
+  selection (!275)
+- OB Cell Thermal performance measurement (!227)
+
+  !!! important
+
+        Requires module-qc-data-tools >= v1.5.0rc0,
+
+**_Fixed:_**
+
+- Upgrade versions of pre-commit hooks (!279)
+- fix CI (PC903 and PP304) (!273)
+
+## [2.7.1](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.7.1) - 2025-10-30 ## {: #mqt-v2.7.1 }
+
+**_Changed:_**
+
+- reverted file lock related changes in !265 and !270 (!271)
+
 ## [2.7.0](https://gitlab.cern.ch/atlas-itk/pixel/module/module-qc-tools/-/tags/v2.7.0) - 2025-10-29 ## {: #mqt-v2.7.0 }
 
 **_Changed:_**
@@ -36,6 +66,8 @@ and this project adheres to
     `mqt measurement sldo -c <hw config> -o <output dir> --npoints <int>`
   - a pipeline test `test_measurement_one_point_SLDO` was also added in
     `test_emulator.py` to check the implementation
+  - add fcntl capability to lock before calling yarr commands simultaneously
+    (!265)
 
 **_Fixed:_**
 

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/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.7.1
+$ python -m pip install -U pip module-qc-tools==2.8.0
 ```
 
 ### via uv
@@ -103,7 +103,7 @@ $ python -m pip install -U pip module-qc-tools==2.7.1
 $ python -m venv venv
 $ source venv/bin/activate
 $ python -m pip install uv
-$ uv pip install module-qc-tools==2.7.1
+$ uv pip install module-qc-tools==2.8.0
 ```
 
 # Usage

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/docs/measurements.md

@@ -487,3 +487,36 @@ file (i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
     ```
     measurement-LONG-TERM-STABILITY-DCS -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
+
+## Thermal Performance
+
+- [`mqt measurement thermal-performance`](reference/cli.md#mqt-measurement-thermal-performance)
+- [`module-qc-tools measurement thermal-performance`](reference/cli.md#mqt-measurement-thermal-performance)
+- [`measurement-THERMAL-PERFORMANCE`](reference/cli.md#mqt-measurement-thermal-performance)
+
+This adds the ability to run the thermal performance measurement
+(`task = THERMAL_PERFORMANCE`) as specified in the input configuration json file
+(i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
+
+**Configuration settings**
+
+| Name        | Description                                              |
+| ----------- | -------------------------------------------------------- |
+| `v_mux_ntc` | list of Vmux channels to be measured for ntc temperature |
+| `i_mux_ntc` | list of Imux channels to be measured for ntc temperature |
+| `v_mux_gnd` | list of Vmux channels to be measured for GND temperature |
+| `i_mux_gnd` | list of Imux channels to be measured for GND temperature |
+| `v_mux`     | list of Vmux channels to be measured                     |
+| `i_mux`     | list of Imux channels to be measured                     |
+
+??? example
+
+    ```
+    measurement-THERMAL-PERFORMANCE -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux_itkpixv2.json -m 20UPGM23xxxxxx_L2_warm.json
+    ```
+
+??? example "emulator"
+
+    ```
+    measurement-THERMAL-PERFORMANCE -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
+    ```

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/pyproject.toml

@@ -20,8 +20,8 @@ dependencies = [
     "tabulate",
     "pre-commit",
     "check-jsonschema",
-    "module-qc-data-tools >= 1.4.0",
-    "module-qc-database-tools >= 2.9.0",
+    "module-qc-data-tools >= 1.5.0",
+    "module-qc-database-tools >= 2.10.0",
     "requests",
     'urllib3>=1.26.20,<2; "el7.x86_64" in platform_release',
     "typer>=0.18.0",
@@ -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.7/"
+"Documentation" = "https://atlas-itk-pixel-mqt.docs.cern.ch/2.8/"
 
 [project.scripts]
 module-qc-tools = "module_qc_tools.cli:app"
@@ -55,6 +55,11 @@ measurement-IV-MEASURE = "module_qc_tools.cli.IV_MEASURE:app"
 module-qc-tools-upload = "module_qc_tools.cli.upload_localdb:app"
 measurement-UNDERSHUNT-PROTECTION = "module_qc_tools.cli.UNDERSHUNT_PROTECTION:app"
 measurement-LONG-TERM-STABILITY-DCS = "module_qc_tools.cli.LONG_TERM_STABILITY_DCS:app"
+measurement-THERMAL-PERFORMANCE = "module_qc_tools.cli.THERMAL_PERFORMANCE:app"
+
+[dependency-groups]
+dev = [ { include-group = "test" } ]
+test = [ "pytest" ]
 
 [tool.hatch.version]
 source = "vcs"
@@ -207,6 +212,7 @@ messages_control.disable = [
   "design",
   "fixme",
   "line-too-long",
+  "too-many-lines",
   "wrong-import-position",
   # below are additional warnings to fix later
   "duplicate-code",
@@ -221,6 +227,7 @@ messages_control.disable = [
 ]
 
 [tool.pytest.ini_options]
+log_level = "INFO"
 minversion = "6.0"
 addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
 xfail_strict = true

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/src/module_qc_tools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.7.1'
-__version_tuple__ = version_tuple = (2, 7, 1)
+__version__ = version = '2.8.0'
+__version_tuple__ = version_tuple = (2, 8, 0)
 
 __commit_id__ = commit_id = None

module_qc_tools-2.8.0/src/module_qc_tools/cli/THERMAL_PERFORMANCE.py

@@ -0,0 +1,226 @@
+import logging
+from datetime import datetime
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+import typer
+from module_qc_data_tools.qcDataFrame import (
+    outputDataFrame,
+)
+from module_qc_data_tools.utils import (
+    get_chip_type_from_serial_number,
+    get_layer_from_sn,
+    get_sn_from_connectivity,
+    load_hw_config,
+    save_dict_list,
+)
+from module_qc_database_tools.utils import (
+    get_BOMCode_from_file,
+    get_cutFile_suffix,
+)
+
+from module_qc_tools.cli.globals import (
+    CONTEXT_SETTINGS,
+    LogLevel,
+    OPTION_config_hw,
+    OPTION_config_meas,
+    OPTION_module_connectivity,
+    OPTION_nchips,
+    OPTION_output_dir,
+    OPTION_save_local,
+    OPTION_site,
+    OPTION_use_calib_ADC,
+    OPTION_use_pixel_config,
+    OPTION_verbosity,
+    check_module_connectivity,
+)
+from module_qc_tools.measurements.thermal_performance import (
+    run_emeas,
+    run_tpmeas,
+)
+from module_qc_tools.utils import datapath as mqt_data
+from module_qc_tools.utils.misc import (
+    add_identifiers_metadata,
+    copytree,
+    load_meas_config,
+)
+from module_qc_tools.utils.power_supply import power_supply
+from module_qc_tools.utils.yarr import yarr
+
+logger = logging.getLogger("measurement")
+
+app = typer.Typer(context_settings=CONTEXT_SETTINGS)
+
+# Taking the test-type from the script name which is the test-code in ProdDB.
+TEST_TYPE = Path(__file__).stem
+
+
+@app.command()
+def main(
+    hw_config_path: OPTION_config_hw = ...,
+    meas_config_path: OPTION_config_meas = mqt_data / "configs" / "meas_config.json",
+    base_output_dir: OPTION_output_dir = Path("outputs"),
+    module_connectivity: OPTION_module_connectivity = None,
+    _verbosity: OPTION_verbosity = LogLevel.info,
+    use_pixel_config: OPTION_use_pixel_config = False,
+    institution: OPTION_site = "",
+    use_calib_adc: OPTION_use_calib_ADC = True,
+    save_local: OPTION_save_local = True,
+    nchips: OPTION_nchips = None,
+):
+    """
+    Records temperatures from NTC thermistors on the module PCB and from the cooling system.
+    """
+
+    check_module_connectivity(
+        hw_config_path=hw_config_path, module_connectivity=module_connectivity
+    )
+
+    timestart = datetime.now().strftime("%Y-%m-%d_%H%M%S")
+
+    # if -o option used, overwrite the default output directory
+    output_dir = module_connectivity.parent if module_connectivity else base_output_dir
+
+    if base_output_dir != Path("outputs"):
+        output_dir = base_output_dir
+
+    output_dir = output_dir.joinpath("Measurements", TEST_TYPE, timestart)
+    # Make output directory and start log file
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    logger.info(f"Start {TEST_TYPE.replace('_', ' ')}!")
+    logger.info(f"TimeStart: {timestart}")
+
+    logger.addHandler(logging.FileHandler(output_dir.joinpath("output.log")))
+
+    config_hw = load_hw_config(hw_config_path)
+
+    if module_connectivity:
+        config_hw["yarr"]["connectivity"] = module_connectivity
+
+    # Taking the module SN from YARR path to config in the connectivity file.
+    module_serial = get_sn_from_connectivity(config_hw["yarr"]["connectivity"])
+    layer = get_layer_from_sn(module_serial)
+    chip_type = get_chip_type_from_serial_number(module_serial)
+
+    # 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)
+    bom_suffix = get_cutFile_suffix(bom)
+
+    # Load the  measurement config and combine it with the hardware config
+    config = load_meas_config(
+        meas_config_path,
+        test_type=TEST_TYPE,
+        chip_type=chip_type,
+        bom_type=bom_suffix,
+        layer=layer,
+        nchips=nchips,
+    )
+    config.update(config_hw)
+
+    # initialize hardware
+    ps = power_supply(config["power_supply"])
+    yr = yarr(config["yarr"])
+
+    if not use_pixel_config:
+        yr.omit_pixel_config()
+
+    ps.set(v=config["v_max"], i=config["i_config"])
+    yr.configure()
+
+    # Measure temperature at the end of the measurement to ensure temperature stability
+    try:
+        data = run_emeas(config, ps)
+    except KeyboardInterrupt:
+        logger.info("KeyboardInterrupt")
+        yr.remove_tmp_connectivity()
+    except Exception as err:
+        logger.info("Error in measuring environmental conditions.")
+        logger.exception(err)
+        yr.remove_tmp_connectivity()
+        raise typer.Exit(1) from err
+
+    try:
+        data_tempmeas = run_tpmeas(config, ps, yr, use_calib_adc)
+    except KeyboardInterrupt:
+        logger.info("KeyboardInterrupt")
+        yr.remove_tmp_connectivity()
+    except Exception as err:
+        logger.info("Error in measuring temperature.")
+        logger.exception(err)
+        yr.remove_tmp_connectivity()
+        raise typer.Exit(1) from err
+
+    add_identifiers_metadata(data, module_serial, institution)
+    add_identifiers_metadata(data_tempmeas, module_serial, institution)
+
+    # save results in json
+    logger.info(
+        "==================================Summary=================================="
+    )
+    alloutput = {}
+    alloutput_chip = []
+    chipnames = []
+
+    # Save to an output json file
+    outputDF_tempmeas = outputDataFrame()
+    outputDF_tempmeas.set_serial_num(module_serial)
+    outputDF_tempmeas.set_test_type(TEST_TYPE)
+    outputDF_tempmeas.set_subtest_type("TP_TEMP")
+    outputDF_tempmeas.set_results(data)
+    alloutput = outputDF_tempmeas.to_dict()
+
+    for chip in yr._enabled_chip_positions:
+        logger.info(f"Chip-{chip + 1}")
+        logger.info(data_tempmeas[chip], extra={"markup": False})
+        chip_name = data_tempmeas[chip]._meta_data["Name"]
+
+        # Save to an output json file
+        outputDF_tempmeas_chip = outputDataFrame()
+        outputDF_tempmeas_chip.set_test_type(TEST_TYPE)
+        outputDF_tempmeas_chip.set_subtest_type("TP_TEMP")
+        outputDF_tempmeas_chip.set_results(data_tempmeas[chip])
+
+        alloutput_chip += [outputDF_tempmeas_chip.to_dict()]
+        chipnames += [chip_name]
+
+    with TemporaryDirectory() as tmpdirname:
+        alloutput["results"]["property"]["FE"] = []
+        alloutput["results"]["property"]["FE"].extend(alloutput_chip)
+        alloutput_list = [alloutput]
+        save_dict_list(
+            Path(tmpdirname).joinpath(f"{module_serial}.json"),
+            alloutput_list,
+        )
+
+        # for now, set to false until localDB upload functionality implemented
+        upload_failed = True
+        upload_implemented = False
+
+        if not save_local:
+            # add in logic here to upload to localDB
+            msg = "Not implemented yet"
+            raise RuntimeError(msg)
+
+        if upload_failed or save_local:
+            copytree(tmpdirname, output_dir)
+            if upload_failed and upload_implemented:
+                logger.warning(
+                    "The upload to localDB failed. Please fix and retry uploading the measurement output again."
+                )
+
+            logger.info(f"Writing output measurements in {output_dir}")
+
+    logger.info("Done!")
+    logger.info(f"TimeEnd: {datetime.now().strftime('%Y-%m-%d_%H%M%S')}")
+
+    # Delete temporary files
+    if not use_pixel_config:
+        yr.remove_tmp_connectivity()
+
+
+if __name__ == "__main__":
+    typer.run(main)

{module_qc_tools-2.7.1 → module_qc_tools-2.8.0}/src/module_qc_tools/cli/globals.py

@@ -40,6 +40,7 @@ OPTION_config_meas = Annotated[
     Optional[Path],
     typer.Option(
         "-cm",
+        "--cm",
         "--config-meas",
         help="Measurement config file path",
         exists=True,
@@ -242,7 +243,7 @@ OPTION_test_size = Annotated[
 OPTION_mode = Annotated[
     str,
     typer.Option(
-        "-m",
+        "-m",  ## short option required to match the YARR executable, see `def dataMergingCheck` in `yarr.py`
         "--mode",
         help="Mode of data merging check: '4-to-1' or '2-to-1'",
     ),
@@ -301,9 +302,9 @@ def sn_callback(value: str):
 OPTION_serial_number = Annotated[
     str,
     typer.Option(
-        "-sn",
+        "--sn",
         "--serial-number",
-        help="Module serial number",
+        help="Serial number of the component to be measured, must be in the format of '20UGXXYYNNNNNNN'.",
         callback=sn_callback,
     ),
 ]