[EpicData] clean-up

NPLib/Detectors/Epic/TEpicData.cxx

@@ -27,18 +27,8 @@
 #include <string>
 using namespace std; 
 
-//ClassImp(TEpicAnodeData)
 ClassImp(TEpicData)
 
-////////////////////////////////////////////////////////////////////////
-//TEpicAnodeData::TEpicAnodeData() {
-//}
-////////////////////////////////////////////////////////////////////////
-//TEpicAnodeData::~TEpicAnodeData() {
-//}
-
-
-
 //////////////////////////////////////////////////////////////////////
 TEpicData::TEpicData() {
 }
@@ -46,15 +36,11 @@ TEpicData::TEpicData() {
 TEpicData::~TEpicData() {
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 void TEpicData::Clear() {
   fEpic_Data.clear();
 }
 
-
-
 //////////////////////////////////////////////////////////////////////
 void TEpicData::Dump() const {
   // This method is very useful for debuging and worth the dev.

NPLib/Detectors/Epic/TEpicData.h

@@ -29,72 +29,6 @@ using namespace std;
 // ROOT
 #include "TObject.h"
 
-/*
-class TEpicAnodeData : public TObject {
-
-  private:
-    UShort_t    m_AnodeNbr;
-    Double_t    m_Q1;
-    Double_t    m_Q2;
-    Double_t    m_Qmax;
-    Double_t    m_Time;
-    Double_t    m_Time_HF;
-    Double_t    m_ToF;
-    Bool_t      m_isFakeFission;
-
-    vector<Double_t>  m_PosZ;
-    vector<Double_t>  m_DE;
-  
-  //////////////////////////////////////////////////////////////
-  // Constructor and destructor
-  public: 
-    TEpicAnodeData();
-    TEpicAnodeData(const UShort_t& n, const Double_t& q1,  const Double_t& q2,  const Double_t& qmax,
-                   const Double_t& t, const Double_t& thf, const Double_t& tof, const Bool_t& fake,
-                   const vector<double>& z, const vector<double>& de){
-      m_AnodeNbr=n;   m_Q1=q1;         m_Q2=q2;      m_Qmax=qmax;
-      m_Time=t;       m_Time_HF=thf;   m_ToF=tof;    m_isFakeFission=fake;
-      m_PosZ=z;       m_DE=de;
-
-    };
-    ~TEpicAnodeData();
-  
-  //////////////////////////////////////////////////////////////
-  // Getters and Setters
-  // Prefer inline declaration to avoid unnecessary called of 
-  // frequently used methods
-  // add //! to avoid ROOT creating dictionnary for the methods
-  public:
-    //////////////////////    SETTERS    ////////////////////////
-    inline void SetAnodeNbr(const UShort_t& n) {m_AnodeNbr = n;}//!
-    inline void SetQ1(const Double_t& q)       {m_Q1 = q;}//!
-    inline void SetQ2(const Double_t& q)       {m_Q2 = q;}//!
-    inline void SetQmax(const Double_t& q)     {m_Qmax = q;}//!
-    inline void SetTime(const Double_t& t)     {m_Time = t;}//!
-    inline void SetTimeHF(const Double_t& t)   {m_Time_HF = t;}//!
-    inline void SetToF(const Double_t& tof)    {m_ToF = tof;}//!
-    inline void SetPosZ(const double& z)       {m_PosZ.push_back(z);}
-    inline void SetDE(const double& DE)        {m_DE.push_back(DE);}
-    
-    //////////////////////    GETTERS    ////////////////////////
-    inline UShort_t GetMultSteps() const     {return m_PosZ.size();}
-    inline UShort_t GetAnodeNbr() const      {return m_AnodeNbr;}//!
-    inline Double_t GetQ1() const            {return m_Q1;}//!
-    inline Double_t GetQ2() const            {return m_Q2;}//!
-    inline Double_t GetQmax() const          {return m_Qmax;}//!
-    inline Double_t GetTime() const          {return m_Time;}//!
-    inline Double_t GetTimeHF() const        {return m_Time_HF;}//!
-    inline Double_t GetToF() const           {return m_ToF;}//!
-    inline Bool_t   GetFakeFissionStatus() const {return m_isFakeFission;}//!
-    inline vector<double> GetPosZ() const    {return m_PosZ;}//!
-    inline vector<double> GetDE() const      {return m_DE;}//!
-
-  //////////////////////////////////////////////////////////////
-  // Required for ROOT dictionnary
-  ClassDef(TEpicAnodeData,1)  // EpicAnodeData structure
-
-};
-*/
 
 class TEpicData : public TObject {
 
@@ -157,30 +91,10 @@ class TEpicData : public TObject {
              const std::vector<double>& z, const std::vector<double>& de) {
         fEpic_Data.push_back({n, q1, q2, qmax, t, thf, tof, fake, z, de});
     }
-    const EpicAnodeData& operator[](const unsigned int& i) const {
-        return fEpic_Data[i];
-    }
-
-    //inline void Set(const UShort_t& n, const Double_t& q1,  const Double_t& q2,  const Double_t& qmax,
-    //                const Double_t& t, const Double_t& thf, const Double_t& tof, const Bool_t& fake,
-    //                const vector<double>& z, const vector<double>& de){
-    //  fEpic_Data.push_back(TEpicAnodeData(n, q1, q2,  qmax, t, thf, tof, fake, z, de));
-    //}
-    //const TEpicAnodeData* operator[](const unsigned int& i) const {return &fEpic_Data[i];}
+    const EpicAnodeData& operator[](const unsigned int& i) const {return fEpic_Data[i];}
 
     ////////////////////////    GETTERS    ////////////////////////
     inline UShort_t GetMultiplicity() const                    {return fEpic_Data.size();}
-    //inline UShort_t GetAnodeNbr(const unsigned short &i) const {return fEpic_Data[i].GetAnodeNbr();}
-    //inline Double_t GetQ1(const unsigned int &i) const         {return fEpic_Data[i].GetQ1();}
-    //inline Double_t GetQ2(const unsigned int &i) const         {return fEpic_Data[i].GetQ2();}
-    //inline Double_t GetQmax(const unsigned int &i) const       {return fEpic_Data[i].GetQmax();}
-    //inline Double_t GetTime(const unsigned int &i) const       {return fEpic_Data[i].GetTime();}
-    //inline Double_t GetTimeHF(const unsigned int &i) const     {return fEpic_Data[i].GetTimeHF();}
-    //inline Double_t GetToF(const unsigned int &i) const        {return fEpic_Data[i].GetToF();}
-    //inline Bool_t GetFakeFissionStatus(const unsigned int &i) const {return fEpic_Data[i].GetFakeFissionStatus();}
-    //inline vector<double> GetPosZ(const unsigned int &i) const {return fEpic_Data[i].GetPosZ();}
-    //inline vector<double> GetDE(const unsigned int &i) const   {return fEpic_Data[i].GetDE();}
-    // Getters to access specific properties of fEpic_Data
     UShort_t GetAnodeNbr(const unsigned short& i) const { return fEpic_Data[i].AnodeNbr; }
     Double_t GetQ1(const unsigned int& i) const         { return fEpic_Data[i].Q1; }
     Double_t GetQ2(const unsigned int& i) const         { return fEpic_Data[i].Q2; }