diff --git a/NPLib/Detectors/PISTA/TICData.h b/NPLib/Detectors/PISTA/TICData.h
index 3fc9c3eec3be709e52b86b6a2b3334fd929894ce..5073e68d46c84402def36158b831bad65dc59ee0 100644
--- a/NPLib/Detectors/PISTA/TICData.h
+++ b/NPLib/Detectors/PISTA/TICData.h
@@ -75,7 +75,7 @@ class TICData : public TObject {
       {return fIC_Section[i];}//!
     inline Double_t GetIC_Charge(const unsigned int &i) const 
       {return fIC_Charge[i];}//!      
-    inline Double_t GetIC_TS(const unsigned int &i) const 
+    inline long GetIC_TS(const unsigned int &i) const 
       {return fIC_TS[i];}//!      
      
     //////////////////////////////////////////////////////////////
diff --git a/NPLib/Detectors/PISTA/TTimeData.h b/NPLib/Detectors/PISTA/TTimeData.h
index 58a200a4feff8f24e5664900b81ea39cac7cd77e..0ce7b2d65c30cb63bbd68fe6ac9e9b1a67cbae6e 100644
--- a/NPLib/Detectors/PISTA/TTimeData.h
+++ b/NPLib/Detectors/PISTA/TTimeData.h
@@ -83,22 +83,22 @@ class TTimeData : public TObject {
 
 
         //////////////////////    GETTERS    ////////////////////////
-        inline UShort_t GetTS_MWPC13(const unsigned int &i) const
+        inline long GetTS_MWPC13(const unsigned int &i) const
         {return fTS_MWPC13.at(i) ;}//!
-        inline UShort_t GetTS_MWPC14(const unsigned int &i) const
+        inline long GetTS_MWPC14(const unsigned int &i) const
         {return fTS_MWPC14.at(i) ;}//!
-        inline UShort_t GetTS_MWPC23(const unsigned int &i) const
+        inline long GetTS_MWPC23(const unsigned int &i) const
         {return fTS_MWPC23.at(i) ;}//!
-        inline UShort_t GetTS_MWPC24(const unsigned int &i) const
+        inline long GetTS_MWPC24(const unsigned int &i) const
         {return fTS_MWPC24.at(i) ;}//!
 
-        inline UShort_t GetTime_MWPC13(const unsigned int &i) const
+        inline float GetTime_MWPC13(const unsigned int &i) const
         {return fTime_MWPC13.at(i) ;}//!
-        inline UShort_t GetTime_MWPC14(const unsigned int &i) const
+        inline float GetTime_MWPC14(const unsigned int &i) const
         {return fTime_MWPC14.at(i) ;}//!
-        inline UShort_t GetTime_MWPC23(const unsigned int &i) const
+        inline float GetTime_MWPC23(const unsigned int &i) const
         {return fTime_MWPC23.at(i) ;}//!
-        inline UShort_t GetTime_MWPC24(const unsigned int &i) const
+        inline float GetTime_MWPC24(const unsigned int &i) const
         {return fTime_MWPC24.at(i) ;}//!
          
         inline UShort_t GetMWPCMult() const