+ Change private members to have separate energy and time

NPLib/LaBr3/TLaBr3Data.cxx

@@ -38,21 +38,27 @@ TLaBr3Data::~TLaBr3Data()
 
 void TLaBr3Data::Clear()
 {
-    fLaBr3_Energy.clear();
-    fLaBr3_Number.clear();
-    fLaBr3_Time.clear();
+   // Energy
+   fLaBr3_E_Number.clear();
+   fLaBr3_E_Energy.clear();
+   // Time
+   fLaBr3_T_Number.clear();
+   fLaBr3_T_Time.clear();
 }
 
 
 
 void TLaBr3Data::Dump() const
 {
-   cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
+   cout << "XXXXXXXXXXXXXXXXXXXXXXXX TLaBr3: New Event XXXXXXXXXXXXXXXXX" << endl;
 
-   for(unsigned short i = 0 ; i<fLaBr3_Energy.size() ; i ++)
-      {
-         cout << "LaBr3 Number " << fLaBr3_Number[i] << " Energy: " << fLaBr3_Energy[i]  << " Time: "<< fLaBr3_Time[i] << endl;
-      
-      }
+   // Energy
+   for (unsigned short i = 0 ; i< fLaBr3_E_Energy.size() ; i ++) {
+         cout << "LaBr3 Number " << fLaBr3_E_Number[i] << " Energy: " << fLaBr3_E_Energy[i]  << endl;
+   }
    
+   // Time
+   for (unsigned short i = 0 ; i< fLaBr3_T_Time.size() ; i ++) {
+         cout << "LaBr3 Number " << fLaBr3_T_Number[i] << " Time: " << fLaBr3_T_Time[i]  << endl;
+   }
 }

NPLib/LaBr3/TLaBr3Data.h

@@ -28,10 +28,12 @@ using namespace std ;
 
 class TLaBr3Data : public TObject {
  private:
-   // ADC
-   vector<double>  fLaBr3_Energy;   
-   vector<double>  fLaBr3_Time ;
-   vector<short>   fLaBr3_Number ;
+   // Energy 
+   vector<short>   fLaBr3_E_Number;
+   vector<double>  fLaBr3_E_Energy;   
+   // Time
+   vector<short>   fLaBr3_T_Number;
+   vector<double>  fLaBr3_T_Time;
    
  public:
    TLaBr3Data();
@@ -42,27 +44,23 @@ class TLaBr3Data : public TObject {
    void   Dump() const;
 
    /////////////////////           GETTERS           ////////////////////////
-   // (E)
-   double   GetEnergy(int i)        {return fLaBr3_Energy[i];}
-   // (T)
-   double   GetTime(int i)          {return fLaBr3_Time[i];}
-   // (N)
-   int      GetLaBr3Number(int i)   {return fLaBr3_Number[i];}
-
-   //Mult
-   // E
-   double   GetEnergyMult()      {return fLaBr3_Energy.size();}
-   // (T)
-   double   GetTimeMult()        {return fLaBr3_Time.size();}
-   // (N)
-   int      GetLaBr3NumberMult() {return fLaBr3_Number.size();}
+   // Energy
+   int      GetEnergyMult()   {return fLaBr3_E_Number.size();}
+   int      GetENumber(int i) {return fLaBr3_E_Number[i];}
+   double   GetEEnergy(int i) {return fLaBr3_E_Energy[i];}
+   // Time 
+   int      GetTimeMult()     {return fLaBr3_T_Number.size();}
+   int      GetTNumber(int i) {return fLaBr3_T_Number[i];}
+   double   GetTTime(int i)   {return fLaBr3_T_Time[i];}
 
    /////////////////////           SETTERS           ////////////////////////
-   // (E)
-   void     SetEnergy(double E)     {fLaBr3_Energy.push_back(E);}
-   void     SetTime(double T)       {fLaBr3_Time.push_back(T);}
-   void     SetLaBr3Number(int N)   {fLaBr3_Number.push_back(N);}
-   //
+   // Energy
+   void     SetENumber(int N)    {fLaBr3_E_Number.push_back(N);}
+   void     SetEEnergy(double E) {fLaBr3_E_Energy.push_back(E);}
+   // time
+   void     SetTNumber(int N)    {fLaBr3_T_Number.push_back(N);}
+   void     SetTTime(double T)   {fLaBr3_T_Time.push_back(T);}
+
    ClassDef(TLaBr3Data,1)  // LaBr3Data structure
 };
 

NPLib/LaBr3/TLaBr3Physics.cxx

@@ -289,9 +289,9 @@ void TLaBr3Physics::BuildSimplePhysicalEvent()
    {
       for(unsigned int i = 0 ; i < EventData->GetEnergyMult() ; i++)
          {
-            DetectorNumber.push_back( EventData->GetLaBr3Number(i) )   ;
-            Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector" + itoa( EventData->GetLaBr3Number(i) ) +"_E",EventData->GetEnergy(i) ) );
-            Time.push_back( CalibrationManager::getInstance()->ApplyCalibration(   "LaBr3/Detector" + itoa( EventData->GetLaBr3Number(i) ) +"_T",EventData->GetTime(i) ) );
+//            DetectorNumber.push_back( EventData->GetLaBr3Number(i) )   ;
+//            Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector" + itoa( EventData->GetLaBr3Number(i) ) +"_E",EventData->GetEnergy(i) ) );
+//            Time.push_back( CalibrationManager::getInstance()->ApplyCalibration(   "LaBr3/Detector" + itoa( EventData->GetLaBr3Number(i) ) +"_T",EventData->GetTime(i) ) );
          }
 
    }