diff --git a/NPLib/Sharc/TSharcData.h b/NPLib/Sharc/TSharcData.h
index 7a32149efd6a91a17eee57e316bb1977e7cdc5cc..22f72c2330bb71a1f2996c1b664b797543187436 100644
--- a/NPLib/Sharc/TSharcData.h
+++ b/NPLib/Sharc/TSharcData.h
@@ -61,45 +61,45 @@ public:
void Dump() const;
///////////////////// SETTERS ////////////////////////
- void SetFront_DetectorNbr(UShort_t DetNbr){fSharc_StripFront_DetectorNbr.push_back(DetNbr);}
- void SetFront_StripNbr(UShort_t StripNbr){fSharc_StripFront_StripNbr.push_back(StripNbr);}
- void SetFront_Energy(Double_t Energy){fSharc_StripFront_Energy.push_back(Energy);}
- void SetFront_TimeCFD(Double_t TimeCFD){fSharc_StripFront_TimeCFD.push_back(TimeCFD);}
- void SetFront_TimeLED(Double_t TimeLED){fSharc_StripFront_TimeLED.push_back(TimeLED);}
+ inline void SetFront_DetectorNbr(const UShort_t &DetNbr){fSharc_StripFront_DetectorNbr.push_back(DetNbr);}
+ inline void SetFront_StripNbr(const UShort_t &StripNbr){fSharc_StripFront_StripNbr.push_back(StripNbr);}
+ inline void SetFront_Energy(const Double_t &Energy){fSharc_StripFront_Energy.push_back(Energy);}
+ inline void SetFront_TimeCFD(const Double_t &TimeCFD){fSharc_StripFront_TimeCFD.push_back(TimeCFD);}
+ inline void SetFront_TimeLED(const Double_t &TimeLED){fSharc_StripFront_TimeLED.push_back(TimeLED);}
- void SetBack_DetectorNbr(UShort_t DetNbr){fSharc_StripBack_DetectorNbr.push_back(DetNbr);}
- void SetBack_StripNbr(UShort_t StripNbr){fSharc_StripBack_StripNbr.push_back(StripNbr);}
- void SetBack_Energy(Double_t Energy){fSharc_StripBack_Energy.push_back(Energy);}
- void SetBack_TimeCFD(Double_t TimeCFD){fSharc_StripBack_TimeCFD.push_back(TimeCFD);}
- void SetBack_TimeLED(Double_t TimeLED){fSharc_StripBack_TimeLED.push_back(TimeLED);}
+ inline void SetBack_DetectorNbr(const UShort_t &DetNbr){fSharc_StripBack_DetectorNbr.push_back(DetNbr);}
+ inline void SetBack_StripNbr(const UShort_t &StripNbr){fSharc_StripBack_StripNbr.push_back(StripNbr);}
+ inline void SetBack_Energy(const Double_t &Energy){fSharc_StripBack_Energy.push_back(Energy);}
+ inline void SetBack_TimeCFD(const Double_t &TimeCFD){fSharc_StripBack_TimeCFD.push_back(TimeCFD);}
+ inline void SetBack_TimeLED(const Double_t &TimeLED){fSharc_StripBack_TimeLED.push_back(TimeLED);}
- void SetPAD_DetectorNbr(UShort_t DetNbr){fSharc_PAD_DetectorNbr.push_back(DetNbr);}
- void SetPAD_Energy(Double_t Energy){fSharc_PAD_Energy.push_back(Energy);}
- void SetPAD_TimeCFD(Double_t TimeCFD){fSharc_PAD_TimeCFD.push_back(TimeCFD);}
- void SetPAD_TimeLED(Double_t TimeLED){fSharc_PAD_TimeLED.push_back(TimeLED);}
+ inline void SetPAD_DetectorNbr(const UShort_t &DetNbr){fSharc_PAD_DetectorNbr.push_back(DetNbr);}
+ inline void SetPAD_Energy(const Double_t &Energy){fSharc_PAD_Energy.push_back(Energy);}
+ inline void SetPAD_TimeCFD(const Double_t &TimeCFD){fSharc_PAD_TimeCFD.push_back(TimeCFD);}
+ inline void SetPAD_TimeLED(const Double_t &TimeLED){fSharc_PAD_TimeLED.push_back(TimeLED);}
///////////////////// GETTERS ////////////////////////
- UShort_t GetFront_DetectorNbr(unsigned int i) const {return fSharc_StripFront_DetectorNbr[i];}//!
- UShort_t GetFront_StripNbr(unsigned int i) const {return fSharc_StripFront_StripNbr[i];}//!
- Double_t GetFront_Energy(unsigned int i) const {return fSharc_StripFront_Energy[i];}//!
- Double_t GetFront_TimeCFD(unsigned int i) const {return fSharc_StripFront_TimeCFD[i];}//!
- Double_t GetFront_TimeLED(unsigned int i) const {return fSharc_StripFront_TimeLED[i];}//!
+ inline UShort_t GetFront_DetectorNbr(const unsigned int &i) const {return fSharc_StripFront_DetectorNbr[i];}//!
+ inline UShort_t GetFront_StripNbr(const unsigned int &i) const {return fSharc_StripFront_StripNbr[i];}//!
+ inline Double_t GetFront_Energy(const unsigned int &i) const {return fSharc_StripFront_Energy[i];}//!
+ inline Double_t GetFront_TimeCFD(const unsigned int &i) const {return fSharc_StripFront_TimeCFD[i];}//!
+ inline Double_t GetFront_TimeLED(const unsigned int &i) const {return fSharc_StripFront_TimeLED[i];}//!
- UShort_t GetBack_DetectorNbr(unsigned int i) const {return fSharc_StripBack_DetectorNbr[i];}//!
- UShort_t GetBack_StripNbr(unsigned int i) const {return fSharc_StripBack_StripNbr[i];}//!
- Double_t GetBack_Energy(unsigned int i) const {return fSharc_StripBack_Energy[i];}//!
- Double_t GetBack_TimeCFD(unsigned int i) const {return fSharc_StripBack_TimeCFD[i];}//!
- Double_t GetBack_TimeLED(unsigned int i) const {return fSharc_StripBack_TimeLED[i];}//!
+ inline UShort_t GetBack_DetectorNbr(const unsigned int &i) const {return fSharc_StripBack_DetectorNbr[i];}//!
+ inline UShort_t GetBack_StripNbr(const unsigned int &i) const {return fSharc_StripBack_StripNbr[i];}//!
+ inline Double_t GetBack_Energy(const unsigned int &i) const {return fSharc_StripBack_Energy[i];}//!
+ inline Double_t GetBack_TimeCFD(const unsigned int &i) const {return fSharc_StripBack_TimeCFD[i];}//!
+ inline Double_t GetBack_TimeLED(const unsigned int &i) const {return fSharc_StripBack_TimeLED[i];}//!
- UShort_t GetPAD_DetectorNbr(unsigned int i) const {return fSharc_PAD_DetectorNbr[i];}//!
- Double_t GetPAD_Energy(unsigned int i) const {return fSharc_PAD_Energy[i];}//!
- Double_t GetPAD_TimeCFD(unsigned int i) const {return fSharc_PAD_TimeCFD[i];}//!
- Double_t GetPAD_TimeLED(unsigned int i) const {return fSharc_PAD_TimeLED[i];}//!
+ inline UShort_t GetPAD_DetectorNbr(const unsigned int &i) const {return fSharc_PAD_DetectorNbr[i];}//!
+ inline Double_t GetPAD_Energy(const unsigned int &i) const {return fSharc_PAD_Energy[i];}//!
+ inline Double_t GetPAD_TimeCFD(const unsigned int &i) const {return fSharc_PAD_TimeCFD[i];}//!
+ inline Double_t GetPAD_TimeLED(const unsigned int &i) const {return fSharc_PAD_TimeLED[i];}//!
- unsigned int GetMultiplicityFront() const {return fSharc_StripFront_DetectorNbr.size();}//!
- unsigned int GetMultiplicityBack() const {return fSharc_StripBack_DetectorNbr.size();}//!
- unsigned int GetMultiplicityPAD() const {return fSharc_PAD_DetectorNbr.size();}//!
+ inline unsigned int GetMultiplicityFront() const {return fSharc_StripFront_DetectorNbr.size();}//!
+ inline unsigned int GetMultiplicityBack() const {return fSharc_StripBack_DetectorNbr.size();}//!
+ inline unsigned int GetMultiplicityPAD() const {return fSharc_PAD_DetectorNbr.size();}//!
ClassDef(TSharcData,1) // SharcData structure
};
diff --git a/NPLib/Tigress/TTigressData.h b/NPLib/Tigress/TTigressData.h
index 81f2a196e322ba3ec8d00e8eb62b22c03fa4dd60..40c4557c347fdf254ac8757dadb2be35cc27a15b 100644
--- a/NPLib/Tigress/TTigressData.h
+++ b/NPLib/Tigress/TTigressData.h
@@ -58,38 +58,37 @@ public:
void Dump() const;
///////////////////// SETTERS ////////////////////////
- void SetGeCloverNbr(UShort_t GeCloverNbr){fTIG_Ge_CloverNbr.push_back(GeCloverNbr); }
- void SetGeCrystalNbr(UShort_t GeCrystalNbr){fTIG_Ge_CrystalNbr.push_back(GeCrystalNbr);}
- void SetGeSegmentNbr(UShort_t GeSegmentNbr){fTIG_Ge_SegmentNbr.push_back(GeSegmentNbr);}
- void SetGeEnergy(UShort_t GeEnergy){fTIG_Ge_Energy.push_back(GeEnergy);}
- void SetGeTimeCFD(UShort_t GeTimeCFD){fTIG_Ge_TimeCFD.push_back(GeTimeCFD);}
- void SetGeTimeLED(UShort_t GeTimeLED){fTIG_Ge_TimeLED.push_back(GeTimeLED);}
-
- void SetBGOCloverNbr(UShort_t BGOCloverNbr){fTIG_BGO_CloverNbr.push_back(BGOCloverNbr); }
- void SetBGOCrystalNbr(UShort_t BGOCrystalNbr){fTIG_BGO_CrystalNbr.push_back(BGOCrystalNbr);}
- void SetBGOPmNbr(UShort_t BGOPmNbr){fTIG_BGO_PmNbr.push_back(BGOPmNbr);}
- void SetBGOEnergy(UShort_t BGOEnergy){fTIG_BGO_Energy.push_back(BGOEnergy);}
- void SetBGOTimeCFD(UShort_t BGOTimeCFD){fTIG_BGO_TimeCFD.push_back(BGOTimeCFD);}
- void SetBGOTimeLED(UShort_t BGOTimeLED){fTIG_BGO_TimeLED.push_back(BGOTimeLED);}
+ inline void SetGeCloverNbr(const UShort_t &GeCloverNbr){fTIG_Ge_CloverNbr.push_back(GeCloverNbr); }
+ inline void SetGeCrystalNbr(const UShort_t &GeCrystalNbr){fTIG_Ge_CrystalNbr.push_back(GeCrystalNbr);}
+ inline void SetGeSegmentNbr(const UShort_t &GeSegmentNbr){fTIG_Ge_SegmentNbr.push_back(GeSegmentNbr);}
+ inline void SetGeEnergy(const UShort_t &GeEnergy){fTIG_Ge_Energy.push_back(GeEnergy);}
+ inline void SetGeTimeCFD(const UShort_t &GeTimeCFD){fTIG_Ge_TimeCFD.push_back(GeTimeCFD);}
+ inline void SetGeTimeLED(const UShort_t &GeTimeLED){fTIG_Ge_TimeLED.push_back(GeTimeLED);}
+
+ inline void SetBGOCloverNbr(const UShort_t &BGOCloverNbr){fTIG_BGO_CloverNbr.push_back(BGOCloverNbr); }
+ inline void SetBGOCrystalNbr(const UShort_t &BGOCrystalNbr){fTIG_BGO_CrystalNbr.push_back(BGOCrystalNbr);}
+ inline void SetBGOPmNbr(const UShort_t &BGOPmNbr){fTIG_BGO_PmNbr.push_back(BGOPmNbr);}
+ inline void SetBGOEnergy(const UShort_t &BGOEnergy){fTIG_BGO_Energy.push_back(BGOEnergy);}
+ inline void SetBGOTimeCFD(const UShort_t &BGOTimeCFD){fTIG_BGO_TimeCFD.push_back(BGOTimeCFD);}
+ inline void SetBGOTimeLED(const UShort_t &BGOTimeLED){fTIG_BGO_TimeLED.push_back(BGOTimeLED);}
///////////////////// GETTERS ////////////////////////
- UShort_t GetGeCloverNbr(unsigned int i) {return fTIG_Ge_CloverNbr[i]; }
- UShort_t GetGeCrystalNbr(unsigned int i) {return fTIG_Ge_CrystalNbr[i]; }
- UShort_t GetGeSegmentNbr(unsigned int i) {return fTIG_Ge_SegmentNbr[i]; }
- Double_t GetGeEnergy(unsigned int i) {return fTIG_Ge_Energy[i];}
- Double_t GetGeTimeCFD(unsigned int i) {return fTIG_Ge_TimeCFD[i];}
- Double_t GetGeTimeLED(unsigned int i) {return fTIG_Ge_TimeLED[i];}
-
-
- UShort_t GetBGOCloverNbr(unsigned int i) {return fTIG_BGO_CloverNbr[i]; }
- UShort_t GetBGOCrystalNbr(unsigned int i) {return fTIG_BGO_CrystalNbr[i]; }
- UShort_t GetBGOPmNbr(unsigned int i) {return fTIG_BGO_PmNbr[i]; }
- Double_t GetBGOEnergy(unsigned int i) {return fTIG_BGO_Energy[i];}
- Double_t GetBGOTimeCFD(unsigned int i) {return fTIG_BGO_TimeCFD[i];}
- Double_t GetBGOTimeLED(unsigned int i) {return fTIG_BGO_TimeLED[i];}
-
- unsigned int GetMultiplicityGe() {return fTIG_Ge_CloverNbr.size();}
- unsigned int GetMultiplicityBGO() {return fTIG_BGO_CloverNbr.size();}
+ inline UShort_t GetGeCloverNbr(const unsigned int &i) {return fTIG_Ge_CloverNbr[i]; }
+ inline UShort_t GetGeCrystalNbr(const unsigned int &i) {return fTIG_Ge_CrystalNbr[i]; }
+ inline UShort_t GetGeSegmentNbr(const unsigned int &i) {return fTIG_Ge_SegmentNbr[i]; }
+ inline Double_t GetGeEnergy(const unsigned int &i) {return fTIG_Ge_Energy[i];}
+ inline Double_t GetGeTimeCFD(const unsigned int &i) {return fTIG_Ge_TimeCFD[i];}
+ inline Double_t GetGeTimeLED(const unsigned int &i) {return fTIG_Ge_TimeLED[i];}
+
+ inline UShort_t GetBGOCloverNbr(const unsigned int &i) {return fTIG_BGO_CloverNbr[i]; }
+ inline UShort_t GetBGOCrystalNbr(const unsigned int &i) {return fTIG_BGO_CrystalNbr[i]; }
+ inline UShort_t GetBGOPmNbr(const unsigned int &i) {return fTIG_BGO_PmNbr[i]; }
+ inline Double_t GetBGOEnergy(const unsigned int &i) {return fTIG_BGO_Energy[i];}
+ inline Double_t GetBGOTimeCFD(const unsigned int &i) {return fTIG_BGO_TimeCFD[i];}
+ inline Double_t GetBGOTimeLED(const unsigned int &i) {return fTIG_BGO_TimeLED[i];}
+
+ inline unsigned int GetMultiplicityGe() {return fTIG_Ge_CloverNbr.size();}
+ inline unsigned int GetMultiplicityBGO() {return fTIG_BGO_CloverNbr.size();}
ClassDef(TTigressData,1) // TigressData structure
};
diff --git a/NPLib/Trifoil/TTrifoilData.h b/NPLib/Trifoil/TTrifoilData.h
index 098767aff49bbed83df075ab375cd7872b3c0ff5..0ed361a8b46cf8231f09d7ecfcb56f60e2d21f1d 100644
--- a/NPLib/Trifoil/TTrifoilData.h
+++ b/NPLib/Trifoil/TTrifoilData.h
@@ -14,7 +14,7 @@
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class hold the Trifoil Silicon array raw data (Made for TIG64 card) *
+ * This class hold the Trifoil Silicon array raw data (Made for TIG64 card) *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -26,6 +26,7 @@
#include<stdlib.h>
#include <vector>
#include <map>
+#include <iostream>
using namespace std ;
// ROOT
@@ -49,16 +50,16 @@ public:
void Dump() const;
///////////////////// SETTERS ////////////////////////
- void SetWaveform(TH1F Waveform) {fTrifoil_Waveform.push_back(Waveform);}
- void SetTimeCFD(Double_t TimeCFD) {fTrifoil_TimeCFD.push_back(TimeCFD);}
- void SetTimeLED(Double_t TimeLED) {fTrifoil_TimeLED.push_back(TimeLED);}
+ inline void SetWaveform(const TH1F &Waveform) {fTrifoil_Waveform.push_back(Waveform);}
+ inline void SetTimeCFD(const Double_t &TimeCFD) {fTrifoil_TimeCFD.push_back(TimeCFD);}
+ inline void SetTimeLED(const Double_t &TimeLED) {fTrifoil_TimeLED.push_back(TimeLED);}
///////////////////// GETTERS ////////////////////////
- TH1F GetWaveform(int i) {return fTrifoil_Waveform[i];}
- Double_t GetTimeCFD(int i) {return fTrifoil_TimeCFD[i];}
- Double_t GetTimeLED(int i) {return fTrifoil_TimeLED[i];}
+ inline TH1F GetWaveform(const unsigned int &i) {return fTrifoil_Waveform[i];}
+ inline Double_t GetTimeCFD(const unsigned int &i) {return fTrifoil_TimeCFD[i];}
+ inline Double_t GetTimeLED(const unsigned int &i) {return fTrifoil_TimeLED[i];}
- unsigned int GetMultiplicity() {return fTrifoil_TimeCFD.size();}
+ inline unsigned int GetMultiplicity() {return fTrifoil_TimeCFD.size();}
ClassDef(TTrifoilData,1) // TrifoilData structure
};