diff --git a/NPLib/Tiara/Makefile b/NPLib/Tiara/Makefile
index e9c453d4919e8bd6ae1f9aef393a54b1e3b692fb..06b0916bf6e9785b0a581ca58295634fb7c71de7 100644
--- a/NPLib/Tiara/Makefile
+++ b/NPLib/Tiara/Makefile
@@ -9,13 +9,13 @@ all: $(SHARELIB)
############### Detector ##############
## Sharc ##
-libTiara.so: TTiaraData.o TTiaraDataDict.o
+libTiara.so: TTiaraBarrelData.o TTiaraBarrelDataDict.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-TTiaraDataDict.cxx: TTiaraData.h
+TTiaraBarrelDataDict.cxx: TTiaraBarrelData.h
rootcint -f $@ -c $^
# dependances
-TTiaraData.o: TTiaraData.cxx TTiaraData.h
+TTiaraBarrelData.o: TTiaraBarrelData.cxx TTiaraBarrelData.h
#######################################
############# Clean and More ##########
diff --git a/NPLib/Tiara/TTiaraBarrel.cxx b/NPLib/Tiara/TTiaraBarrelData.cxx
similarity index 75%
rename from NPLib/Tiara/TTiaraBarrel.cxx
rename to NPLib/Tiara/TTiaraBarrelData.cxx
index 111967d44c2e84069038676c401e3492e9bcf92a..fce9c49af13ba1c9c502ed12b9d53104082a963b 100644
--- a/NPLib/Tiara/TTiaraBarrel.cxx
+++ b/NPLib/Tiara/TTiaraBarrelData.cxx
@@ -46,7 +46,7 @@ void TTiaraBarrelData::Clear(){
fTiaraBarrel_Front_Downstream_DetectorNbr.clear();
fTiaraBarrel_Front_Downstream_StripNbr.clear();
fTiaraBarrel_Front_Downstream_Energy.clear();
- fTiaraBarrel_Front_Dowstream_Time.clear();
+ fTiaraBarrel_Front_Downstream_Time.clear();
fTiaraBarrel_Back_DetectorNbr.clear();
fTiaraBarrel_Back_Energy.clear();
@@ -60,50 +60,59 @@ void TTiaraBarrelData::Clear(){
/////////////////////////
void TTiaraBarrelData::Dump() const{
- cout << "************* TTiaraBarrel Event ************"<< endl;
- cout << "*** Inner Barrel Front Upstream ***"
+ cout << "************* TTiaraBarrelData Event ************"<< endl;
+ cout << "*** Inner Barrel Front Upstream ***" << endl ;
for( unsigned int i = 0; i < fTiaraBarrel_Front_Upstream_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Front_Upstream_DetectorNbr << endl ;
+ << fTiaraBarrel_Front_Upstream_DetectorNbr[i] << endl ;
cout << "Strip Number = "
- << fTiaraBarrel_Front_Upstream_StripNbr << endl;
+ << fTiaraBarrel_Front_Upstream_StripNbr[i] << endl;
cout << "Energy = "
- << fTiaraBarrel_Front_Upstream_Energy << endl ;
+ << fTiaraBarrel_Front_Upstream_Energy[i]<< endl ;
cout << "Time = "
- << fTiaraBarrel_Front_Upstream_Time << endl ;
+ << fTiaraBarrel_Front_Upstream_Time[i] << endl ;
}
- cout << "*** Inner Barrel Front Downstream ***"
+ cout << "*** Inner Barrel Front Downstream ***" << endl ;
for( unsigned int i = 0; i < fTiaraBarrel_Front_Downstream_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Front_Downstream_DetectorNbr << endl;
+ << fTiaraBarrel_Front_Downstream_DetectorNbr[i] << endl;
cout << "Strip Number = "
- << fTiaraBarrel_Front_Downstream_StripNbr << endl;
+ << fTiaraBarrel_Front_Downstream_StripNbr[i] << endl;
cout << "Energy = "
- << fTiaraBarrel_Front_Downstream_Energy << endl ;
+ << fTiaraBarrel_Front_Downstream_Energy[i] << endl ;
cout << "Time = "
- << fTiaraBarrel_Front_Downstream_Time << endl ;
+ << fTiaraBarrel_Front_Downstream_Time[i] << endl ;
}
- cout << "*** Inner Barrel Back ***"
+ cout << "*** Inner Barrel Back ***" << endl ;
for( unsigned int i = 0; i < fTiaraBarrel_Back_DetectorNbr.size(); i ++){
cout << "Detector Number = "
- << fTiaraBarre_Back_DetectorNbr << endl;
- cout << "Strip Number = "
- << fTiaraBarrel_Back_StripNbr << endl;
+ << fTiaraBarrel_Back_DetectorNbr[i] << endl;
cout << "Energy = "
- << fTiaraBarrel_Back_Energy << endl ;
+ << fTiaraBarrel_Back_Energy[i] << endl ;
cout << "Time = "
- << fTiaraBarrel_Back_Time << endl ;
+ << fTiaraBarrel_Back_Time[i] << endl ;
}
- cout << "*** Outer Barrel ***"
+ cout << "*** Outer Barrel ***" << endl;
for( unsigned int i = 0; i < fTiaraBarrel_Outer_DetectorNbr.size() ; i ++){
cout << "Detector Number = "
- << fTiaraBarrel_Outer_DetectorNbr << endl;
+ << fTiaraBarrel_Outer_DetectorNbr[i] << endl;
cout << "Energy = "
- << fTiaraBarrel_Outer_Energy << endl ;
+ << fTiaraBarrel_Outer_Energy[i] << endl ;
cout << "Time = "
- << fTiaraBarrel_Outer_Time << endl ;
+ << fTiaraBarrel_Outer_Time[i] << endl ;
}
+
+
+
+
+
+
+
+
+
+
+
}
diff --git a/NPLib/Tiara/TTiaraBarrel.h b/NPLib/Tiara/TTiaraBarrelData.h
similarity index 73%
rename from NPLib/Tiara/TTiaraBarrel.h
rename to NPLib/Tiara/TTiaraBarrelData.h
index db5493042745c5fb232875bf9a695d8f6d0de84b..164f50b668a993bdd553df6f76a4dbe7406fc150 100644
--- a/NPLib/Tiara/TTiaraBarrel.h
+++ b/NPLib/Tiara/TTiaraBarrelData.h
@@ -31,7 +31,7 @@ using namespace std ;
// ROOT
#include "TNamed.h"
-class TTiaraBarrel : public TNamed {
+class TTiaraBarrelData : public TNamed {
private:
// Tiara
vector<unsigned short> fTiaraBarrel_Front_Upstream_DetectorNbr;
@@ -42,7 +42,7 @@ class TTiaraBarrel : public TNamed {
vector<unsigned short> fTiaraBarrel_Front_Downstream_DetectorNbr;
vector<unsigned short> fTiaraBarrel_Front_Downstream_StripNbr;
vector<double> fTiaraBarrel_Front_Downstream_Energy;
- vector<double> fTiaraBarrel_Front_Dowstream_Time;
+ vector<double> fTiaraBarrel_Front_Downstream_Time;
vector<unsigned short> fTiaraBarrel_Back_DetectorNbr;
vector<double> fTiaraBarrel_Back_Energy;
@@ -54,91 +54,91 @@ class TTiaraBarrel : public TNamed {
vector<double> fTiaraBarrel_Outer_Time;
public:
- TTiaraBarrel();
- virtual ~TTiaraBarrel();
+ TTiaraBarrelData();
+ virtual ~TTiaraBarrelData();
void Clear();
void Clear(const Option_t*) {};
void Dump() const;
///////////////////// SETTERS ////////////////////////
- inline void Set_Front_Upstream_DetectorNbr(vector<unsigned short> Front_Upstream_DetectorNbr)
+ inline void Set_Front_Upstream_DetectorNbr(const unsigned short& Front_Upstream_DetectorNbr)
{fTiaraBarrel_Front_Upstream_DetectorNbr.push_back(Front_Upstream_DetectorNbr);}
inline vector<unsigned short> Get_Front_Upstream_DetectorNbr()
{return fTiaraBarrel_Front_Upstream_DetectorNbr;}
- inline void Set_Front_UpstreamStripNbr(vector<unsigned short> Front_UpstreamStripNbr)
- {fTiaraBarrel_Front_UpstreamStripNbr.push_back(Front_UpstreamStripNbr);}
- inline vector<unsigned short> Get_Front_UpstreamStripNbr()
- {return fTiaraBarrel_Front_UpstreamStripNbr;}
+ inline void Set_Front_Upstream_StripNbr(const unsigned short& Front_Upstream_StripNbr)
+ {fTiaraBarrel_Front_Upstream_StripNbr.push_back(Front_Upstream_StripNbr);}
+ inline vector<unsigned short> Get_Front_Upstream_StripNbr()
+ {return fTiaraBarrel_Front_Upstream_StripNbr;}
- inline void Set_Front_Upstream_Energy(vector<double> Front_Upstream_Energy)
+ inline void Set_Front_Upstream_Energy(const double& Front_Upstream_Energy)
{fTiaraBarrel_Front_Upstream_Energy.push_back(Front_Upstream_Energy);}
inline vector<double> Get_Front_Upstream_Energy()
{return fTiaraBarrel_Front_Upstream_Energy;}
- inline void Set_Front_Upstream_Time(vector<double> Front_Upstream_Time)
+ inline void Set_Front_Upstream_Time(const double& Front_Upstream_Time)
{fTiaraBarrel_Front_Upstream_Time.push_back(Front_Upstream_Time);}
inline vector<double> Get_Front_Upstream_Time()
{return fTiaraBarrel_Front_Upstream_Time;}
- inline void Set_Front_Downstream_DetectorNbr(vector<unsigned short> Front_Downstream_DetectorNbr)
+ inline void Set_Front_Downstream_DetectorNbr(const unsigned short& Front_Downstream_DetectorNbr)
{fTiaraBarrel_Front_Downstream_DetectorNbr.push_back(Front_Downstream_DetectorNbr);}
inline vector<unsigned short> Get_Front_Downstream_DetectorNbr()
{return fTiaraBarrel_Front_Downstream_DetectorNbr;}
- inline void Set_Front_Downstream_StripNbr(vector<unsigned short> Front_Downstream_StripNbr)
+ inline void Set_Front_Downstream_StripNbr(const unsigned short& Front_Downstream_StripNbr)
{fTiaraBarrel_Front_Downstream_StripNbr.push_back(Front_Downstream_StripNbr);}
inline vector<unsigned short> Get_Front_Downstream_StripNbr()
{return fTiaraBarrel_Front_Downstream_StripNbr;}
- inline void Set_Front_Downstream_Energy(vector<double> Front_Downstream_Energy)
+ inline void Set_Front_Downstream_Energy(const double& Front_Downstream_Energy)
{fTiaraBarrel_Front_Downstream_Energy.push_back(Front_Downstream_Energy);}
inline vector<double> Get_Front_Downstream_Energy()
{return fTiaraBarrel_Front_Downstream_Energy;}
- inline void Set_Front_Downstream_Time(vector<double> Front_Downstream_Time)
+ inline void Set_Front_Downstream_Time(const double& Front_Downstream_Time)
{fTiaraBarrel_Front_Downstream_Time.push_back(Front_Downstream_Time);}
inline vector<double> Get_Front_Downstream_Time()
{return fTiaraBarrel_Front_Downstream_Time;}
- inline void Set_Back_DetectorNbr(vector<unsigned short> Back_DetectorNbr)
+ inline void Set_Back_DetectorNbr(const unsigned short& Back_DetectorNbr)
{fTiaraBarrel_Back_DetectorNbr.push_back(Back_DetectorNbr);}
inline vector<unsigned short> Get_Back_DetectorNbr()
{return fTiaraBarrel_Back_DetectorNbr;}
- inline void Set_Back_Energy(vector<double> Back_Energy)
+ inline void Set_Back_Energy(const double& Back_Energy)
{fTiaraBarrel_Back_Energy.push_back(Back_Energy);}
inline vector<double> Get_Back_Energy()
{return fTiaraBarrel_Back_Energy;}
- inline void Set_Back_time(vector<double> Back_time)
- {fTiaraBarrel_Back_time.push_back(Back_time);}
- inline vector<double> Get_Back_time()
- {return fTiaraBarrel_Back_time;}
+ inline void Set_Back_Time(const double& Back_Time)
+ {fTiaraBarrel_Back_Time.push_back(Back_Time);}
+ inline vector<double> Get_Back_Time()
+ {return fTiaraBarrel_Back_Time;}
- inline void Set_Outer_DetectorNbr(vector<unsigned short> Outer_DetectorNbr)
+ inline void Set_Outer_DetectorNbr(const unsigned short& Outer_DetectorNbr)
{fTiaraBarrel_Outer_DetectorNbr.push_back(Outer_DetectorNbr);}
inline vector<unsigned short> Get_Outer_DetectorNbr()
{return fTiaraBarrel_Outer_DetectorNbr;}
- inline void Set_Outer_StripNbr(vector<unsigned short> Outer_StripNbr)
+ inline void Set_Outer_StripNbr(const unsigned short& Outer_StripNbr)
{fTiaraBarrel_Outer_StripNbr.push_back(Outer_StripNbr);}
inline vector<unsigned short> Get_Outer_StripNbr()
{return fTiaraBarrel_Outer_StripNbr;}
- inline void Set_Outer_Energy(double Outer_Energy)
- {fTiaraBarrel_Outer_Energy=Outer_Energy;}
- inline double Get_Outer_Energy()
+ inline void Set_Outer_Energy(const double& Outer_Energy)
+ {fTiaraBarrel_Outer_Energy.push_back(Outer_Energy);}
+ inline vector<double> Get_Outer_Energy()
{return fTiaraBarrel_Outer_Energy;}
- inline void Set_Outer_Time(vector<double> Outer_Time)
+ inline void Set_Outer_Time(const double& Outer_Time)
{fTiaraBarrel_Outer_Time.push_back(Outer_Time);}
inline vector<double> Get_Outer_Time()
{return fTiaraBarrel_Outer_Time;}
- ClassDef(TTiaraBarrel,1) // TiaraData structure
+ ClassDef(TTiaraBarrelData,1) // TiaraData structure
};
#endif
diff --git a/NPLib/Tiara/libTiara.so b/NPLib/Tiara/libTiara.so
index 2666dc43a30b01286b10bf66095693acd6041bd2..6a01dce0aa9bd3a0afde711d7343a29efd9bfb68 100755
Binary files a/NPLib/Tiara/libTiara.so and b/NPLib/Tiara/libTiara.so differ