From e403185b9837513665bb950db6d730043994c1a6 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Fri, 15 Nov 2013 14:42:04 +0000
Subject: [PATCH] * New version TTiaraData
---
NPLib/Tiara/TTiaraBarrelData.cxx | 65 +++++++++----
NPLib/Tiara/TTiaraBarrelData.h | 4 -
NPLib/Tiara/TTiaraHyballData.cxx | 92 ++++++++++++------
NPLib/Tiara/TTiaraHyballData.h | 160 +++++++++++++++++++------------
4 files changed, 205 insertions(+), 116 deletions(-)
diff --git a/NPLib/Tiara/TTiaraBarrelData.cxx b/NPLib/Tiara/TTiaraBarrelData.cxx
index cce4075a5..d1a71bf2b 100644
--- a/NPLib/Tiara/TTiaraBarrelData.cxx
+++ b/NPLib/Tiara/TTiaraBarrelData.cxx
@@ -108,49 +108,74 @@ void TTiaraBarrelData::Clear(){
/////////////////////////
void TTiaraBarrelData::Dump() const{
-/* cout << "************* TTiaraBarrelData Event ************"<< endl;
+ cout << "************* TTiaraBarrelData Event ************"<< endl;
cout << "*** Inner Barrel Front Upstream ***" << endl ;
- for( unsigned int i = 0; i < fTiaraBarrel_Front_Upstream_DetectorNbr.size(); i ++){
+ for( unsigned int i = 0; i < fTiaraBarrel_FrontUpstreamE_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Front_Upstream_DetectorNbr[i] << endl ;
+ << fTiaraBarrel_FrontUpstreamE_DetectorNbr[i] << " | " ;
cout << "Strip Number = "
- << fTiaraBarrel_Front_Upstream_StripNbr[i] << endl;
+ << fTiaraBarrel_FrontUpstreamE_StripNbr[i] << " | ";
cout << "Energy = "
- << fTiaraBarrel_Front_Upstream_Energy[i]<< endl ;
+ << fTiaraBarrel_FrontUpstreamE_Energy[i]<< endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraBarrel_FrontUpstreamT_DetectorNbr.size(); i ++){
+ cout << "Detector Number = "
+ << fTiaraBarrel_FrontUpstreamT_DetectorNbr[i] << " | " ;
+ cout << "Strip Number = "
+ << fTiaraBarrel_FrontUpstreamT_StripNbr[i] << " | ";
cout << "Time = "
- << fTiaraBarrel_Front_Upstream_Time[i] << endl ;
+ << fTiaraBarrel_FrontUpstreamT_Time[i] << endl ;
}
cout << "*** Inner Barrel Front Downstream ***" << endl ;
- for( unsigned int i = 0; i < fTiaraBarrel_Front_Downstream_DetectorNbr.size(); i ++){
+ for( unsigned int i = 0; i < fTiaraBarrel_FrontDownstreamE_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Front_Downstream_DetectorNbr[i] << endl;
+ << fTiaraBarrel_FrontDownstreamE_DetectorNbr[i] << " | ";
cout << "Strip Number = "
- << fTiaraBarrel_Front_Downstream_StripNbr[i] << endl;
+ << fTiaraBarrel_FrontDownstreamE_StripNbr[i] << " | ";
cout << "Energy = "
- << fTiaraBarrel_Front_Downstream_Energy[i] << endl ;
+ << fTiaraBarrel_FrontDownstreamE_Energy[i] << endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraBarrel_FrontDownstreamT_DetectorNbr.size(); i ++){
+ cout << "Detector Number = "
+ << fTiaraBarrel_FrontDownstreamT_DetectorNbr[i] << " | ";
+ cout << "Strip Number = "
+ << fTiaraBarrel_FrontDownstreamT_StripNbr[i] << " | ";
cout << "Time = "
- << fTiaraBarrel_Front_Downstream_Time[i] << endl ;
+ << fTiaraBarrel_FrontDownstreamT_Time[i] << endl ;
}
cout << "*** Inner Barrel Back ***" << endl ;
- for( unsigned int i = 0; i < fTiaraBarrel_Back_DetectorNbr.size(); i ++){
+ for( unsigned int i = 0; i < fTiaraBarrel_BackE_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Back_DetectorNbr[i] << endl;
+ << fTiaraBarrel_BackE_DetectorNbr[i] << " | ";
cout << "Energy = "
- << fTiaraBarrel_Back_Energy[i] << endl ;
+ << fTiaraBarrel_BackE_Energy[i] << endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraBarrel_BackT_DetectorNbr.size(); i ++){
+ cout << "Detector Number = "
+ << fTiaraBarrel_BackT_DetectorNbr[i] << " | ";
cout << "Time = "
- << fTiaraBarrel_Back_Time[i] << endl ;
+ << fTiaraBarrel_BackT_Time[i] << endl ;
}
+
cout << "*** Outer Barrel ***" << endl;
- for( unsigned int i = 0; i < fTiaraBarrel_Outer_DetectorNbr.size() ; i ++){
+ for( unsigned int i = 0; i < fTiaraBarrel_OuterE_DetectorNbr.size() ; i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Outer_DetectorNbr[i] << endl;
+ << fTiaraBarrel_OuterE_DetectorNbr[i] << " | ";
cout << "Energy = "
- << fTiaraBarrel_Outer_Energy[i] << endl ;
+ << fTiaraBarrel_OuterE_Energy[i] << endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraBarrel_OuterT_DetectorNbr.size() ; i ++){
+ cout << "Detector Number = "
+ << fTiaraBarrel_OuterT_DetectorNbr[i] << " | ";
cout << "Time = "
- << fTiaraBarrel_Outer_Time[i] << endl ;
- }*/
+ << fTiaraBarrel_OuterT_Time[i] << endl ;
+ }
}
diff --git a/NPLib/Tiara/TTiaraBarrelData.h b/NPLib/Tiara/TTiaraBarrelData.h
index a26b892fc..7e5601d81 100644
--- a/NPLib/Tiara/TTiaraBarrelData.h
+++ b/NPLib/Tiara/TTiaraBarrelData.h
@@ -246,10 +246,6 @@ class TTiaraBarrelData : public TNamed {
{return fTiaraBarrel_OuterT_Time[i];}
-
-
-
-
ClassDef(TTiaraBarrelData,1) // TiaraData structure
};
diff --git a/NPLib/Tiara/TTiaraHyballData.cxx b/NPLib/Tiara/TTiaraHyballData.cxx
index b915df29e..477afced0 100644
--- a/NPLib/Tiara/TTiaraHyballData.cxx
+++ b/NPLib/Tiara/TTiaraHyballData.cxx
@@ -32,16 +32,22 @@ ClassImp(TTiaraHyballData)
TTiaraHyballData::TTiaraHyballData(){
// Reserve the space for the full array
- fTiaraHyball_Ring_DetectorNbr.reserve(6*32);
- fTiaraHyball_Ring_StripNbr.reserve(6*32);
- fTiaraHyball_Ring_Energy.reserve(6*32);
- fTiaraHyball_Ring_Time.reserve(6*32);
-
- fTiaraHyball_Sector_DetectorNbr.reserve(6*24);
- fTiaraHyball_Sector_StripNbr.reserve(6*24);
- fTiaraHyball_Sector_Energy.reserve(6*24);
- fTiaraHyball_Sector_Time.reserve(6*24);
- }
+ fTiaraHyball_RingE_DetectorNbr.reserve(6*32);
+ fTiaraHyball_RingE_StripNbr.reserve(6*32);
+ fTiaraHyball_RingE_Energy.reserve(6*32);
+
+ fTiaraHyball_SectorE_DetectorNbr.reserve(6*24);
+ fTiaraHyball_SectorE_StripNbr.reserve(6*24);
+ fTiaraHyball_SectorE_Energy.reserve(6*24);
+
+ fTiaraHyball_RingT_DetectorNbr.reserve(6*32);
+ fTiaraHyball_RingT_StripNbr.reserve(6*32);
+ fTiaraHyball_RingT_Time.reserve(6*32);
+
+ fTiaraHyball_SectorT_DetectorNbr.reserve(6*24);
+ fTiaraHyball_SectorT_StripNbr.reserve(6*24);
+ fTiaraHyball_SectorT_Time.reserve(6*24);
+}
/////////////////////////
TTiaraHyballData::~TTiaraHyballData(){
@@ -50,15 +56,21 @@ TTiaraHyballData::~TTiaraHyballData(){
/////////////////////////
void TTiaraHyballData::Clear(){
- fTiaraHyball_Ring_DetectorNbr.clear();
- fTiaraHyball_Ring_StripNbr.clear();
- fTiaraHyball_Ring_Energy.clear();
- fTiaraHyball_Ring_Time.clear();
-
- fTiaraHyball_Sector_DetectorNbr.clear();
- fTiaraHyball_Sector_StripNbr.clear();
- fTiaraHyball_Sector_Energy.clear();
- fTiaraHyball_Sector_Time.clear();
+ fTiaraHyball_RingE_DetectorNbr.clear();
+ fTiaraHyball_RingE_StripNbr.clear();
+ fTiaraHyball_RingE_Energy.clear();
+
+ fTiaraHyball_SectorE_DetectorNbr.clear();
+ fTiaraHyball_SectorE_StripNbr.clear();
+ fTiaraHyball_SectorE_Energy.clear();
+
+ fTiaraHyball_RingT_DetectorNbr.clear();
+ fTiaraHyball_RingT_StripNbr.clear();
+ fTiaraHyball_RingT_Time.clear();
+
+ fTiaraHyball_SectorT_DetectorNbr.clear();
+ fTiaraHyball_SectorT_StripNbr.clear();
+ fTiaraHyball_SectorT_Time.clear();
}
@@ -66,25 +78,43 @@ void TTiaraHyballData::Clear(){
void TTiaraHyballData::Dump() const{
cout << "************* TTiaraHyballData Event ************"<< endl;
cout << "*** Ring ***" << endl;
- for( unsigned int i = 0; i < fTiaraHyball_Ring_DetectorNbr.size() ; i ++){
+ for( unsigned int i = 0; i < fTiaraHyball_RingE_DetectorNbr.size() ; i ++){
cout << "Detector Number = "
- << fTiaraHyball_Ring_DetectorNbr[i] << endl;
- cout << "Ring Number = "
- << fTiaraHyball_Ring_StripNbr[i] << endl;
+ << fTiaraHyball_RingE_DetectorNbr[i] << " | ";
+ cout << "RingE Number = "
+ << fTiaraHyball_RingE_StripNbr[i] << " | ";
cout << "Energy = "
- << fTiaraHyball_Ring_Energy[i] << endl ;
+ << fTiaraHyball_RingE_Energy[i] << endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraHyball_RingT_DetectorNbr.size() ; i ++){
+ cout << "Detector Number = "
+ << fTiaraHyball_RingT_DetectorNbr[i] << " | ";
+ cout << "RingT Number = "
+ << fTiaraHyball_RingT_StripNbr[i] << " | ";
cout << "Time = "
- << fTiaraHyball_Ring_Time[i] << endl ;
+ << fTiaraHyball_RingT_Time[i] << endl ;
}
+
+
+
cout << "*** Sector ***" << endl;
- for( unsigned int i = 0; i < fTiaraHyball_Sector_DetectorNbr.size() ; i ++){
+ for( unsigned int i = 0; i < fTiaraHyball_SectorE_DetectorNbr.size() ; i ++){
cout << "Detector Number = "
- << fTiaraHyball_Sector_DetectorNbr[i] << endl;
- cout << "Sector Number = "
- << fTiaraHyball_Sector_StripNbr[i] << endl;
+ << fTiaraHyball_SectorE_DetectorNbr[i] << " | ";
+ cout << "SectorE Number = "
+ << fTiaraHyball_SectorE_StripNbr[i] << " | ";
cout << "Energy = "
- << fTiaraHyball_Sector_Energy[i] << endl ;
- cout << "Time = " << fTiaraHyball_Sector_Time[i] << endl ;
+ << fTiaraHyball_SectorE_Energy[i] << endl ;
+ }
+
+ for( unsigned int i = 0; i < fTiaraHyball_SectorT_DetectorNbr.size() ; i ++){
+ cout << "Detector Number = "
+ << fTiaraHyball_SectorT_DetectorNbr[i] << " | ";
+ cout << "SectorT Number = "
+ << fTiaraHyball_SectorT_StripNbr[i] << " | ";
+ cout << "Time = "
+ << fTiaraHyball_SectorT_Time[i] << endl;
}
}
diff --git a/NPLib/Tiara/TTiaraHyballData.h b/NPLib/Tiara/TTiaraHyballData.h
index f886a5f3b..967ede4f0 100644
--- a/NPLib/Tiara/TTiaraHyballData.h
+++ b/NPLib/Tiara/TTiaraHyballData.h
@@ -32,87 +32,125 @@ using namespace std ;
#include "TNamed.h"
class TTiaraHyballData : public TNamed {
-
+
public:
TTiaraHyballData();
~TTiaraHyballData();
-
+
public:
void Clear();
void Clear(const Option_t*) {};
void Dump() const;
private:
- vector<unsigned short> fTiaraHyball_Ring_DetectorNbr;
- vector<unsigned short> fTiaraHyball_Ring_StripNbr;
- vector<double> fTiaraHyball_Ring_Energy;
- vector<double> fTiaraHyball_Ring_Time;
+ vector<unsigned short> fTiaraHyball_RingE_DetectorNbr;
+ vector<unsigned short> fTiaraHyball_RingE_StripNbr;
+ vector<double> fTiaraHyball_RingE_Energy;
+
+ vector<unsigned short> fTiaraHyball_RingT_DetectorNbr;
+ vector<unsigned short> fTiaraHyball_RingT_StripNbr;
+ vector<double> fTiaraHyball_RingT_Time;
+
+ vector<unsigned short> fTiaraHyball_SectorE_DetectorNbr;
+ vector<unsigned short> fTiaraHyball_SectorE_StripNbr;
+ vector<double> fTiaraHyball_SectorE_Energy;
+
+ vector<unsigned short> fTiaraHyball_SectorT_DetectorNbr;
+ vector<unsigned short> fTiaraHyball_SectorT_StripNbr;
+ vector<double> fTiaraHyball_SectorT_Time;
- vector<unsigned short> fTiaraHyball_Sector_DetectorNbr;
- vector<unsigned short> fTiaraHyball_Sector_StripNbr;
- vector<double> fTiaraHyball_Sector_Energy;
- vector<double> fTiaraHyball_Sector_Time;
///////////// Fast Setters ////////////////////
public:
- inline void Set_Ring(const unsigned short& DetNbr, const unsigned short& StripNbr, const double& Energy, const double& Time){
- Set_Ring_DetectorNbr(DetNbr);
- Set_Ring_StripNbr(StripNbr);
- Set_Ring_Energy(Energy);
- Set_Ring_Time(Time);
+ inline void Set_RingE(const unsigned short& DetNbr, const unsigned short& StripNbr, const double& Energy){
+ Set_RingE_DetectorNbr(DetNbr);
+ Set_RingE_StripNbr(StripNbr);
+ Set_RingE_Energy(Energy);
};
- inline void Set_Sector(const unsigned short& DetNbr, const unsigned short& StripNbr, const double& Energy, const double& Time){
- Set_Sector_DetectorNbr(DetNbr);
- Set_Sector_StripNbr(StripNbr);
- Set_Sector_Energy(Energy);
- Set_Sector_Time(Time);
+ inline void Set_RingT(const unsigned short& DetNbr, const unsigned short& StripNbr,const double& Time){
+ Set_RingT_DetectorNbr(DetNbr);
+ Set_RingT_StripNbr(StripNbr);
+ Set_RingT_Time(Time);
};
+ inline void Set_SectorE(const unsigned short& DetNbr, const unsigned short& StripNbr, const double& Energy){
+ Set_SectorE_DetectorNbr(DetNbr);
+ Set_SectorE_StripNbr(StripNbr);
+ Set_SectorE_Energy(Energy);
+ };
+
+ inline void Set_SectorT(const unsigned short& DetNbr, const unsigned short& StripNbr, const double& Time){
+ Set_SectorT_DetectorNbr(DetNbr);
+ Set_SectorT_StripNbr(StripNbr);
+ Set_SectorT_Time(Time);
+ };
///////////// Getter and Setter ////////////////
public:
- inline void Set_Ring_DetectorNbr(const unsigned short& Ring_DetectorNbr)
- {fTiaraHyball_Ring_DetectorNbr.push_back(Ring_DetectorNbr);}
- inline unsigned short Get_Ring_DetectorNbr(const unsigned int& i) const
- {return fTiaraHyball_Ring_DetectorNbr[i];}
-
- inline void Set_Ring_StripNbr(const unsigned short& Ring_StripNbr)
- {fTiaraHyball_Ring_StripNbr.push_back(Ring_StripNbr);}
- inline unsigned short Get_Ring_StripNbr(const unsigned int& i) const
- {return fTiaraHyball_Ring_StripNbr[i];}
-
- inline void Set_Ring_Energy(const double& Ring_Energy)
- {fTiaraHyball_Ring_Energy.push_back(Ring_Energy);}
- inline double Get_Ring_Energy(const unsigned int& i) const
- {return fTiaraHyball_Ring_Energy[i];}
-
- inline void Set_Ring_Time(const double& Ring_Time)
- {fTiaraHyball_Ring_Time.push_back(Ring_Time);}
- inline double Get_Ring_Time(const unsigned int& i) const
- {return fTiaraHyball_Ring_Time[i];}
-
- inline void Set_Sector_DetectorNbr(const unsigned short& Sector_DetectorNbr)
- {fTiaraHyball_Sector_DetectorNbr.push_back(Sector_DetectorNbr);}
- inline unsigned short Get_Sector_DetectorNbr(const unsigned int& i) const
- {return fTiaraHyball_Sector_DetectorNbr[i];}
-
- inline void Set_Sector_StripNbr(const unsigned short& Sector_StripNbr)
- {fTiaraHyball_Sector_StripNbr.push_back(Sector_StripNbr);}
- inline unsigned short Get_Sector_StripNbr(const unsigned int& i) const
- {return fTiaraHyball_Sector_StripNbr[i];}
-
- inline void Set_Sector_Energy(const double& Sector_Energy)
- {fTiaraHyball_Sector_Energy.push_back(Sector_Energy);}
- inline double Get_Sector_Energy(const unsigned int& i) const
- {return fTiaraHyball_Sector_Energy[i];}
-
- inline void Set_Sector_Time(const double& Sector_Time)
- {fTiaraHyball_Sector_Time.push_back(Sector_Time);}
- inline double Get_Sector_Time(const unsigned int& i) const
- {return fTiaraHyball_Sector_Time[i];}
-
-
+ inline void Set_RingE_DetectorNbr(const unsigned short& RingE_DetectorNbr)
+ {fTiaraHyball_RingE_DetectorNbr.push_back(RingE_DetectorNbr);}
+ inline unsigned short Get_RingE_DetectorNbr(const unsigned int& i) const
+ {return fTiaraHyball_RingE_DetectorNbr[i];}
+
+
+ inline void Set_RingE_StripNbr(const unsigned short& RingE_StripNbr)
+ {fTiaraHyball_RingE_StripNbr.push_back(RingE_StripNbr);}
+ inline unsigned short Get_RingE_StripNbr(const unsigned int& i) const
+ {return fTiaraHyball_RingE_StripNbr[i];}
+
+ inline void Set_RingE_Energy(const double& RingE_Energy)
+ {fTiaraHyball_RingE_Energy.push_back(RingE_Energy);}
+ inline double Get_RingE_Energy(const unsigned int& i) const
+ {return fTiaraHyball_RingE_Energy[i];}
+
+ inline void Set_RingT_DetectorNbr(const unsigned short& RingT_DetectorNbr)
+ {fTiaraHyball_RingT_DetectorNbr.push_back(RingT_DetectorNbr);}
+ inline unsigned short Get_RingT_DetectorNbr(const unsigned int& i) const
+ {return fTiaraHyball_RingT_DetectorNbr[i];}
+
+ inline void Set_RingT_StripNbr(const unsigned short& RingT_StripNbr)
+ {fTiaraHyball_RingT_StripNbr.push_back(RingT_StripNbr);}
+ inline unsigned short Get_RingT_StripNbr(const unsigned int& i) const
+ {return fTiaraHyball_RingT_StripNbr[i];}
+
+ inline void Set_RingT_Time(const double& RingT_Time)
+ {fTiaraHyball_RingT_Time.push_back(RingT_Time);}
+ inline double Get_RingT_Time(const unsigned int& i) const
+ {return fTiaraHyball_RingT_Time[i];}
+
+ inline void Set_SectorE_DetectorNbr(const unsigned short& SectorE_DetectorNbr)
+ {fTiaraHyball_SectorE_DetectorNbr.push_back(SectorE_DetectorNbr);}
+ inline unsigned short Get_SectorE_DetectorNbr(const unsigned int& i) const
+ {return fTiaraHyball_SectorE_DetectorNbr[i];}
+
+ inline void Set_SectorE_StripNbr(const unsigned short& SectorE_StripNbr)
+ {fTiaraHyball_SectorE_StripNbr.push_back(SectorE_StripNbr);}
+ inline unsigned short Get_SectorE_StripNbr(const unsigned int& i) const
+ {return fTiaraHyball_SectorE_StripNbr[i];}
+
+ inline void Set_SectorE_Energy(const double& SectorE_Energy)
+ {fTiaraHyball_SectorE_Energy.push_back(SectorE_Energy);}
+ inline double Get_SectorE_Energy(const unsigned int& i) const
+ {return fTiaraHyball_SectorE_Energy[i];}
+
+ inline void Set_SectorT_DetectorNbr(const unsigned short& SectorT_DetectorNbr)
+ {fTiaraHyball_SectorT_DetectorNbr.push_back(SectorT_DetectorNbr);}
+ inline unsigned short Get_SectorT_DetectorNbr(const unsigned int& i) const
+ {return fTiaraHyball_SectorT_DetectorNbr[i];}
+
+ inline void Set_SectorT_StripNbr(const unsigned short& SectorT_StripNbr)
+ {fTiaraHyball_SectorT_StripNbr.push_back(SectorT_StripNbr);}
+ inline unsigned short Get_SectorT_StripNbr(const unsigned int& i) const
+ {return fTiaraHyball_SectorT_StripNbr[i];}
+
+ inline void Set_SectorT_Time(const double& SectorT_Time)
+ {fTiaraHyball_SectorT_Time.push_back(SectorT_Time);}
+ inline double Get_SectorT_Time(const unsigned int& i) const
+ {return fTiaraHyball_SectorT_Time[i];}
+
+
+ ClassDef(TTiaraHyballData,1) // TiaraData structure
};
#endif
--
GitLab