FIX: Calling of electron conversion factors in plotting

SiLab-Bonn · Feb 22, 2024 · 7446a41 · 7446a41
1 parent d7a35fe
commit 7446a41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tjmonopix2/analysis/plotting.py b/tjmonopix2/analysis/plotting.py
@@ -140,7 +140,7 @@ def __init__(self, analyzed_data_file, pdf_file=None, level='preliminary', mask_
             pass
 
         try:
-            conversion_factors = au.ConfigDict(root.configuration_in.bench.calibration['electron_conversion'])
+            conversion_factors = au.ConfigDict(root.configuration_in.bench.electron_conversion[:])
             if self.scan_config['start_column'] in range(0, 448) and self.scan_config['stop_column'] in range(0, 448):  # TODO: Get rid of hardcoded values.
                 self.electron_conversion = conversion_factors['DC_coupled']
             elif self.scan_config['start_column'] in range(448, 512) and self.scan_config['stop_column'] in range(448, 512):

diff --git a/tjmonopix2/testbench.yaml b/tjmonopix2/testbench.yaml
@@ -36,10 +36,10 @@ TDC:
 hardware: # Setup-specific hardware settings
   enable_NTC: False # Only enable if you know you have the correct resistors mounted on the BDAQ board!
 
+electron_conversion: # Charge conversion from DAC to e⁻, typically 8.8 for DC and 13.3 for AC (slightly chip dependent!)
+  DC_coupled: 8.8
+  AC_coupled: 13.3
 calibration: # Setup-specific calibration constants
-  electron_conversion: # Charge conversion from DAC to e⁻, typically 8.8 for DC and 13.3 for AC (slightly chip dependent!)
-    DC_coupled: 8.8
-    AC_coupled: 13.3
   bdaq_ntc: # Resistors on BDAQ board for NTC readout
     R16: 412.00e3
     R17: 13.00e3