feat(tofd/pars):Update R3BTofDMapped2CalPar

Author: jose-luis-rs

tofd/pars/R3BTofDMapped2CalPar.cxx

@@ -19,10 +19,10 @@
 #include "R3BTofDMapped2CalPar.h"
 #include <FairRootManager.h>
 
-#include "TClonesArray.h"
+#include <TClonesArray.h>
 
-#include "FairLogger.h"
-#include "FairRuntimeDb.h"
+#include <FairLogger.h>
+#include <FairRuntimeDb.h>
 
 #include "R3BLogger.h"
 #include "R3BTCalEngine.h"
@@ -34,17 +34,8 @@ R3BTofDMapped2CalPar::R3BTofDMapped2CalPar()
 {
 }
 
-R3BTofDMapped2CalPar::R3BTofDMapped2CalPar(const char* name, Int_t iVerbose)
+R3BTofDMapped2CalPar::R3BTofDMapped2CalPar(const char* name, int iVerbose)
     : FairTask(name, iVerbose)
-    , fUpdateRate(1000000)
-    , fMinStats(1)
-    , fNofPlanes(4)
-    , fPaddlesPerPlane(44)
-    , fNofModules(fNofPlanes * fPaddlesPerPlane * 4)
-    , fCalPar(nullptr)
-    , fMapped(nullptr)
-    , fMappedTrigger(nullptr)
-    , fEngine(nullptr)
 {
 }
 
@@ -94,8 +85,8 @@ InitStatus R3BTofDMapped2CalPar::Init()
 
     fEngine = new R3BTCalEngine(fCalPar, fMinStats);
 
-    for (UInt_t d = 0; d < 5; d++)
-        for (UInt_t i = 0; i < 48; i++)
+    for (UInt_t d = 0; d < fNofPlanes; d++)
+        for (UInt_t i = 0; i < fPaddlesPerPlane; i++)
             for (UInt_t k = 0; k < 4; k++)
             {
                 Icount[d][i][k] = 0;
@@ -104,7 +95,7 @@ InitStatus R3BTofDMapped2CalPar::Init()
     return kSUCCESS;
 }
 
-void R3BTofDMapped2CalPar::Exec(Option_t* option)
+void R3BTofDMapped2CalPar::Exec(Option_t*)
 {
     Int_t nHits = fMapped->GetEntriesFast();
     // Loop over mapped hits
@@ -156,12 +147,11 @@ void R3BTofDMapped2CalPar::FinishTask()
 {
     fEngine->CalculateParamVFTX();
     fCalPar->setChanged();
-    fCalPar->printParams();
 
     R3BLOG(info, "Calibration of TofD detector");
-    for (Int_t p = 0; p < 5; p++)
-        for (Int_t i = 0; i < 48; i++)
-            for (Int_t k = 0; k < 4; k++)
+    for (size_t p = 0; p < fNofPlanes; p++)
+        for (size_t i = 0; i < fPaddlesPerPlane; i++)
+            for (size_t k = 0; k < 4; k++)
                 if (Icount[p][i][k] > fMinStats)
                 {
                     if (p < 4)
@@ -175,9 +165,9 @@ void R3BTofDMapped2CalPar::FinishTask()
                 }
 }
 
-void R3BTofDMapped2CalPar::SetUpdateRate(Int_t rate) { fUpdateRate = rate; }
+void R3BTofDMapped2CalPar::SetUpdateRate(UInt_t rate) { fUpdateRate = rate; }
 
-void R3BTofDMapped2CalPar::SetMinStats(Int_t minStats) { fMinStats = minStats; }
+void R3BTofDMapped2CalPar::SetMinStats(UInt_t minStats) { fMinStats = minStats; }
 
 void R3BTofDMapped2CalPar::SetNofModules(Int_t nDets, Int_t nCh)
 {
@@ -186,4 +176,4 @@ void R3BTofDMapped2CalPar::SetNofModules(Int_t nDets, Int_t nCh)
     fNofModules = nDets * nCh * 4;
 }
 
-ClassImp(R3BTofDMapped2CalPar);
+ClassImp(R3BTofDMapped2CalPar)

tofd/pars/R3BTofDMapped2CalPar.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "FairTask.h"
+#include <FairTask.h>
 
 class R3BTCalPar;
 class TClonesArray;
@@ -40,7 +40,7 @@ class R3BTofDMapped2CalPar : public FairTask
      * @param name a name of the task.
      * @param iVerbose a verbosity level.
      */
-    R3BTofDMapped2CalPar(const char*, Int_t = 1);
+    explicit R3BTofDMapped2CalPar(const char*, int = 1);
 
     /**
      * Destructor.
@@ -54,26 +54,26 @@ class R3BTofDMapped2CalPar : public FairTask
      * the event loop.
      * @return Initialization status. kSUCCESS, kERROR or kFATAL.
      */
-    InitStatus Init();
+    InitStatus Init() override;
 
     /**
      * Method for event loop implementation.
      * Is called by the framework every time a new event is read.
      * @param option an execution option.
      */
-    void Exec(Option_t*);
+    void Exec(Option_t*) override;
 
     /**
      * Method for finish of the task execution.
      * Is called by the framework after processing the event loop.
      */
-    void FinishTask();
+    void FinishTask() override;
 
     /**
      * Method for setting the update rate for control histograms
      * @param rate an update rate value (events).
      */
-    void SetUpdateRate(Int_t);
+    inline void SetUpdateRate(UInt_t);
 
     /**
      * Method for setting minimum required statistics per module.
@@ -82,28 +82,28 @@ class R3BTofDMapped2CalPar : public FairTask
      * calibrated.
      * @param minStats a value of minimum statistics required.
      */
-    void SetMinStats(Int_t);
+    inline void SetMinStats(UInt_t);
 
     /**
      * Method for setting number of TofD detectors and paddles.
      */
-    void SetNofModules(Int_t, Int_t);
+    inline void SetNofModules(Int_t, Int_t);
 
   private:
-    Int_t fUpdateRate; /**< An update rate. */
-    Int_t fMinStats;   /**< Minimum statistics required per module. */
-    Int_t Icount[5][48][4];
+    UInt_t fUpdateRate = 1000000; // An update rate
+    UInt_t fMinStats = 100;       // Minimum statistics required per module
+    UInt_t Icount[5][48][4];      // NOLINT
 
-    UInt_t fNofPlanes;       /**< Number of planes. */
-    UInt_t fPaddlesPerPlane; /**< Number of bars per plane. */
-    UInt_t fNofModules;      /**< Total number of modules (=edges) to calibrate */
+    UInt_t fNofPlanes = 5;
+    UInt_t fPaddlesPerPlane = 48;
+    UInt_t fNofModules = fNofPlanes * fPaddlesPerPlane * 4;
 
-    R3BTCalPar* fCalPar;          /**< Parameter container. */
-    TClonesArray* fMapped;        /**< Array with mapped data - input data. */
-    TClonesArray* fMappedTrigger; /**< Array with mapped trigger data - input data. */
+    R3BTCalPar* fCalPar = nullptr;
+    TClonesArray* fMapped = nullptr;
+    TClonesArray* fMappedTrigger = nullptr;
 
-    R3BTCalEngine* fEngine; /**< Instance of the TCAL engine. */
+    R3BTCalEngine* fEngine = nullptr;
 
   public:
-    ClassDef(R3BTofDMapped2CalPar, 1)
+    ClassDefOverride(R3BTofDMapped2CalPar, 1); // NOLINT
 };