feat(mwpc):Update classes

Minor change

Minor change

Author: jose-luis-rs

mwpc/mwpc0/R3BMwpc0Cal2Hit.cxx

@@ -17,16 +17,15 @@
 // ----------------------------------------------------------------
 
 // ROOT headers
-#include "TClonesArray.h"
-#include "TMath.h"
+#include <TClonesArray.h>
+#include <TMath.h>
 
 // FAIR headers
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRunAna.h"
-#include "FairRuntimeDb.h"
+#include <FairRootManager.h>
+#include <FairRuntimeDb.h>
 
 // R3B headers
+#include "R3BLogger.h"
 #include "R3BMwpc0Cal2Hit.h"
 #include "R3BMwpcCalData.h"
 #include "R3BMwpcHitData.h"
@@ -38,46 +37,42 @@ R3BMwpc0Cal2Hit::R3BMwpc0Cal2Hit()
 }
 
 // R3BMwpc0Cal2Hit: Standard Constructor --------------------------
-R3BMwpc0Cal2Hit::R3BMwpc0Cal2Hit(const char* name, Int_t iVerbose)
-    : FairTask(name, iVerbose)
-    , fMwpcCalDataCA(NULL)
-    , fMwpcHitDataCA(NULL)
-    , fwx(3.125)   // in mm
-    , fwy(3.125)   // in mm
-    , fSize(200.0) // in mm
-    , fOnline(kFALSE)
+R3BMwpc0Cal2Hit::R3BMwpc0Cal2Hit(const std::string& name, int iVerbose)
+    : FairTask(name.c_str(), iVerbose)
 {
 }
 
 // Virtual R3BMwpc0Cal2Hit: Destructor
 R3BMwpc0Cal2Hit::~R3BMwpc0Cal2Hit()
 {
-    LOG(info) << "R3BMwpc0Cal2Hit: Delete instance";
+    R3BLOG(debug, "Delete instance");
     if (fMwpcHitDataCA)
         delete fMwpcHitDataCA;
 }
 
 // -----   Public method Init   --------------------------------------------
 InitStatus R3BMwpc0Cal2Hit::Init()
 {
-    LOG(info) << "R3BMwpc0Cal2Hit: Init";
+    R3BLOG(info, "");
 
     // INPUT DATA
     FairRootManager* rootManager = FairRootManager::Instance();
     if (!rootManager)
     {
+        R3BLOG(fatal, "FairRootManager not found");
         return kFATAL;
     }
 
     fMwpcCalDataCA = dynamic_cast<TClonesArray*>(rootManager->GetObject("Mwpc0CalData"));
     if (!fMwpcCalDataCA)
     {
+        R3BLOG(fatal, "Mwpc0CalData not found");
         return kFATAL;
     }
 
     // OUTPUT DATA
     // Hit data
-    fMwpcHitDataCA = new TClonesArray("R3BMwpcHitData", 10);
+    fMwpcHitDataCA = new TClonesArray("R3BMwpcHitData");
     rootManager->Register("Mwpc0HitData", "MWPC0 Hit", fMwpcHitDataCA, !fOnline);
 
     return kSUCCESS;
@@ -87,7 +82,7 @@ InitStatus R3BMwpc0Cal2Hit::Init()
 InitStatus R3BMwpc0Cal2Hit::ReInit() { return kSUCCESS; }
 
 // -----   Public method Execution   --------------------------------------------
-void R3BMwpc0Cal2Hit::Exec(Option_t* option)
+void R3BMwpc0Cal2Hit::Exec(Option_t* /*opt*/)
 {
     // Reset entries in output arrays, local arrays
     Reset();
@@ -98,12 +93,8 @@ void R3BMwpc0Cal2Hit::Exec(Option_t* option)
         return;
 
     // Data from cal level
-    R3BMwpcCalData** calData;
-    calData = new R3BMwpcCalData*[nHits];
-    Int_t planeId;
-    Int_t padId;
     Int_t padmx = -1, padmy = -1;
-    Double_t q = 0., qmx = 0., qmy = 0., qleft = 0., qright = 0., qdown = 0., qup = 0.;
+    Double_t qmx = 0., qmy = 0., qleft = 0., qright = 0., qdown = 0., qup = 0.;
     Double_t x = NAN, y = NAN;
 
     for (Int_t i = 0; i < Mw0PadsX; i++)
@@ -113,10 +104,10 @@ void R3BMwpc0Cal2Hit::Exec(Option_t* option)
 
     for (Int_t i = 0; i < nHits; i++)
     {
-        calData[i] = dynamic_cast<R3BMwpcCalData*>(fMwpcCalDataCA->At(i));
-        planeId = calData[i]->GetPlane();
-        padId = calData[i]->GetPad() - 1;
-        q = calData[i]->GetQ();
+        auto calData = dynamic_cast<R3BMwpcCalData*>(fMwpcCalDataCA->At(i));
+        auto planeId = calData->GetPlane();
+        auto padId = calData->GetPad() - 1;
+        auto q = calData->GetQ();
         if (planeId == 1)
             fx[padId] = q;
         else
@@ -150,8 +141,6 @@ void R3BMwpc0Cal2Hit::Exec(Option_t* option)
         // std::cout << x << " " << y << std::endl;
         AddHitData(x, y);
     }
-    if (calData)
-        delete[] calData;
     return;
 }
 
@@ -180,7 +169,7 @@ Double_t R3BMwpc0Cal2Hit::GetPositionY(Double_t qmax, Int_t padmax, Double_t qdo
 // -----   Public method Reset   ------------------------------------------------
 void R3BMwpc0Cal2Hit::Reset()
 {
-    LOG(debug) << "Clearing Mwpc0HitData Structure";
+    R3BLOG(debug, "Clearing Mwpc0HitData Structure");
     if (fMwpcHitDataCA)
         fMwpcHitDataCA->Clear();
 }
@@ -194,4 +183,4 @@ R3BMwpcHitData* R3BMwpc0Cal2Hit::AddHitData(Double_t x, Double_t y)
     return new (clref[size]) R3BMwpcHitData(x, y);
 }
 
-ClassImp(R3BMwpc0Cal2Hit);
+ClassImp(R3BMwpc0Cal2Hit)

mwpc/mwpc0/R3BMwpc0Cal2Hit.h

@@ -16,71 +16,65 @@
 // -----          Created 09/10/19 by J.L. Rodriguez-Sanchez    -----
 // ------------------------------------------------------------------
 
-#ifndef R3BMwpc0Cal2Hit_H
-#define R3BMwpc0Cal2Hit_H 1
+#pragma once
 
-#include "FairTask.h"
-#include "R3BMwpcCalData.h"
-#include "R3BMwpcHitData.h"
-#include "TH1F.h"
-#include <TRandom.h>
+#include <FairTask.h>
+#include <string>
 
 #define Mw0PadsX 64
 #define Mw0PadsY 64
 
 class TClonesArray;
+class R3BMwpcHitData;
 
 class R3BMwpc0Cal2Hit : public FairTask
 {
-
   public:
-    /** Default constructor **/
+    // Default constructor
     R3BMwpc0Cal2Hit();
 
-    /** Standard constructor **/
-    R3BMwpc0Cal2Hit(const char* name, Int_t iVerbose = 1);
+    // Standard constructor
+    explicit R3BMwpc0Cal2Hit(const std::string& name, int iVerbose = 1);
 
-    /** Destructor **/
+    // Destructor
     virtual ~R3BMwpc0Cal2Hit();
 
-    /** Virtual method Exec **/
-    virtual void Exec(Option_t* option);
+    // Method Exec
+    void Exec(Option_t* /*opt*/) override;
 
-    /** Virtual method Reset **/
+    // Virtual method Reset
     virtual void Reset();
 
     // Fair specific
-    /** Virtual method Init **/
-    virtual InitStatus Init();
+    // Method Init
+    InitStatus Init() override;
 
-    /** Virtual method ReInit **/
-    virtual InitStatus ReInit();
+    // Method ReInit
+    InitStatus ReInit() override;
 
-    void SetOnline(Bool_t option) { fOnline = option; }
+    void SetOnline(bool opt = true) { fOnline = opt; }
 
   private:
-    Double_t fSize; // Detector size in X and Y
-    Double_t fwx;   // Pad width in X
-    Double_t fwy;   // Pad width in Y
+    Double_t fSize = 200.; // Detector size in X and Y (mm)
+    Double_t fwx = 3.125;  // Pad width in X (mm)
+    Double_t fwy = 3.125;  // Pad width in Y (mm)
     Int_t fx[Mw0PadsX], fy[Mw0PadsY];
 
-    Bool_t fOnline; // Don't store data for online
+    bool fOnline = false; // Don't store data for online
 
-    TClonesArray* fMwpcCalDataCA; /**< Array with Cal input data. >*/
-    TClonesArray* fMwpcHitDataCA; /**< Array with Hit output data. >*/
+    TClonesArray* fMwpcCalDataCA = nullptr; // Array with Cal input data
+    TClonesArray* fMwpcHitDataCA = nullptr; // Array with Hit output data
 
-    /** Private method AddHitData **/
+    // Private method AddHitData
     // Adds a SofMwpcHitData to the MwpcHitCollection
     R3BMwpcHitData* AddHitData(Double_t x, Double_t y);
 
-    /** Private method to obtain the position X **/
+    // Private method to obtain the position X
     Double_t GetPositionX(Double_t qmax, Int_t padmax, Double_t qleft, Double_t qright);
-    /** Private method to obtain the position Y **/
+    // Private method to obtain the position Y
     Double_t GetPositionY(Double_t qmax, Int_t padmax, Double_t qdown, Double_t qup);
 
   public:
     // Class definition
-    ClassDef(R3BMwpc0Cal2Hit, 1)
+    ClassDefOverride(R3BMwpc0Cal2Hit, 1); // NOLINT
 };
-
-#endif

mwpc/mwpc0/R3BMwpc0CalPar.cxx

@@ -11,22 +11,15 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
-// ----------------------------------------------------------------------
-//								    -----
-//  Factory for the parameter containers in libR3BMwpc0          -----
-//								    -----
-// ----------------------------------------------------------------------
+#include <FairRuntimeDb.h>
+#include <TClass.h>
+#include <string>
 
-#include "R3BMwpc0ContFact.h"
+#include "R3BLogger.h"
 #include "R3BMwpc0CalPar.h"
+#include "R3BMwpc0ContFact.h"
 #include "R3BTGeoPar.h"
 
-#include "FairLogger.h"
-#include "FairParAsciiFileIo.h"
-#include "FairParRootFileIo.h"
-#include "FairRuntimeDb.h"
-#include "TClass.h"
-
 static R3BMwpc0ContFact gR3BMwpc0ContFact;
 
 R3BMwpc0ContFact::R3BMwpc0ContFact()
@@ -45,12 +38,10 @@ void R3BMwpc0ContFact::setAllContainers()
 
     FairContainer* p1 = new FairContainer("mwpc0CalPar", "Mwpc0 Cal Parameters", "Mwpc0CalParContext");
     p1->addContext("Mwpc0CalParContext");
-
     containers->Add(p1);
 
     FairContainer* p2 = new FairContainer("Mwpc0GeoPar", "Mwpc0 geometry parameters", "GeometryParameterContext");
     p2->addContext("GeometryParameterContext");
-
     containers->Add(p2);
 }
 
@@ -60,36 +51,19 @@ FairParSet* R3BMwpc0ContFact::createContainer(FairContainer* c)
     // For an actual context, which is not an empty string and not the default context
     // of this container, the name is concatinated with the context.
 
-    const char* name = c->GetName();
-    LOG(info) << "R3BMwpc0ContFact: Create container name: " << name;
-    FairParSet* p = 0;
-    if (strcmp(name, "mwpc0CalPar") == 0)
+    const std::string name(c->GetName());
+    R3BLOG(info, "Create container name: " << name.c_str());
+
+    FairParSet* p = nullptr;
+    if (name == "mwpc0CalPar")
     {
         p = new R3BMwpc0CalPar(c->getConcatName().Data(), c->GetTitle(), c->getContext());
     }
-
-    if (strcmp(name, "Mwpc0GeoPar") == 0)
+    else if (name == "Mwpc0GeoPar")
     {
         p = new R3BTGeoPar(c->getConcatName().Data(), c->GetTitle(), c->getContext());
     }
-
     return p;
 }
 
-void R3BMwpc0ContFact::activateParIo(FairParIo* io)
-{
-    // activates the input/output class for the parameters
-    // needed by the Mwpc0
-    /*
-    if (strcmp(io->IsA()->GetName(),"FairParRootFileIo")==0) {
-      R3BMwpc0ParRootFileIo* p=new R3BMwpc0ParRootFileIo(((FairParRootFileIo*)io)->getParRootFile());
-      io->setDetParIo(p);
-    }
-    if (strcmp(io->IsA()->GetName(),"FairParAsciiFileIo")==0) {
-      R3BMwpc0ParAsciiFileIo* p=new R3BMwpc0ParAsciiFileIo(((FairParAsciiFileIo*)io)->getFile());
-      io->setDetParIo(p);
-      }
-    */
-}
-
 ClassImp(R3BMwpc0ContFact)

mwpc/mwpc0/R3BMwpc0ContFact.cxx

@@ -11,24 +11,23 @@
  * or submit itself to any jurisdiction.                                      *
  ******************************************************************************/
 
-#ifndef R3BMwpc0ContFact_H
-#define R3BMwpc0ContFact_H 1
+#pragma once
 
-#include "FairContFact.h"
+#include <FairContFact.h>
 
 class FairContainer;
 
 class R3BMwpc0ContFact : public FairContFact
 {
+  public:
+    R3BMwpc0ContFact();
+    virtual ~R3BMwpc0ContFact() = default;
+
+    FairParSet* createContainer(FairContainer*) override;
+
   private:
     void setAllContainers();
 
   public:
-    R3BMwpc0ContFact();
-    ~R3BMwpc0ContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    void activateParIo(FairParIo* io);
-    ClassDef(R3BMwpc0ContFact, 0) // Factory for all MWPC0 parameter containers
+    ClassDefOverride(R3BMwpc0ContFact, 0); // NOLINT
 };
-
-#endif /* !R3BMwpc0ContFact_H */