diff --git a/NPLib/Detectors/Exogam/TExogamData.h b/NPLib/Detectors/Exogam/TExogamData.h
index 953fc14649be52cb058230477932c90b806ba1d3..38d242b64523eea117d4dbff42fa73d5d64e52e1 100644
--- a/NPLib/Detectors/Exogam/TExogamData.h
+++ b/NPLib/Detectors/Exogam/TExogamData.h
@@ -58,49 +58,49 @@ class TExogamData : public TObject {
   void Dump() const;
 
   /////////////////////           SETTERS           ////////////////////////
-  inline void SetInner6MV(UShort_t& Energy, UShort_t& DetNumb, ULong64_t& TimeStamp) {
+  inline void SetInner6MV(const UShort_t& Energy, const UShort_t& DetNumb, const ULong64_t& TimeStamp) {
     fEXO_E.push_back(Energy);
     fEXO_E_CrystalNbr.push_back(DetNumb);
     fEXO_E_TS.push_back(TimeStamp);
   }
-  inline void SetInner20MV(UShort_t& Energy, UShort_t& DetNumb, ULong64_t& TimeStamp) {
+  inline void SetInner20MV(const UShort_t& Energy, const UShort_t& DetNumb, const ULong64_t& TimeStamp) {
     fEXO_HG.push_back(Energy);
     fEXO_HG_CrystalNbr.push_back(DetNumb);
     fEXO_HG_TS.push_back(TimeStamp);
   }
-  inline void SetDeltaTV(UShort_t& Time, UShort_t& DetNumb, ULong64_t& TimeStamp) {
+  inline void SetDeltaTV(const UShort_t& Time, const UShort_t& DetNumb, const ULong64_t& TimeStamp) {
     fEXO_TDC.push_back(Time);
     fEXO_TDC_CrystalNbr.push_back(DetNumb);
     fEXO_TDC_TS.push_back(TimeStamp);
   }
-  inline void SetOutersV(UShort_t& Energy, UShort_t& OutersNumb) {
+  inline void SetOutersV(const UShort_t& Energy, const UShort_t& OutersNumb) {
     fEXO_Outer.push_back(Energy);
     fEXO_Outer_SubCrystalNbr.push_back(OutersNumb);
   }
-  inline void SetBGOV(UShort_t& Energy, UShort_t& BGONumb) {
+  inline void SetBGOV(const UShort_t& Energy, const UShort_t& BGONumb) {
     fEXO_BGO.push_back(Energy);
     fEXO_BGO_CrystalNbr.push_back(BGONumb);
   }
-  inline void SetCSIV(UShort_t& Energy, UShort_t& CSINumb) {
+  inline void SetCSIV(const UShort_t& Energy, const UShort_t& CSINumb) {
     fEXO_CSI.push_back(Energy);
     fEXO_CSI_CrystalNbr.push_back(CSINumb);
   }
   /////////////////////           GETTERS           ////////////////////////
-  inline UShort_t GetEXO_E(UShort_t& i) { return fEXO_E[i]; }
-  inline UShort_t GetEXO_E_CrystalNbr(UShort_t& i) { return fEXO_E_CrystalNbr[i]; }
-  inline ULong64_t GetEXO_E_TS(UShort_t& i) { return fEXO_E_TS[i]; }
-  inline UShort_t GetEXO_HG(UShort_t& i) { return fEXO_HG[i]; }
-  inline UShort_t GetEXO_HG_CrystalNbr(UShort_t& i) { return fEXO_HG_CrystalNbr[i]; }
-  inline ULong64_t GetEXO_HG_TS(UShort_t& i) { return fEXO_HG_TS[i]; }
-  inline UShort_t GetEXO_TDC(UShort_t& i) { return fEXO_TDC[i]; }
-  inline UShort_t GetEXO_TDC_CrystalNbr(UShort_t& i) { return fEXO_TDC_CrystalNbr[i]; }
-  inline ULong64_t GetEXO_TDC_TS(UShort_t& i) { return fEXO_TDC_TS[i]; }
-  inline UShort_t GetEXO_Outer(UShort_t& i) { return fEXO_Outer[i]; }
-  inline UShort_t GetEXO_Outer_SubCrystalNbr(UShort_t& i) { return fEXO_Outer_SubCrystalNbr[i]; }
-  inline UShort_t GetEXO_BGO(UShort_t& i) { return fEXO_BGO[i]; }
-  inline UShort_t GetEXO_BGO_CrystalNbr(UShort_t& i) { return fEXO_BGO_CrystalNbr[i]; }
-  inline UShort_t GetEXO_CSI(UShort_t& i) { return fEXO_CSI[i]; }
-  inline UShort_t GetEXO_CSI_CrystalNbr(UShort_t& i) { return fEXO_CSI_CrystalNbr[i]; }
+  inline UShort_t GetEXO_E(const UShort_t& i)const  { return fEXO_E[i]; }
+  inline UShort_t GetEXO_E_CrystalNbr(const UShort_t& i)const  { return fEXO_E_CrystalNbr[i]; }
+  inline ULong64_t GetEXO_E_TS(const UShort_t& i)const  { return fEXO_E_TS[i]; }
+  inline UShort_t GetEXO_HG(const UShort_t& i)const  { return fEXO_HG[i]; }
+  inline UShort_t GetEXO_HG_CrystalNbr(const UShort_t& i)const  { return fEXO_HG_CrystalNbr[i]; }
+  inline ULong64_t GetEXO_HG_TS(const UShort_t& i)const  { return fEXO_HG_TS[i]; }
+  inline UShort_t GetEXO_TDC(const UShort_t& i)const  { return fEXO_TDC[i]; }
+  inline UShort_t GetEXO_TDC_CrystalNbr(const UShort_t& i)const  { return fEXO_TDC_CrystalNbr[i]; }
+  inline ULong64_t GetEXO_TDC_TS(const UShort_t& i)const  { return fEXO_TDC_TS[i]; }
+  inline UShort_t GetEXO_Outer(const UShort_t& i)const  { return fEXO_Outer[i]; }
+  inline UShort_t GetEXO_Outer_SubCrystalNbr(const UShort_t& i)const  { return fEXO_Outer_SubCrystalNbr[i]; }
+  inline UShort_t GetEXO_BGO(const UShort_t& i)const  { return fEXO_BGO[i]; }
+  inline UShort_t GetEXO_BGO_CrystalNbr(const UShort_t& i)const  { return fEXO_BGO_CrystalNbr[i]; }
+  inline UShort_t GetEXO_CSI(const UShort_t& i)const  { return fEXO_CSI[i]; }
+  inline UShort_t GetEXO_CSI_CrystalNbr(const UShort_t& i)const  { return fEXO_CSI_CrystalNbr[i]; }
 
   ClassDef(TExogamData, 1) // ExogamData structure
 };
diff --git a/NPLib/Detectors/TAC/TTACData.h b/NPLib/Detectors/TAC/TTACData.h
index be342c44944705933d3bba2e8c44e876bd5c6ca2..13158fdb5c9ff734778eaa78000fc86d38e53ded 100644
--- a/NPLib/Detectors/TAC/TTACData.h
+++ b/NPLib/Detectors/TAC/TTACData.h
@@ -73,11 +73,11 @@ class TTACData : public TObject {
     // Energy
     inline UShort_t GetTAC_Mult() const
       {return fTAC_Channel.size();}
-    inline UShort_t GetTAC_Channel(const unsigned int &i) const 
+    inline UShort_t GetTAC_Channel(const UShort_t &i) const 
       {return fTAC_Channel[i];}//!
-    inline UShort_t GetTAC_Nbr(const unsigned int &i) const 
+    inline UShort_t GetTAC_Nbr(const UShort_t &i) const 
       {return fTAC_Nbr[i];}//!
-    inline ULong64_t GetTAC_TS(const unsigned int &i) const 
+    inline ULong64_t GetTAC_TS(const ULong64_t &i) const 
       {return fTAC_TS[i];}//!
 
 
diff --git a/NPLib/Detectors/ZDD/TZDDData.h b/NPLib/Detectors/ZDD/TZDDData.h
index f25b6f24dfe9a8bdb132f275de7116e4e25de7ea..05d29e31fb6510343db21e8de68d67fff8f9f731 100644
--- a/NPLib/Detectors/ZDD/TZDDData.h
+++ b/NPLib/Detectors/ZDD/TZDDData.h
@@ -102,18 +102,18 @@ class TZDDData : public TObject {
     };//!
     
     //////////////////////    GETTERS    ////////////////////////
-    inline UShort_t GetZDD_ICE(UShort_t& i) { return fZDD_IC_E[i]; }
-    inline UShort_t GetZDD_ICN(UShort_t& i) { return fZDD_IC_N[i]; }
-    inline ULong64_t GetZDD_ICTS(UShort_t& i) { return fZDD_IC_TS[i]; }
-    inline UShort_t GetZDD_PME(UShort_t& i) { return fZDD_PM_E[i]; }
-    inline UShort_t GetZDD_PMN(UShort_t& i) { return fZDD_PM_N[i]; }
-    inline ULong64_t GetZDD_PMTS(UShort_t& i) { return fZDD_PM_TS[i]; }
-    inline UShort_t GetZDD_DCE(UShort_t& i) { return fZDD_DC_E[i]; }
-    inline UShort_t GetZDD_DCN(UShort_t& i) { return fZDD_DC_N[i]; }
-    inline ULong64_t GetZDD_DCTS(UShort_t& i) { return fZDD_DC_TS[i]; }
-    inline UShort_t GetZDD_EXOE(UShort_t& i) { return fZDD_EXO_E[i]; }
-    inline UShort_t GetZDD_EXON(UShort_t& i) { return fZDD_EXO_N[i]; }
-    inline ULong64_t GetZDD_EXOTS(UShort_t& i) { return fZDD_EXO_TS[i]; }
+    inline UShort_t GetZDD_ICE(const UShort_t& i)const  { return fZDD_IC_E[i]; }
+    inline UShort_t GetZDD_ICN(const UShort_t& i)const  { return fZDD_IC_N[i]; }
+    inline ULong64_t GetZDD_ICTS(const UShort_t& i)const  { return fZDD_IC_TS[i]; }
+    inline UShort_t GetZDD_PME(const UShort_t& i)const  { return fZDD_PM_E[i]; }
+    inline UShort_t GetZDD_PMN(const UShort_t& i)const  { return fZDD_PM_N[i]; }
+    inline ULong64_t GetZDD_PMTS(const UShort_t& i)const  { return fZDD_PM_TS[i]; }
+    inline UShort_t GetZDD_DCE(const UShort_t& i)const  { return fZDD_DC_E[i]; }
+    inline UShort_t GetZDD_DCN(const UShort_t& i)const  { return fZDD_DC_N[i]; }
+    inline ULong64_t GetZDD_DCTS(const UShort_t& i)const  { return fZDD_DC_TS[i]; }
+    inline UShort_t GetZDD_EXOE(const UShort_t& i)const  { return fZDD_EXO_E[i]; }
+    inline UShort_t GetZDD_EXON(const UShort_t& i)const  { return fZDD_EXO_N[i]; }
+    inline ULong64_t GetZDD_EXOTS(const UShort_t& i)const  { return fZDD_EXO_TS[i]; }
 
   //////////////////////////////////////////////////////////////
   // Required for ROOT dictionnary