style(analysis/eventFilter): TCutG is now a unique pointer

Author: pgrusell

analysis/offline/R3BEventFilter.cxx

@@ -56,8 +56,6 @@ void R3BEventFilter::SetParContainers()
     return;
 }
 
-R3BEventFilter::~R3BEventFilter() { delete fCutFrsId; }
-
 void R3BEventFilter::SetParameter()
 {
     //--- Parameter Containers ---
@@ -77,14 +75,15 @@ InitStatus R3BEventFilter::Init()
 
     fFrsData = dynamic_cast<TClonesArray*>(mgr->GetObject("FrsData"));
 
-    if (fCutFrsId == nullptr)
+    if (!fCutFrsId)
     {
-        fCutFrsId = new TCutG("fCutFrsId", 5);
-        fCutFrsId->SetPoint(0, 0.5, 0.5);
-        fCutFrsId->SetPoint(1, 4., 0.5);
-        fCutFrsId->SetPoint(2, 4., 4.);
-        fCutFrsId->SetPoint(3, 0.5, 4.);
-        fCutFrsId->SetPoint(4, 0.5, 0.5);
+        auto tmp = std::make_unique<TCutG>("fCutFrsId", 5);
+        tmp->SetPoint(0, 0.5, 0.5);
+        tmp->SetPoint(1, 4., 0.5);
+        tmp->SetPoint(2, 4., 4.);
+        tmp->SetPoint(3, 0.5, 4.);
+        tmp->SetPoint(4, 0.5, 0.5);
+        fCutFrsId = std::move(tmp);
     }
 
     if (fChargeLimits.empty())

analysis/offline/R3BEventFilter.h

@@ -85,10 +85,21 @@ class R3BEventFilter : public FairTask
 
     void SetParContainers() override;
 
-    inline void SetTCutFrsId(TCutG* tcut) { fCutFrsId = tcut; };
-    inline void SetChargeLimits(const std::vector<std::vector<double>>& vec) { fChargeLimits = vec; }
-    inline void SetTofd() { fUseTofd = true; }
-    inline void UseTwoPlanes() { fUseAllPlanes = false; }
+    void SetTCutFrsId(const TCutG* cut)
+    {
+        if (cut)
+        {
+            fCutFrsId.reset(static_cast<TCutG*>(cut->Clone()));
+            fCutFrsId->SetName("fCutFrsId");
+        }
+        else
+        {
+            fCutFrsId.reset();
+        }
+    }
+    void SetChargeLimits(const std::vector<std::vector<double>>& vec) { fChargeLimits = vec; }
+    void SetTofd() { fUseTofd = true; }
+    void UseTwoPlanes() { fUseAllPlanes = false; }
 
   private:
     void SetParameter();
@@ -98,7 +109,7 @@ class R3BEventFilter : public FairTask
     TClonesArray* fTofdHit = nullptr;
     TClonesArray* fFrsData = nullptr;
 
-    TCutG* fCutFrsId = nullptr;
+    std::unique_ptr<TCutG> fCutFrsId;
     std::vector<std::vector<double>> fChargeLimits;
 
     bool fUseTofd = false;