From 8882b789c51ec09c3ddaa76c332f48cd5c97a80f Mon Sep 17 00:00:00 2001
From: Claire Antel <claire.antel@cern.ch>
Date: Thu, 20 Jan 2022 07:10:58 +0100
Subject: [PATCH] fixing and making Calo Digi Alg CB parameters consistent
---
Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py | 10 ++++++----
Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx | 8 ++++----
Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h | 8 ++++----
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
index 277c7e6f..6a0b9e35 100644
--- a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
+++ b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2020-2021 CERN for the benefit of the FASER collaboration
+
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -28,10 +30,10 @@ def CaloWaveformDigiCfg(flags, name="CaloWaveformDigiAlg", **kwargs):
digiAlg = CompFactory.CaloWaveformDigiAlg(name, **kwargs)
kwargs.setdefault("WaveformDigitisationTool", tool)
- digiAlg.CB_alpha_C = -0.9
- digiAlg.CB_n_C = 4
- digiAlg.CB_mean_C = 10
- digiAlg.CB_sigma_C = 900
+ digiAlg.CB_alpha = -0.9
+ digiAlg.CB_n = 10
+ digiAlg.CB_sigma = 4
+ digiAlg.CB_mean = 820
acc.addEventAlgo(digiAlg)
diff --git a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
index e1f46df1..718dcb4f 100644
--- a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
+++ b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
@@ -32,10 +32,10 @@ CaloWaveformDigiAlg::initialize() {
m_kernel = new TF1("PDF", "ROOT::Math::crystalball_pdf(x, [0],[1],[2],[3])", 0, 1200);
//m_kernel->SetParameters(-0.25,10,4,900);
- m_kernel->SetParameter(0, m_CB_alpha_C);
- m_kernel->SetParameter(1, m_CB_n_C);
- m_kernel->SetParameter(2, m_CB_sigma_C);
- m_kernel->SetParameter(3, m_CB_mean_C);
+ m_kernel->SetParameter(0, m_CB_alpha);
+ m_kernel->SetParameter(1, m_CB_n);
+ m_kernel->SetParameter(2, m_CB_sigma);
+ m_kernel->SetParameter(3, m_CB_mean);
return StatusCode::SUCCESS;
diff --git a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h
index 302d5e2c..9de68257 100644
--- a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h
+++ b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h
@@ -48,10 +48,10 @@ class CaloWaveformDigiAlg : public AthReentrantAlgorithm {
CaloWaveformDigiAlg &operator=(const CaloWaveformDigiAlg&) = delete;
//@}
- Gaudi::Property<double> m_CB_alpha_C {this, "CB_alpha_C", 0, "Alpha of the crystal ball function"};
- Gaudi::Property<double> m_CB_n_C {this, "CB_n_C", 0, "n of the crystal ball function"};
- Gaudi::Property<double> m_CB_mean_C {this, "CB_mean_C", 0, "Mean of the crystal ball function"};
- Gaudi::Property<double> m_CB_sigma_C {this, "CB_sigma_C", 0, "Sigma of the crystal ball function"};
+ Gaudi::Property<double> m_CB_alpha {this, "CB_alpha", 0, "Alpha of the crystal ball function"};
+ Gaudi::Property<double> m_CB_n {this, "CB_n", 0, "n of the crystal ball function"};
+ Gaudi::Property<double> m_CB_mean {this, "CB_mean", 0, "Mean of the crystal ball function"};
+ Gaudi::Property<double> m_CB_sigma {this, "CB_sigma", 0, "Sigma of the crystal ball function"};
--
GitLab