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

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: module_qc_tools
-Version: 2.2.8
+Version: 2.3.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.2/
+Project-URL: Documentation, https://atlas-itk-pixel-mqt.docs.cern.ch/2.3/
 Author-email: Jay Chan <jay.chan@cern.ch>
 Maintainer-email: Giordon Stark <gstark@cern.ch>
 License: Copyright (c) 2018 ATLAS ITk Pixel Modules
@@ -35,6 +35,7 @@ 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: numpy
 Requires-Dist: pre-commit
 Requires-Dist: requests
@@ -44,7 +45,7 @@ Requires-Dist: typer>=0.9.0
 Requires-Dist: urllib3<2,>=1.26.11; 'el7.x86_64' in platform_release
 Description-Content-Type: text/markdown
 
-# module-qc-tools v2.2.8
+# module-qc-tools v2.3.0
 
 A general python tool for running ITkPixV1.1 and ITkPixV2 module QC tests
 

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

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

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

@@ -7,23 +7,31 @@ table tr td:first-of-type {
 
 # Configuration and external commands
 
-All the configuration/settings are defined in a single json file. The layer
-information needed for the different power settings is extracted from the
-module's serial number. Examples are provided in
-`$(module-qc-tools --prefix)/configs/`:
+All the configuration/settings are defined in two json files: one for the
+hardware and one for the measurements. The hardware config is specific to the
+site and needs to be modified, but the default measurement config should not
+modified when running standard module QC. Examples are provided in
+`$(module-qc-tools --prefix)/configs/`, such as:
 
-- `example_merged_vmux.json`
-- `example_merged_vmux_itkpixv2.json`
-- `example_separate_vmux.json`
+- `hw_config_example_merged_vmux_itkpixv2.json`
+- `meas_config.json`
 
 !!! note
 
-    the only difference between the normal config and the `_itkpixv2.json` lies in the paths for the chip-specific `lpm_digitalscan` and `read_ringosc_exe`. For more info see below.
+    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`
+    - `hw_config_example_separate_vmux_v1.json`
+
+    The only difference between the `_v1.json` hw_config and the `_itkpixv2.json` lies in the paths for the chip-specific `lpm_digitalscan` and `read_ringosc_exe`. For more info see below.
 
 ??? abstract "reference json configuration"
 
-    ```json title="$(module-qc-tools --prefix)/configs/example_merged_vmux.json"
-    --8<-- "example_merged_vmux.json"
+    ```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"
+    --8<-- "meas_config.json"
     ```
 
 The major blocks (e.g. `yarr`, `power_supply`, `multimeter`, `ntc`) correspond

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

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

@@ -50,7 +50,7 @@ Measurements/
         └── ...
 ```
 
-The test-type of each measurement is the corresponding test-code used in the
+The test-type of each measurement is the corresponding test-mode used in the
 Production Data Base. The naming of each measurement script is chosen to be the
 same as the test-type. The timestamp is chosen to be the start time of the
 measurement.
@@ -95,7 +95,7 @@ Please use `mqdbt` to upload measurements to localDB.
 
 This script will test the sensor leakage current vs. reverse bias voltage
 (`task = IV_MEASURE`) as specified in the input configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+'$(module-qc-tools --prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -110,13 +110,13 @@ This script will test the sensor leakage current vs. reverse bias voltage
 ??? example
 
     ```
-    measurement-IV-MEASURE -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
+    measurement-IV-MEASURE -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-IV-MEASURE -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs
+    measurement-IV-MEASURE -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs
     ```
 
 ## Eye Diagram
@@ -144,8 +144,8 @@ For more information please refer to the
 - [`measurement-ADC-CALIBRATION`](reference/cli.md#mqt-measurement-adc-calibration)
 
 This script will run the ADC calibration (`task = ADC_CALIBRATION`) as specified
-in the input configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+in the input configuration json file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -158,13 +158,13 @@ in the input configuration json file (i.e.
 ??? example
 
     ```
-    measurement-ADC-CALIBRATION -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-ADC-CALIBRATION -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-ADC-CALIBRATION -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs/
+    measurement-ADC-CALIBRATION -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
 
 ## Analog readback
@@ -176,9 +176,9 @@ in the input configuration json file (i.e.
 This script will measure all internal voltages available through VMUX and IMUX,
 measure the chip temperature, and measure VDDA/VDDD/ROSC vs Trim. channels. The
 scan settings are defined in the `task = ANALOG_READBACK` block of the input
-configuration file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`). The NTC needs
-to be set in order to run this script, so that the temperature can be read.
+configuration file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json'). The NTC needs to be set in order to run
+this script, so that the temperature can be read.
 
 **Configuration settings**
 
@@ -201,13 +201,13 @@ to be set in order to run this script, so that the temperature can be read.
 ??? example
 
     ```
-    measurement-ANALOG-READBACK -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-ANALOG-READBACK -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-ANALOG-READBACK -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs
+    measurement-ANALOG-READBACK -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs
     ```
 
 ## SLDO VI
@@ -217,8 +217,8 @@ to be set in order to run this script, so that the temperature can be read.
 - [`measurement-SLDO`](reference/cli.md#mqt-measurement-sldo)
 
 This script will run the VI scans (`task = SLDO`) as specified in the input
-configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+configuration json file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -234,13 +234,13 @@ configuration json file (i.e.
 ??? example
 
     ```
-    measurement-SLDO -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-SLDO -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-SLDO -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs
+    measurement-SLDO -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs
     ```
 
 ## VCal Calibration
@@ -250,8 +250,8 @@ configuration json file (i.e.
 - [`measurement-VCAL-CALIBRATION`](reference/cli.md#mqt-measurement-vcal-calibration)
 
 This script will run the VCal calibration (`task = VCAL_CALIBRATION`) as
-specified in the input configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+specified in the input configuration json file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -266,13 +266,13 @@ specified in the input configuration json file (i.e.
 ??? example
 
     ```
-    measurement-VCAL-CALIBRATION -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-VCAL-CALIBRATION -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-VCAL-CALIBRATION -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs/
+    measurement-VCAL-CALIBRATION -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
 
 ## Injection Capacitance
@@ -283,7 +283,7 @@ specified in the input configuration json file (i.e.
 
 This script will run the injection capacitance measurement
 (`task = INJECTION_CAPACITANCE`) as specified in the input configuration json
-file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+file (i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -296,13 +296,13 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 ??? example
 
     ```
-    measurement-INJECTION-CAPACITANCE -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-INJECTION-CAPACITANCE -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-INJECTION-CAPACITANCE -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs/
+    measurement-INJECTION-CAPACITANCE -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
 
 ## Low Power Mode
@@ -312,8 +312,8 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 - [`measurement-LP-MODE`](reference/cli.md#mqt-measurement-lp-mode)
 
 This script will run the low power mode test (`task = LP_MODE`) as specified in
-the input configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+the input configuration json file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -327,13 +327,13 @@ the input configuration json file (i.e.
 ??? example
 
     ```
-    measurement-LP-MODE -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
+    measurement-LP-MODE -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-LP-MODE -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs/
+    measurement-LP-MODE -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
 
 ## Overvoltage Protection
@@ -344,7 +344,7 @@ the input configuration json file (i.e.
 
 This script will test the Overvoltage Protection (OVP)
 (`task = OVERVOLTAGE_PROTECTION`) as specified in the input configuration json
-file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+file (i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -358,13 +358,13 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 ??? example
 
     ```
-    measurement-OVERVOLTAGE-PROTECTION -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
+    measurement-OVERVOLTAGE-PROTECTION -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-OVERVOLTAGE-PROTECTION -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs
+    measurement-OVERVOLTAGE-PROTECTION -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs
     ```
 
 ## Undershunt Protection
@@ -375,7 +375,7 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 
 This script will test the Undershunt Protection (USP)
 (`task = UNDERSHUNT_PROTECTION`) as specified in the input configuration json
-file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+file (i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -389,13 +389,13 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 ??? example
 
     ```
-    measurement-UNDERSHUNT-PROTECTION -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
+    measurement-UNDERSHUNT-PROTECTION -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_LP.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-UNDERSHUNT-PROTECTION -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs
+    measurement-UNDERSHUNT-PROTECTION -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs
     ```
 
 ## Data Transmission
@@ -405,8 +405,8 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 - [`measurement-DATA-TRANSMISSION`](reference/cli.md#mqt-measurement-data-transmission)
 
 This script will run the data transmission (`task = DATA_TRANSMISSION`) as
-specified in the input configuration json file (i.e.
-`$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+specified in the input configuration json file (i.e. '$(module-qc-tools
+--prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -417,13 +417,13 @@ specified in the input configuration json file (i.e.
 ??? example
 
     ```
-    measurement-DATA-TRANSMISSION -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-DATA-TRANSMISSION -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
     ```
 
 ??? example "emulator"
 
     ```
-    measurement-DATA-TRANSMISSION -c $(module-qc-tools --prefix)/configs/emulator_merged_vmux.json -o emulator/outputs/
+    measurement-DATA-TRANSMISSION -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```
 
 ## Long-term stability DCS
@@ -434,7 +434,7 @@ specified in the input configuration json file (i.e.
 
 This adds the ability to run the long-term stability dcs measurement
 (`task = LONG_TERM_STABILITY_DCS`) as specified in the input configuration json
-file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
+file (i.e. '$(module-qc-tools --prefix)/configs/meas_config.json').
 
 **Configuration settings**
 
@@ -446,5 +446,11 @@ file (i.e. `$(module-qc-tools --prefix)/configs/example_merged_vmux.json`).
 ??? example
 
     ```
-    measurement-LONG-TERM-STABILITY-DCS -c $(module-qc-tools --prefix)/configs/example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    measurement-LONG-TERM-STABILITY-DCS -c $(module-qc-tools --prefix)/configs/hw_config_example_merged_vmux.json -m ~/module_data/20UPGR91301046/20UPGR91301046_L2_warm.json
+    ```
+
+??? example "emulator"
+
+    ```
+    measurement-LONG-TERM-STABILITY-DCS -c $(module-qc-tools --prefix)/configs/hw_config_emulator_merged_vmux.json -o emulator/outputs/
     ```

{module_qc_tools-2.2.8 → module_qc_tools-2.3.0}/mkdocs.yml

@@ -162,7 +162,11 @@ markdown_extensions:
       base_path:
         - docs/.snippets
         - README.md
-        - src/module_qc_tools/data/configs/example_merged_vmux.json
+        - src/module_qc_tools/data/configs/meas_config.json
+        - src/module_qc_tools/data/configs/hw_config_example_merged_vmux_itkpixv2.json
+        - src/module_qc_tools/data/configs/hw_config_example_separate_vmux_itkpixv2.json
+        - src/module_qc_tools/data/configs/hw_config_example_merged_vmux_v1.json
+        - src/module_qc_tools/data/configs/hw_config_example_separate_vmux_v1.json
       auto_append:
         - links.txt
         - abbrs.txt

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

@@ -21,6 +21,7 @@ dependencies = [
     "pre-commit",
     "check-jsonschema",
     "module-qc-data-tools >= 1.0.22",
+    "module-qc-database-tools >= 2.4.8",
     'importlib_resources; python_version < "3.9"',
     "requests",
     'urllib3>=1.26.11,<2; "el7.x86_64" in platform_release',
@@ -37,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.2/"
+"Documentation" = "https://atlas-itk-pixel-mqt.docs.cern.ch/2.3/"
 
 [project.scripts]
 module-qc-tools = "module_qc_tools.cli:app"

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

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.8'
-__version_tuple__ = version_tuple = (2, 2, 8)
+__version__ = version = '2.3.0'
+__version_tuple__ = version_tuple = (2, 3, 0)

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

@@ -11,6 +11,9 @@ from module_qc_data_tools import (
     outputDataFrame,
     save_dict_list,
 )
+from module_qc_database_tools.utils import (
+    get_chip_type_from_serial_number,
+)
 
 from module_qc_tools.cli.globals import (
     CONTEXT_SETTINGS,
@@ -22,7 +25,8 @@ from module_qc_tools.measurements.adc_calibration import run
 from module_qc_tools.utils.misc import (
     add_identifiers_metadata,
     copytree,
-    load_config,
+    load_hw_config,
+    load_meas_config,
 )
 from module_qc_tools.utils.power_supply import power_supply
 from module_qc_tools.utils.yarr import yarr
@@ -37,7 +41,8 @@ logger = logging.getLogger("measurement")
 
 @app.command()
 def main(
-    config_path: Path = OPTIONS["config"],
+    hw_config_path: Path = OPTIONS["config_hw"],
+    meas_config_path: Path = OPTIONS["config_meas"],
     base_output_dir: Path = OPTIONS["output_dir"],
     module_connectivity: Optional[Path] = OPTIONS["module_connectivity"],
     _verbosity: LogLevel = OPTIONS["verbosity"],
@@ -72,14 +77,21 @@ def main(
 
     logger.addHandler(logging.FileHandler(output_dir.joinpath("output.log")))
 
-    config = load_config(config_path, test_type=TEST_TYPE)
+    config_hw = load_hw_config(hw_config_path)
 
     if module_connectivity:
-        config["yarr"]["connectivity"] = 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["yarr"]["connectivity"])
+    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)
+
+    # 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
+    )
+    config.update(config_hw)
 
     # initialize hardware
     ps = power_supply(config["power_supply"])

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

@@ -11,6 +11,9 @@ from module_qc_data_tools import (
     outputDataFrame,
     save_dict_list,
 )
+from module_qc_database_tools.utils import (
+    get_chip_type_from_serial_number,
+)
 
 from module_qc_tools.cli.globals import (
     CONTEXT_SETTINGS,
@@ -26,7 +29,8 @@ from module_qc_tools.measurements.analog_readback import (
 from module_qc_tools.utils.misc import (
     add_identifiers_metadata,
     copytree,
-    load_config,
+    load_hw_config,
+    load_meas_config,
 )
 from module_qc_tools.utils.power_supply import power_supply
 from module_qc_tools.utils.yarr import yarr
@@ -41,7 +45,8 @@ TEST_TYPE = Path(__file__).stem
 
 @app.command()
 def main(
-    config_path: Path = OPTIONS["config"],
+    hw_config_path: Path = OPTIONS["config_hw"],
+    meas_config_path: Path = OPTIONS["config_meas"],
     base_output_dir: Path = OPTIONS["output_dir"],
     module_connectivity: Optional[Path] = OPTIONS["module_connectivity"],
     _verbosity: LogLevel = OPTIONS["verbosity"],
@@ -73,14 +78,21 @@ def main(
 
     logger.addHandler(logging.FileHandler(output_dir.joinpath("output.log")))
 
-    config = load_config(config_path, test_type=TEST_TYPE)
+    config_hw = load_hw_config(hw_config_path)
 
     if module_connectivity:
-        config["yarr"]["connectivity"] = 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["yarr"]["connectivity"])
+    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)
+
+    # 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
+    )
+    config.update(config_hw)
 
     # initialize hardware
     ps = power_supply(config["power_supply"])

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

@@ -12,6 +12,9 @@ from module_qc_data_tools import (
     outputDataFrame,
     save_dict_list,
 )
+from module_qc_database_tools.utils import (
+    get_chip_type_from_serial_number,
+)
 
 from module_qc_tools.cli.globals import (
     CONTEXT_SETTINGS,
@@ -23,7 +26,8 @@ from module_qc_tools.measurements.data_transmission import run
 from module_qc_tools.utils.misc import (
     add_identifiers_metadata,
     copytree,
-    load_config,
+    load_hw_config,
+    load_meas_config,
 )
 from module_qc_tools.utils.power_supply import power_supply
 from module_qc_tools.utils.yarr import yarr
@@ -38,7 +42,8 @@ TEST_TYPE = Path(__file__).stem
 
 @app.command()
 def main(
-    config_path: Path = OPTIONS["config"],
+    hw_config_path: Path = OPTIONS["config_hw"],
+    meas_config_path: Path = OPTIONS["config_meas"],
     base_output_dir: Path = OPTIONS["output_dir"],
     module_connectivity: Optional[Path] = OPTIONS["module_connectivity"],
     _verbosity: LogLevel = OPTIONS["verbosity"],
@@ -71,16 +76,22 @@ def main(
 
     logger.addHandler(logging.FileHandler(output_dir.joinpath("output.log")))
 
-    config = load_config(config_path, test_type=TEST_TYPE)
+    config_hw = load_hw_config(hw_config_path)
 
-    # Need to pass module connectivity path to yarr class (except in case we are running the emulator)
     if module_connectivity:
-        config["yarr"]["connectivity"] = 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["yarr"]["connectivity"])
-    layer = get_layer_from_sn(module_serial)
+    module_serial = get_sn_from_connectivity(config_hw["yarr"]["connectivity"])
     n_lanes_per_chip = get_nlanes_from_sn(module_serial)
+    layer = get_layer_from_sn(module_serial)
+    chip_type = get_chip_type_from_serial_number(module_serial)
+
+    # 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
+    )
+    config.update(config_hw)
 
     # initialize hardware
     ps = power_supply(config["power_supply"])

{module_qc_tools-2.2.8 → module_qc_tools-2.3.0}/src/module_qc_tools/cli/INJECTION_CAPACITANCE.py

@@ -11,6 +11,9 @@ from module_qc_data_tools import (
     outputDataFrame,
     save_dict_list,
 )
+from module_qc_database_tools.utils import (
+    get_chip_type_from_serial_number,
+)
 
 from module_qc_tools.cli.globals import (
     CONTEXT_SETTINGS,
@@ -24,7 +27,8 @@ from module_qc_tools.measurements.injection_capacitance import (
 from module_qc_tools.utils.misc import (
     add_identifiers_metadata,
     copytree,
-    load_config,
+    load_hw_config,
+    load_meas_config,
 )
 from module_qc_tools.utils.power_supply import power_supply
 from module_qc_tools.utils.yarr import yarr
@@ -39,7 +43,8 @@ TEST_TYPE = Path(__file__).stem
 
 @app.command()
 def main(
-    config_path: Path = OPTIONS["config"],
+    hw_config_path: Path = OPTIONS["config_hw"],
+    meas_config_path: Path = OPTIONS["config_meas"],
     base_output_dir: Path = OPTIONS["output_dir"],
     module_connectivity: Optional[Path] = OPTIONS["module_connectivity"],
     _verbosity: LogLevel = OPTIONS["verbosity"],
@@ -69,14 +74,21 @@ def main(
 
     logger.addHandler(logging.FileHandler(output_dir.joinpath("output.log")))
 
-    config = load_config(config_path, test_type=TEST_TYPE)
+    config_hw = load_hw_config(hw_config_path)
 
     if module_connectivity:
-        config["yarr"]["connectivity"] = 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["yarr"]["connectivity"])
+    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)
+
+    # 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
+    )
+    config.update(config_hw)
 
     # initialize hardware
     ps = power_supply(config["power_supply"])