Merge branch '22.0-cppcheck-LUCID_Digitization' into 'master'

sroe/athena:22.0-cppcheck-LUCID_Digitization

See merge request atlas/athena!48373

ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_DigitizationToolBox.cxx

@@ -171,7 +171,7 @@ StatusCode LUCID_DigitizationToolBox::fillDigitContainer(TimedHitCollection<LUCI
     TimedHitCollection<LUCID_SimHit>                 thpc = thpclucid;
     TimedHitCollection<LUCID_SimHit>::const_iterator i, e, hitIt;
     
-    while (thpc.nextDetectorElement(i, e)) for (hitIt = i; hitIt != e; hitIt++) {
+    while (thpc.nextDetectorElement(i, e)) for (hitIt = i; hitIt != e; ++hitIt) {
       
       if (m_tubeID != (*hitIt)->GetTubeID()) continue;
 
@@ -204,7 +204,7 @@ StatusCode LUCID_DigitizationToolBox::fillDigitContainer(LUCID_SimHitCollection*
     LUCID_SimHitCollection::const_iterator hitIt  = thpclucid->begin();
     LUCID_SimHitCollection::const_iterator hitItE = thpclucid->end();
 
-    for (; hitIt != hitItE; hitIt++) {
+    for (; hitIt != hitItE; ++hitIt) {
       
       if (m_tubeID != (*hitIt).GetTubeID()) continue;
       

ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_DigitizationToolBox.h

@@ -57,41 +57,41 @@ class LUCID_DigitizationToolBox {
   double DynodeChainSimulation(double npe, CLHEP::HepRandomEngine* rndEngine) const;
   static double DynodeGainSmearing   (double npe, CLHEP::HepRandomEngine* rndEngine);
   
-  LUCID_DigitContainer* m_digitContainer;
+  LUCID_DigitContainer* m_digitContainer{};
 
-  int    m_numTubes;  
-  double m_qdcChannelsPerPE;
-  double m_qdcPedestal;
-  double m_qdcFedNoiseFactor;
-  double m_tdcPmtNoiseFactor;
-  double m_tdcFedNoiseFactor;
+  int    m_numTubes{};  
+  double m_qdcChannelsPerPE{};
+  double m_qdcPedestal{};
+  double m_qdcFedNoiseFactor{};
+  double m_tdcPmtNoiseFactor{};
+  double m_tdcFedNoiseFactor{};
 
-  double m_TotalPMTgain;
-  double m_AmpFactor;
-  double m_Q1bin;
-  int    m_NoiseCharge;
-  int    m_numDyinodes;
-  double m_dynodeGammaFactor;
+  double m_TotalPMTgain{};
+  double m_AmpFactor{};
+  double m_Q1bin{};
+  int    m_NoiseCharge{};
+  int    m_numDyinodes{};
+  double m_dynodeGammaFactor{};
 
-  double m_gainPerDynode;
-  double m_ChargeToQdcFactor;
+  double m_gainPerDynode{};
+  double m_ChargeToQdcFactor{};
   
-  std::vector<double> m_pmtSmearing;
-  std::vector<double> m_pmtScaling;
-  std::vector<double> m_gasScaling;
-  std::vector<double> m_npeThreshold;
+  std::vector<double> m_pmtSmearing{};
+  std::vector<double> m_pmtScaling{};
+  std::vector<double> m_gasScaling{};
+  std::vector<double> m_npeThreshold{};
 
-  bool   m_fillRootTree;
+  bool   m_fillRootTree{};
 
-  unsigned short m_tubeID;
-  double         m_npe;
-  unsigned short m_npeGas;
-  unsigned short m_npePmt;
-  unsigned short m_qdc;
-  double         m_tdcTot;
-  unsigned short m_tdc;
+  unsigned short m_tubeID{};
+  double         m_npe{};
+  unsigned short m_npeGas{};
+  unsigned short m_npePmt{};
+  unsigned short m_qdc{};
+  double         m_tdcTot{};
+  unsigned short m_tdc{};
 
-  TTree* m_tubeInfo;
+  TTree* m_tubeInfo{};
 };
 
 #endif

ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.cxx

@@ -20,23 +20,26 @@ LUCID_PileUpTool::LUCID_PileUpTool(const std::string& type,
                                    const std::string& name,
                                    const IInterface* parent) :
   PileUpToolBase     (type, name, parent),
-  m_numTubes         (40),
-  m_qdcChannelsPerPE (15.0),
-  m_qdcPedestal      (150.0),
-  m_qdcFedNoiseFactor(3.0),
-  m_tdcPmtNoiseFactor(2.8),
-  m_tdcFedNoiseFactor(0.8),
-  m_TotalPMTgain     (1.25e6),
-  m_AmpFactor        (7.5),
-  m_Q1bin            (0.1e-12),
-  m_NoiseCharge      (541666),
-  m_numDyinodes      (10),
-  m_dynodeGammaFactor(1.356),
-  m_pmtSmearing      (1, 0.000001),
-  m_pmtScaling       (1, 0.000001),
-  m_gasScaling       (1, 0.000001),
-  m_npeThreshold     (15, 0.000001),
-  m_fillRootTree     (false)
+  LUCID_DigitizationToolBox(
+  40,//m_numTubes
+  15.0,//m_qdcChannelsPerPE
+  150.0,//m_qdcPedestal
+  3.0,//m_qdcFedNoiseFactor
+  2.8,//m_tdcPmtNoiseFactor
+  0.8,//m_tdcFedNoiseFactor
+  1.25e6,//m_TotalPMTgain
+  7.5,//m_AmpFactor
+  0.1e-12,//m_Q1bin
+  541666,//m_NoiseCharge
+  10,//m_numDyinodes
+  1.356,//m_dynodeGammaFactor
+  {0.000001}, //m_pmtSmearing
+  {0.000001}, //m_pmtScaling
+  {0.000001}, //m_gasScaling
+  {0.000001,0.000001,0.000001,0.000001,0.000001,
+   0.000001,0.000001,0.000001,0.000001,0.000001,
+   0.000001,0.000001,0.000001,0.000001,0.000001},//15 values m_npeThreshold
+  false) //m_fillRootTree
 {
 
   m_SimHitCollectionName = "LucidSimHitsVector";

ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h

@@ -72,27 +72,6 @@ private:
   ITHistSvc  *m_digitHistSvc{};
 
   LUCID_SimHitCollection* m_mergedhitList{};
-
-  int    m_numTubes;
-  double m_qdcChannelsPerPE;
-  double m_qdcPedestal;
-  double m_qdcFedNoiseFactor;
-  double m_tdcPmtNoiseFactor;
-  double m_tdcFedNoiseFactor;
-
-  double m_TotalPMTgain;
-  double m_AmpFactor;
-  double m_Q1bin;
-  int    m_NoiseCharge;
-  int    m_numDyinodes;
-  double m_dynodeGammaFactor;
-
-  std::vector<double> m_pmtSmearing;
-  std::vector<double> m_pmtScaling;
-  std::vector<double> m_gasScaling;
-  std::vector<double> m_npeThreshold;
-
-  bool   m_fillRootTree;
 };
 
 #endif