Add switch for hi/lo calo gain settings

Adjust default calorimeter gain settings, add switch to make it easy to digitize high gain settings (for muon runs)

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

@@ -9,14 +9,14 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 from WaveformConditionsTools.WaveformCableMappingConfig import WaveformCableMappingCfg
 
 # One stop shopping for normal FASER data
-def CaloWaveformDigitizationCfg(flags):
+def CaloWaveformDigitizationCfg(flags, **kwargs):
     """ Return all algorithms and tools for Waveform digitization """
     acc = ComponentAccumulator()
 
     if not flags.Input.isMC:
         return acc
 
-    acc.merge(CaloWaveformDigiCfg(flags, "CaloWaveformDigiAlg"))
+    acc.merge(CaloWaveformDigiCfg(flags, "CaloWaveformDigiAlg", **kwargs))
     acc.merge(CaloWaveformDigitizationOutputCfg(flags))
     acc.merge(WaveformCableMappingCfg(flags))
 
@@ -27,23 +27,24 @@ def CaloWaveformDigiCfg(flags, name="CaloWaveformDigiAlg", **kwargs):
 
     acc = ComponentAccumulator()
 
-    tool = CompFactory.WaveformDigitisationTool(name="CaloWaveformDigtisationTool", **kwargs)
+    tool = CompFactory.WaveformDigitisationTool(name="CaloWaveformDigtisationTool")
+    kwargs.setdefault("WaveformDigitisationTool", tool)
     
     kwargs.setdefault("CaloHitContainerKey", "EcalHits")
     kwargs.setdefault("WaveformContainerKey", "CaloWaveforms")
 
-    digiAlg = CompFactory.CaloWaveformDigiAlg(name, **kwargs)
-    kwargs.setdefault("WaveformDigitisationTool", tool)
-    
-    digiAlg.CB_alpha = -0.9
-    digiAlg.CB_n = 10
-    digiAlg.CB_sigma = 4
-    digiAlg.CB_mean = 820
-    digiAlg.CB_norm = 2
+    kwargs.setdefault("CB_alpha", -0.9)
+    kwargs.setdefault("CB_n", 10)
+    kwargs.setdefault("CB_sigma", 4)
+    kwargs.setdefault("CB_mean", 820) # Time in ns
+    kwargs.setdefault("CB_norm", 4)  # Low gain default, use 20 for high gain
 
-    digiAlg.base_mean = 15000
-    digiAlg.base_rms = 3
+    kwargs.setdefault("base_mean", 15000)
+    kwargs.setdefault("base_rms", 3)
 
+    digiAlg = CompFactory.CaloWaveformDigiAlg(name, **kwargs)
+    print(f"CaloWaveformDigiAlg normalization: {digiAlg.CB_norm}")
+    print(f"CaloWaveformDigiAlg mean time: {digiAlg.CB_mean}")
 
     acc.addEventAlgo(digiAlg)