fix leaks in FairTutorialDet4StraightLineFitter

Replace multiple heap allocated objects by either value
members of the class or just local stack variables.

Introduce more `override`.

And drop empty ReInit and Finish methods that override the
original methods that are also doing the same.

Author: ChristianTackeGSI

examples/simulation/Tutorial4/src/reco/FairTutorialDet4StraightLineFitter.cxx

@@ -7,35 +7,24 @@
  ********************************************************************************/
 #include "FairTutorialDet4StraightLineFitter.h"
 
-#include "FairLogger.h"            // for FairLogger, etc
 #include "FairRootManager.h"       // for FairRootManager
 #include "FairTrackParam.h"        // for FairTrackParam
 #include "FairTutorialDet4Hit.h"   // for FairTutorialDet4Hit
 
-#include <TClonesArray.h>   // for TClonesArray
 #include <TF1.h>            // for TF1
 #include <TGraphErrors.h>   // for TGraphErrors
 #include <TVector3.h>       // for TVector3
-#include <set>              // for set, set<>::iterator, etc
+#include <fairlogger/Logger.h>
+#include <set>
 
 FairTutorialDet4StraightLineFitter::FairTutorialDet4StraightLineFitter()
     : FairTask("FairTutorialDet4StraightLineFitter")
-    , fHits(nullptr)
-    , fTracks(nullptr)
+    , fTracks(FairTrackParam::Class(), 100)
     , fVersion(2)
 {
     LOG(debug) << "Default Constructor of FairTutorialDet4StraightLineFitter";
 }
 
-FairTutorialDet4StraightLineFitter::~FairTutorialDet4StraightLineFitter()
-{
-    LOG(debug) << "Destructor of FairTutorialDet4StraightLineFitter";
-    if (fTracks) {
-        fTracks->Delete();
-        delete fTracks;
-    }
-}
-
 InitStatus FairTutorialDet4StraightLineFitter::Init()
 {
     LOG(debug) << "Initilization of FairTutorialDet4StraightLineFitter";
@@ -45,7 +34,7 @@ InitStatus FairTutorialDet4StraightLineFitter::Init()
 
     // Get a pointer to the previous already existing data level
 
-    fHits = static_cast<TClonesArray*>(ioman->GetObject("TutorialDetHit"));
+    fHits = dynamic_cast<TClonesArray const*>(ioman->GetObject("TutorialDetHit"));
     if (!fHits) {
         LOG(error) << "No InputDataLevelName array!\n"
                    << "FairTutorialDet4StraightLineFitter will be inactive";
@@ -54,8 +43,7 @@ InitStatus FairTutorialDet4StraightLineFitter::Init()
 
     // Create the TClonesArray for the output data and register
     // it in the IO manager
-    fTracks = new TClonesArray("FairTrackParam", 100);
-    ioman->Register("TutorialDetTrack", "TutorialDet", fTracks, kTRUE);
+    ioman->Register("TutorialDetTrack", "TutorialDet", &fTracks, kTRUE);
 
     // Do whatever else is needed at the initilization stage
     // Create histograms to be filled
@@ -64,12 +52,6 @@ InitStatus FairTutorialDet4StraightLineFitter::Init()
     return kSUCCESS;
 }
 
-InitStatus FairTutorialDet4StraightLineFitter::ReInit()
-{
-    LOG(debug) << "Initilization of FairTutorialDet4StraightLineFitter";
-    return kSUCCESS;
-}
-
 void FairTutorialDet4StraightLineFitter::Exec(Option_t* /*option*/)
 {
     LOG(debug) << "Exec of FairTutorialDet4StraightLineFitter";
@@ -79,7 +61,6 @@ void FairTutorialDet4StraightLineFitter::Exec(Option_t* /*option*/)
     }
 
     // Declare some variables
-    FairTutorialDet4Hit* hit = nullptr;
     /*
   Int_t detID   = 0;        // Detector ID
   Int_t trackID = 0;        // Track index
@@ -98,7 +79,7 @@ void FairTutorialDet4StraightLineFitter::Exec(Option_t* /*option*/)
     Float_t* YPosErr = new Float_t[nHits];
 
     for (Int_t iHit = 0; iHit < nHits; iHit++) {
-        hit = static_cast<FairTutorialDet4Hit*>(fHits->At(iHit));
+        auto hit = static_cast<FairTutorialDet4Hit const*>(fHits->At(iHit));
         if (!hit) {
             continue;
         }
@@ -111,24 +92,22 @@ void FairTutorialDet4StraightLineFitter::Exec(Option_t* /*option*/)
         YPosErr[iHit] = hit->GetDy();
     }
 
-    TF1* f1 = new TF1("f1", "[0]*x + [1]");
-    TGraphErrors* LineGraph;
-
-    LineGraph = new TGraphErrors(nHits, ZPos, XPos, 0, XPosErr);
-    LineGraph->Fit("f1", "Q");
-    Double_t SlopeX = f1->GetParameter(0);
-    Double_t OffX = f1->GetParameter(1);
-    Double_t Chi2X = f1->GetChisquare();
+    auto f1 = TF1("f1", "[0]*x + [1]");
+    auto linegraphX = TGraphErrors(nHits, ZPos, XPos, nullptr, XPosErr);
+    linegraphX.Fit(&f1, "Q");
+    Double_t SlopeX = f1.GetParameter(0);
+    Double_t OffX = f1.GetParameter(1);
+    Double_t Chi2X = f1.GetChisquare();
     Double_t SlopeY = 0.;
     Double_t OffY = 0.;
     Double_t Chi2Y;
 
     if (2 == fVersion) {
-        LineGraph = new TGraphErrors(nHits, ZPos, YPos, 0, YPosErr);
-        LineGraph->Fit("f1", "Q");
-        SlopeY = f1->GetParameter(0);
-        OffY = f1->GetParameter(1);
-        Chi2Y = f1->GetChisquare();
+        auto linegraphY = TGraphErrors(nHits, ZPos, YPos, nullptr, YPosErr);
+        linegraphY.Fit(&f1, "Q");
+        SlopeY = f1.GetParameter(0);
+        OffY = f1.GetParameter(1);
+        Chi2Y = f1.GetChisquare();
 
         LOG(debug) << XPos[0] << "," << XPos[nHits - 1] << "," << YPos[0] << "," << YPos[nHits - 1] << "," << ZPos[0]
                    << "," << ZPos[nHits - 1];
@@ -141,15 +120,14 @@ void FairTutorialDet4StraightLineFitter::Exec(Option_t* /*option*/)
         LOG(debug) << "Chi2(x,y): " << Chi2X << " ," << Chi2Y;
     }
 
-    FairTrackParam* track = new FairTrackParam();
+    auto track = static_cast<FairTrackParam*>(fTracks.ConstructedAt(0));
     track->SetX(OffX);
     track->SetTx(SlopeX);
     track->SetZ(0.);
     if (2 == fVersion) {
         track->SetY(OffY);
         track->SetTy(SlopeY);
     }
-    new ((*fTracks)[0]) FairTrackParam(*track);
     //  const TMatrixFSym matrix;
     //  Double_t Z = 0.;
     //  new ((*fTracks)[0]) FairTrackParam(OffX, OffY, Z, SlopeX, SlopeY, matrix);
@@ -168,15 +146,13 @@ Bool_t FairTutorialDet4StraightLineFitter::IsGoodEvent()
     // event, so we have to check for this.
     // In the end the algorithm should be able to work also with
     // missing hits in some stations
-    FairTutorialDet4Hit* hit;
     std::set<Int_t> detIdSet;
-    std::set<Int_t>::iterator it;
 
     Int_t nHits = fHits->GetEntriesFast();
     for (Int_t iHit = 0; iHit < nHits; ++iHit) {
-        hit = static_cast<FairTutorialDet4Hit*>(fHits->At(iHit));
+        auto hit = static_cast<FairTutorialDet4Hit const*>(fHits->At(iHit));
         Int_t detId = hit->GetDetectorID();
-        it = detIdSet.find(detId);
+        auto it = detIdSet.find(detId);
         if (it == detIdSet.end()) {
             detIdSet.insert(detId);
         } else {
@@ -187,8 +163,3 @@ Bool_t FairTutorialDet4StraightLineFitter::IsGoodEvent()
     }
     return kTRUE;
 }
-
-void FairTutorialDet4StraightLineFitter::Finish()
-{
-    LOG(debug) << "Finish of FairTutorialDet4StraightLineFitter";
-}

examples/simulation/Tutorial4/src/reco/FairTutorialDet4StraightLineFitter.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -11,8 +11,7 @@
 #include "FairTask.h"   // for InitStatus, FairTask
 
 #include <Rtypes.h>   // for ClassDef
-
-class TClonesArray;
+#include <TClonesArray.h>
 
 class FairTutorialDet4StraightLineFitter : public FairTask
 {
@@ -24,28 +23,22 @@ class FairTutorialDet4StraightLineFitter : public FairTask
     //  FairTutorialDet4StraightLineFitter(Int_t verbose);
 
     /** Destructor **/
-    ~FairTutorialDet4StraightLineFitter();
+    ~FairTutorialDet4StraightLineFitter() override = default;
 
     /** Initiliazation of task at the beginning of a run **/
-    virtual InitStatus Init();
-
-    /** ReInitiliazation of task when the runID changes **/
-    virtual InitStatus ReInit();
+    InitStatus Init() override;
 
     /** Executed for each event. **/
-    virtual void Exec(Option_t* opt);
-
-    /** Finish task called at the end of the run **/
-    virtual void Finish();
+    void Exec(Option_t* opt) override;
 
     void SetVersion(Int_t val) { fVersion = val; }
 
   private:
     /** Input array from previous already existing data level **/
-    TClonesArray* fHits;
+    TClonesArray const* fHits{nullptr};
 
     /** Output array to  new data level**/
-    TClonesArray* fTracks;
+    TClonesArray fTracks;
 
     Int_t fVersion;
 
@@ -54,7 +47,7 @@ class FairTutorialDet4StraightLineFitter : public FairTask
     FairTutorialDet4StraightLineFitter(const FairTutorialDet4StraightLineFitter&);
     FairTutorialDet4StraightLineFitter operator=(const FairTutorialDet4StraightLineFitter&);
 
-    ClassDef(FairTutorialDet4StraightLineFitter, 1);
+    ClassDefOverride(FairTutorialDet4StraightLineFitter, 1);
 };
 
 #endif