TRestDetectorSignal - removed initializer and dependency from TObject

rest-for-physics · Jul 11, 2022 · 61e938a · 61e938a
1 parent 6ef89a1
commit 61e938a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/inc/TRestDetectorSignal.h b/inc/TRestDetectorSignal.h
@@ -23,19 +23,18 @@
 #define RestCore_TRestDetectorSignal
 
 #include <TGraph.h>
-#include <TObject.h>
 #include <TString.h>
 #include <TVector2.h>
 
 #include <iostream>
 
-class TRestDetectorSignal : public TObject {
+class TRestDetectorSignal {
    private:
     Int_t GetMinIndex();
     Int_t GetTimeIndex(Double_t t);
 
    protected:
-    Int_t fSignalID;
+    Int_t fSignalID = -1;
 
     std::vector<Float_t> fSignalTime;    // Vector with the time of the signal
     std::vector<Float_t> fSignalCharge;  // Vector with the charge of the signal
@@ -51,12 +50,6 @@ class TRestDetectorSignal : public TObject {
     std::vector<Int_t> fPointsOverThreshold;  //!
 #endif
 
-    void Initialize() {
-        fSignalCharge.clear();
-        fSignalTime.clear();
-        fSignalID = -1;
-    }
-
     // TODO other objects should probably skip using GetMaxIndex direclty
     Int_t GetMaxIndex(Int_t from = 0, Int_t to = 0);
 
@@ -172,6 +165,6 @@ Double_t GetIntegralWithThreshold(Int_t from, Int_t to, Double_t baseline, Doubl
     // Destructor
     ~TRestDetectorSignal();
 
-    ClassDef(TRestDetectorSignal, 1);
+    ClassDef(TRestDetectorSignal, 2);
 };
 #endif
diff --git a/inc/TRestDetectorSignalEvent.h b/inc/TRestDetectorSignalEvent.h
@@ -19,11 +19,9 @@
 #ifndef RestDAQ_TRestDetectorSignalEvent
 #define RestDAQ_TRestDetectorSignalEvent
 
-#include <TArrayD.h>
 #include <TAxis.h>
 #include <TGraph.h>
 #include <TMultiGraph.h>
-#include <TObject.h>
 #include <TPad.h>
 #include <TRestEvent.h>