From 3013b02428c88dd273f3000b1a387be9fb14aefb Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Wed, 19 Jan 2011 16:45:36 +0000
Subject: [PATCH] * Changing TMust2Data - adding const to get fonction -
adding const to get and set argument - replacing .at methop by [] operator
in get methods
*Changing TSSSDData
- Same as Must2
---
NPLib/MUST2/TMust2Data.h | 114 +++++++++++++++++-----------------
NPLib/MUST2/TMust2Physics.cxx | 44 ++++++-------
NPLib/MUST2/TMust2Physics.h | 18 +++---
NPLib/SSSD/TSSSDData.h | 12 ++--
4 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/NPLib/MUST2/TMust2Data.h b/NPLib/MUST2/TMust2Data.h
index f8540176b..1ee17b69a 100644
--- a/NPLib/MUST2/TMust2Data.h
+++ b/NPLib/MUST2/TMust2Data.h
@@ -72,94 +72,94 @@ class TMust2Data : public TObject {
virtual ~TMust2Data();
void Clear();
- void Clear(const Option_t*) {};
+ void Clear(const Option_t*) {};
void Dump() const;
///////////////////// SETTERS ////////////////////////
// DSSD
// (X,E)
- void SetMMStripXEDetectorNbr(UShort_t DetNbr) {fMM_StripXE_DetectorNbr.push_back(DetNbr);}
- void SetMMStripXEStripNbr(UShort_t StripNbr) {fMM_StripXE_StripNbr.push_back(StripNbr);}
- void SetMMStripXEEnergy(Double_t Energy) {fMM_StripXE_Energy.push_back(Energy);}
+ void SetMMStripXEDetectorNbr(const UShort_t DetNbr) {fMM_StripXE_DetectorNbr.push_back(DetNbr);}
+ void SetMMStripXEStripNbr(const UShort_t StripNbr) {fMM_StripXE_StripNbr.push_back(StripNbr);}
+ void SetMMStripXEEnergy(const Double_t Energy) {fMM_StripXE_Energy.push_back(Energy);}
// (X,T)
- void SetMMStripXTDetectorNbr(UShort_t DetNbr) {fMM_StripXT_DetectorNbr.push_back(DetNbr);}
- void SetMMStripXTStripNbr(UShort_t StripNbr) {fMM_StripXT_StripNbr.push_back(StripNbr);}
- void SetMMStripXTTime(Double_t Time) {fMM_StripXT_Time.push_back(Time);}
+ void SetMMStripXTDetectorNbr(const UShort_t DetNbr) {fMM_StripXT_DetectorNbr.push_back(DetNbr);}
+ void SetMMStripXTStripNbr(const UShort_t StripNbr) {fMM_StripXT_StripNbr.push_back(StripNbr);}
+ void SetMMStripXTTime(const Double_t Time) {fMM_StripXT_Time.push_back(Time);}
// (Y,E)
- void SetMMStripYEDetectorNbr(UShort_t DetNbr) {fMM_StripYE_DetectorNbr.push_back(DetNbr);}
- void SetMMStripYEStripNbr(UShort_t StripNbr) {fMM_StripYE_StripNbr.push_back(StripNbr);}
- void SetMMStripYEEnergy(Double_t Energy) {fMM_StripYE_Energy.push_back(Energy);}
+ void SetMMStripYEDetectorNbr(const UShort_t DetNbr) {fMM_StripYE_DetectorNbr.push_back(DetNbr);}
+ void SetMMStripYEStripNbr(const UShort_t StripNbr) {fMM_StripYE_StripNbr.push_back(StripNbr);}
+ void SetMMStripYEEnergy(const Double_t Energy) {fMM_StripYE_Energy.push_back(Energy);}
// (Y,T)
- void SetMMStripYTDetectorNbr(UShort_t DetNbr) {fMM_StripYT_DetectorNbr.push_back(DetNbr);}
- void SetMMStripYTStripNbr(UShort_t StripNbr) {fMM_StripYT_StripNbr.push_back(StripNbr);}
- void SetMMStripYTTime(Double_t Time) {fMM_StripYT_Time.push_back(Time);}
+ void SetMMStripYTDetectorNbr(const UShort_t DetNbr) {fMM_StripYT_DetectorNbr.push_back(DetNbr);}
+ void SetMMStripYTStripNbr(const UShort_t StripNbr) {fMM_StripYT_StripNbr.push_back(StripNbr);}
+ void SetMMStripYTTime(const Double_t Time) {fMM_StripYT_Time.push_back(Time);}
// SiLi
//(E)
- void SetMMSiLiEDetectorNbr(UShort_t DetNbr) {fMM_SiLiE_DetectorNbr.push_back(DetNbr);}
- void SetMMSiLiEPadNbr(UShort_t PadNbr) {fMM_SiLiE_PadNbr.push_back(PadNbr);}
- void SetMMSiLiEEnergy(Double_t Energy) {fMM_SiLiE_Energy.push_back(Energy);}
+ void SetMMSiLiEDetectorNbr(const Short_t DetNbr) {fMM_SiLiE_DetectorNbr.push_back(DetNbr);}
+ void SetMMSiLiEPadNbr(const UShort_t PadNbr) {fMM_SiLiE_PadNbr.push_back(PadNbr);}
+ void SetMMSiLiEEnergy(const Double_t Energy) {fMM_SiLiE_Energy.push_back(Energy);}
//(T)
- void SetMMSiLiTDetectorNbr(UShort_t DetNbr) {fMM_SiLiT_DetectorNbr.push_back(DetNbr);}
- void SetMMSiLiTPadNbr(UShort_t PadNbr) {fMM_SiLiT_PadNbr.push_back(PadNbr);}
- void SetMMSiLiTTime(Double_t Time) {fMM_SiLiT_Time.push_back(Time);}
+ void SetMMSiLiTDetectorNbr(const UShort_t DetNbr) {fMM_SiLiT_DetectorNbr.push_back(DetNbr);}
+ void SetMMSiLiTPadNbr(const UShort_t PadNbr) {fMM_SiLiT_PadNbr.push_back(PadNbr);}
+ void SetMMSiLiTTime(const Double_t Time) {fMM_SiLiT_Time.push_back(Time);}
// CsI
// (E)
- void SetMMCsIEDetectorNbr(UShort_t DetNbr) {fMM_CsIE_DetectorNbr.push_back(DetNbr);}
- void SetMMCsIECristalNbr(UShort_t CristalNbr) {fMM_CsIE_CristalNbr.push_back(CristalNbr);}
- void SetMMCsIEEnergy(Double_t Energy) {fMM_CsIE_Energy.push_back(Energy);}
+ void SetMMCsIEDetectorNbr(const UShort_t DetNbr) {fMM_CsIE_DetectorNbr.push_back(DetNbr);}
+ void SetMMCsIECristalNbr(const UShort_t CristalNbr) {fMM_CsIE_CristalNbr.push_back(CristalNbr);}
+ void SetMMCsIEEnergy(const Double_t Energy) {fMM_CsIE_Energy.push_back(Energy);}
// (T)
- void SetMMCsITDetectorNbr(UShort_t DetNbr) {fMM_CsIT_DetectorNbr.push_back(DetNbr);}
- void SetMMCsITCristalNbr(UShort_t CristalNbr) {fMM_CsIT_CristalNbr.push_back(CristalNbr);}
- void SetMMCsITTime(Double_t Time) {fMM_CsIT_Time.push_back(Time);}
+ void SetMMCsITDetectorNbr(const UShort_t DetNbr) {fMM_CsIT_DetectorNbr.push_back(DetNbr);}
+ void SetMMCsITCristalNbr(const UShort_t CristalNbr) {fMM_CsIT_CristalNbr.push_back(CristalNbr);}
+ void SetMMCsITTime(const Double_t Time) {fMM_CsIT_Time.push_back(Time);}
///////////////////// GETTERS ////////////////////////
// DSSD
// (X,E)
- UShort_t GetMMStripXEMult() {return fMM_StripXE_DetectorNbr.size();}
- UShort_t GetMMStripXEDetectorNbr(Int_t i) {return fMM_StripXE_DetectorNbr.at(i);}
- UShort_t GetMMStripXEStripNbr(Int_t i) {return fMM_StripXE_StripNbr.at(i);}
- Double_t GetMMStripXEEnergy(Int_t i) {return fMM_StripXE_Energy.at(i);}
+ UShort_t GetMMStripXEMult() const {return fMM_StripXE_DetectorNbr.size();}
+ UShort_t GetMMStripXEDetectorNbr(const Int_t i) const {return fMM_StripXE_DetectorNbr[i];}
+ UShort_t GetMMStripXEStripNbr(const Int_t i) const {return fMM_StripXE_StripNbr[i];}
+ Double_t GetMMStripXEEnergy(const Int_t i) const {return fMM_StripXE_Energy[i];}
// (X,T)
- UShort_t GetMMStripXTMult() {return fMM_StripXT_DetectorNbr.size();}
- UShort_t GetMMStripXTDetectorNbr(Int_t i) {return fMM_StripXT_DetectorNbr.at(i);}
- UShort_t GetMMStripXTStripNbr(Int_t i) {return fMM_StripXT_StripNbr.at(i);}
- Double_t GetMMStripXTTime(Int_t i) {return fMM_StripXT_Time.at(i);}
+ UShort_t GetMMStripXTMult() const {return fMM_StripXT_DetectorNbr.size();}
+ UShort_t GetMMStripXTDetectorNbr(const Int_t i) const {return fMM_StripXT_DetectorNbr[i];}
+ UShort_t GetMMStripXTStripNbr(const Int_t i) const {return fMM_StripXT_StripNbr[i];}
+ Double_t GetMMStripXTTime(const Int_t i) const {return fMM_StripXT_Time[i];}
// (Y,E)
- UShort_t GetMMStripYEMult() {return fMM_StripYE_DetectorNbr.size();}
- UShort_t GetMMStripYEDetectorNbr(Int_t i) {return fMM_StripYE_DetectorNbr.at(i);}
- UShort_t GetMMStripYEStripNbr(Int_t i) {return fMM_StripYE_StripNbr.at(i);}
- Double_t GetMMStripYEEnergy(Int_t i) {return fMM_StripYE_Energy.at(i);}
+ UShort_t GetMMStripYEMult() const {return fMM_StripYE_DetectorNbr.size();}
+ UShort_t GetMMStripYEDetectorNbr(const Int_t i) const {return fMM_StripYE_DetectorNbr[i];}
+ UShort_t GetMMStripYEStripNbr(const Int_t i) const {return fMM_StripYE_StripNbr[i];}
+ Double_t GetMMStripYEEnergy(const Int_t i) const {return fMM_StripYE_Energy[i];}
// (Y,T)
- UShort_t GetMMStripYTMult() {return fMM_StripYT_DetectorNbr.size();}
- UShort_t GetMMStripYTDetectorNbr(Int_t i) {return fMM_StripYT_DetectorNbr.at(i);}
- UShort_t GetMMStripYTStripNbr(Int_t i) {return fMM_StripYT_StripNbr.at(i);}
- Double_t GetMMStripYTTime(Int_t i) {return fMM_StripYT_Time.at(i);}
+ UShort_t GetMMStripYTMult() const {return fMM_StripYT_DetectorNbr.size();}
+ UShort_t GetMMStripYTDetectorNbr(const Int_t i) const {return fMM_StripYT_DetectorNbr[i];}
+ UShort_t GetMMStripYTStripNbr(const Int_t i) const {return fMM_StripYT_StripNbr[i];}
+ Double_t GetMMStripYTTime(const Int_t i) const {return fMM_StripYT_Time[i];}
// SiLi
//(E)
- UShort_t GetMMSiLiEMult() {return fMM_SiLiE_DetectorNbr.size();}
- UShort_t GetMMSiLiEDetectorNbr(Int_t i) {return fMM_SiLiE_DetectorNbr.at(i);}
- UShort_t GetMMSiLiEPadNbr(Int_t i) {return fMM_SiLiE_PadNbr.at(i);}
- Double_t GetMMSiLiEEnergy(Int_t i) {return fMM_SiLiE_Energy.at(i);}
+ UShort_t GetMMSiLiEMult() const {return fMM_SiLiE_DetectorNbr.size();}
+ UShort_t GetMMSiLiEDetectorNbr(const Int_t i) const {return fMM_SiLiE_DetectorNbr[i];}
+ UShort_t GetMMSiLiEPadNbr(const Int_t i) const {return fMM_SiLiE_PadNbr[i];}
+ Double_t GetMMSiLiEEnergy(const Int_t i) const {return fMM_SiLiE_Energy[i];}
//(T)
- UShort_t GetMMSiLiTMult() {return fMM_SiLiT_DetectorNbr.size();}
- UShort_t GetMMSiLiTDetectorNbr(Int_t i) {return fMM_SiLiT_DetectorNbr.at(i);}
- UShort_t GetMMSiLiTPadNbr(Int_t i) {return fMM_SiLiT_PadNbr.at(i);}
- Double_t GetMMSiLiTTime(Int_t i) {return fMM_SiLiT_Time.at(i);}
+ UShort_t GetMMSiLiTMult() const {return fMM_SiLiT_DetectorNbr.size();}
+ UShort_t GetMMSiLiTDetectorNbr(const Int_t i) const {return fMM_SiLiT_DetectorNbr[i];}
+ UShort_t GetMMSiLiTPadNbr(const Int_t i) const {return fMM_SiLiT_PadNbr[i];}
+ Double_t GetMMSiLiTTime(const Int_t i) const {return fMM_SiLiT_Time[i];}
// CsI
//(E)
- UShort_t GetMMCsIEMult() {return fMM_CsIE_DetectorNbr.size();}
- UShort_t GetMMCsIEDetectorNbr(Int_t i) {return fMM_CsIE_DetectorNbr.at(i);}
- UShort_t GetMMCsIECristalNbr(Int_t i) {return fMM_CsIE_CristalNbr.at(i);}
- Double_t GetMMCsIEEnergy(Int_t i) {return fMM_CsIE_Energy.at(i);}
+ UShort_t GetMMCsIEMult() const {return fMM_CsIE_DetectorNbr.size();}
+ UShort_t GetMMCsIEDetectorNbr(const Int_t i) const {return fMM_CsIE_DetectorNbr[i];}
+ UShort_t GetMMCsIECristalNbr(const Int_t i) const {return fMM_CsIE_CristalNbr[i];}
+ Double_t GetMMCsIEEnergy(const Int_t i) const {return fMM_CsIE_Energy[i];}
//(T)
- UShort_t GetMMCsITMult() {return fMM_CsIT_DetectorNbr.size();}
- UShort_t GetMMCsITDetectorNbr(Int_t i) {return fMM_CsIT_DetectorNbr.at(i);}
- UShort_t GetMMCsITCristalNbr(Int_t i) {return fMM_CsIT_CristalNbr.at(i);}
- Double_t GetMMCsITTime(Int_t i) {return fMM_CsIT_Time.at(i);}
+ UShort_t GetMMCsITMult() const {return fMM_CsIT_DetectorNbr.size();}
+ UShort_t GetMMCsITDetectorNbr(const Int_t i) const {return fMM_CsIT_DetectorNbr[i];}
+ UShort_t GetMMCsITCristalNbr(const Int_t i) const {return fMM_CsIT_CristalNbr[i];}
+ Double_t GetMMCsITTime(const Int_t i) const {return fMM_CsIT_Time[i];}
ClassDef(TMust2Data,2) // Must2Data structure
};
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index 233a69168..755c5e545 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -526,20 +526,20 @@ vector < TVector2 > TMust2Physics :: Match_X_Y()
////////////////////////////////////////////////////////////////////////////
-bool TMust2Physics :: IsValidChannel(string DetectorType, int telescope , int channel)
+bool TMust2Physics :: IsValidChannel(const string DetectorType, const int telescope , const int channel)
{
- vector<bool>::iterator it ;
+
if(DetectorType == "X")
- return *(m_XChannelStatus[telescope].begin()+channel);
+ return *(m_XChannelStatus[telescope].begin()+channel-1);
else if(DetectorType == "Y")
- return *(m_YChannelStatus[telescope].begin()+channel);
+ return *(m_YChannelStatus[telescope].begin()+channel-1);
else if(DetectorType == "SiLi")
- return *(m_SiLiChannelStatus[telescope].begin()+channel);
+ return *(m_SiLiChannelStatus[telescope].begin()+channel-1);
else if(DetectorType == "CsI")
- return *(m_CsIChannelStatus[telescope].begin()+channel);
+ return *(m_CsIChannelStatus[telescope].begin()+channel-1);
else return false;
}
@@ -622,22 +622,22 @@ void TMust2Physics::ReadAnalysisConfig()
int channel = -1;
if (DataBuffer.compare(3,4,"STRX") == 0) {
channel = atoi(DataBuffer.substr(7).c_str());
- *(m_XChannelStatus[telescope].begin()+channel) = false;
+ *(m_XChannelStatus[telescope].begin()+channel-1) = false;
}
else if (DataBuffer.compare(3,4,"STRY") == 0) {
channel = atoi(DataBuffer.substr(7).c_str());
- *(m_YChannelStatus[telescope].begin()+channel) = false;
+ *(m_YChannelStatus[telescope].begin()+channel-1) = false;
}
else if (DataBuffer.compare(3,4,"SILI") == 0) {
channel = atoi(DataBuffer.substr(7).c_str());
- *(m_SiLiChannelStatus[telescope].begin()+channel) = false;
+ *(m_SiLiChannelStatus[telescope].begin()+channel-1) = false;
}
else if (DataBuffer.compare(3,3,"CSI") == 0) {
channel = atoi(DataBuffer.substr(6).c_str());
- *(m_CsIChannelStatus[telescope].begin()+channel) = false;
+ *(m_CsIChannelStatus[telescope].begin()+channel-1) = false;
}
else cout << "Warning: detector type for Must2 unknown!" << endl;
@@ -1238,15 +1238,15 @@ void TMust2Physics::InitializeStandardParameter()
ChannelStatus.resize(128,true);
for(int i = 0 ; i < m_NumberOfTelescope ; i ++)
{
- m_XChannelStatus[i+1] = ChannelStatus;
- m_YChannelStatus[i+1] = ChannelStatus;
+ m_XChannelStatus[i] = ChannelStatus;
+ m_YChannelStatus[i] = ChannelStatus;
}
ChannelStatus.resize(16,true);
for(int i = 0 ; i < m_NumberOfTelescope ; i ++)
{
- m_SiLiChannelStatus[i+1] = ChannelStatus;
- m_CsIChannelStatus[i+1] = ChannelStatus;
+ m_SiLiChannelStatus[i] = ChannelStatus;
+ m_CsIChannelStatus[i] = ChannelStatus;
}
@@ -1402,27 +1402,27 @@ namespace MUST2_LOCAL
// DSSD
// X
- double fSi_X_E(TMust2Data* m_EventData , const int i)
+ double fSi_X_E(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMStripXEDetectorNbr(i) ) + "_Si_X" + itoa( m_EventData->GetMMStripXEStripNbr(i) ) + "_E",
m_EventData->GetMMStripXEEnergy(i) );
}
- double fSi_X_T(TMust2Data* m_EventData , const int i)
+ double fSi_X_T(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMStripXTDetectorNbr(i) ) + "_Si_X" + itoa( m_EventData->GetMMStripXTStripNbr(i) ) +"_T",
m_EventData->GetMMStripXTTime(i) );
}
// Y
- double fSi_Y_E(TMust2Data* m_EventData , const int i)
+ double fSi_Y_E(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMStripYEDetectorNbr(i) ) + "_Si_Y" + itoa( m_EventData->GetMMStripYEStripNbr(i) ) +"_E",
m_EventData->GetMMStripYEEnergy(i) );
}
- double fSi_Y_T(TMust2Data* m_EventData , const int i)
+ double fSi_Y_T(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMStripYTDetectorNbr(i) ) + "_Si_Y" + itoa( m_EventData->GetMMStripYTStripNbr(i) ) +"_T",
m_EventData->GetMMStripYTTime(i) );
@@ -1430,26 +1430,26 @@ namespace MUST2_LOCAL
// SiLi
- double fSiLi_E(TMust2Data* m_EventData , const int i)
+ double fSiLi_E(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMSiLiEDetectorNbr(i) ) + "_SiLi" + itoa( m_EventData->GetMMSiLiEPadNbr(i) ) +"_E",
m_EventData->GetMMSiLiEEnergy(i) );
}
- double fSiLi_T(TMust2Data* m_EventData , const int i)
+ double fSiLi_T(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMSiLiTDetectorNbr(i) ) + "_SiLi" + itoa( m_EventData->GetMMSiLiTPadNbr(i) )+"_T",
m_EventData->GetMMSiLiTTime(i) );
}
// CsI
- double fCsI_E(TMust2Data* m_EventData , const int i)
+ double fCsI_E(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMCsIEDetectorNbr(i) ) + "_CsI" + itoa( m_EventData->GetMMCsIECristalNbr(i) ) +"_E",
m_EventData->GetMMCsIEEnergy(i) );
}
- double fCsI_T(TMust2Data* m_EventData , const int i)
+ double fCsI_T(const TMust2Data* m_EventData , const int i)
{
return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + itoa( m_EventData->GetMMCsITDetectorNbr(i) ) + "_CsI" + itoa( m_EventData->GetMMCsITCristalNbr(i) ) +"_T",
m_EventData->GetMMCsITTime(i) );
diff --git a/NPLib/MUST2/TMust2Physics.h b/NPLib/MUST2/TMust2Physics.h
index 43f23adda..5c109e669 100644
--- a/NPLib/MUST2/TMust2Physics.h
+++ b/NPLib/MUST2/TMust2Physics.h
@@ -132,7 +132,7 @@ class TMust2Physics : public TObject, public NPA::VDetector
// Return false if the channel is disabled by user
// Frist argument is either "X","Y","SiLi","CsI"
- bool IsValidChannel(string DetectorType, int telescope , int channel);
+ bool IsValidChannel(const string DetectorType, const int telescope , const int channel);
// Initialize the standard parameter for analysis
// ie: all channel enable, maximum multiplicity for strip = number of telescope
@@ -249,20 +249,20 @@ namespace MUST2_LOCAL
string itoa(int value);
// DSSD
// X
- double fSi_X_E(TMust2Data* Data, const int i);
- double fSi_X_T(TMust2Data* Data, const int i);
+ double fSi_X_E(const TMust2Data* Data, const int i);
+ double fSi_X_T(const TMust2Data* Data, const int i);
// Y
- double fSi_Y_E(TMust2Data* Data, const int i);
- double fSi_Y_T(TMust2Data* Data, const int i);
+ double fSi_Y_E(const TMust2Data* Data, const int i);
+ double fSi_Y_T(const TMust2Data* Data, const int i);
// SiLi
- double fSiLi_E(TMust2Data* Data, const int i);
- double fSiLi_T(TMust2Data* Data, const int i);
+ double fSiLi_E(const TMust2Data* Data, const int i);
+ double fSiLi_T(const TMust2Data* Data, const int i);
// CsI
- double fCsI_E(TMust2Data* Data, const int i);
- double fCsI_T(TMust2Data* Data, const int i);
+ double fCsI_E(const TMust2Data* Data, const int i);
+ double fCsI_T(const TMust2Data* Data, const int i);
}
diff --git a/NPLib/SSSD/TSSSDData.h b/NPLib/SSSD/TSSSDData.h
index 3eaa01184..e647c5020 100644
--- a/NPLib/SSSD/TSSSDData.h
+++ b/NPLib/SSSD/TSSSDData.h
@@ -61,14 +61,14 @@ class TSSSDData : public TObject {
// DSSD
// (X,E)
UShort_t GetEnergyMult () const { return fSSSD_StripE_DetectorNbr.size() ;}
- UShort_t GetEnergyDetectorNbr (const Int_t i) const { return fSSSD_StripE_DetectorNbr.at(i) ;}
- UShort_t GetEnergyStripNbr (const Int_t i) const { return fSSSD_StripE_StripNbr.at(i) ;}
- Double_t GetEnergy (const Int_t i) const { return fSSSD_StripE_Energy.at(i) ;}
+ UShort_t GetEnergyDetectorNbr (const Int_t i) const { return fSSSD_StripE_DetectorNbr[i] ;}
+ UShort_t GetEnergyStripNbr (const Int_t i) const { return fSSSD_StripE_StripNbr[i] ;}
+ Double_t GetEnergy (const Int_t i) const { return fSSSD_StripE_Energy[i] ;}
// (X,T)
UShort_t GetTimeMult () const { return fSSSD_StripT_DetectorNbr.size() ;}
- UShort_t GetTimeDetectorNbr (const Int_t i) const { return fSSSD_StripT_DetectorNbr.at(i) ;}
- UShort_t GetTimeStripNbr (const Int_t i) const { return fSSSD_StripT_StripNbr.at(i) ;}
- Double_t GetTime (const Int_t i) const { return fSSSD_StripT_Time.at(i) ;}
+ UShort_t GetTimeDetectorNbr (const Int_t i) const { return fSSSD_StripT_DetectorNbr[i] ;}
+ UShort_t GetTimeStripNbr (const Int_t i) const { return fSSSD_StripT_StripNbr[i] ;}
+ Double_t GetTime (const Int_t i) const { return fSSSD_StripT_Time[i] ;}
ClassDef(TSSSDData,1) // SSSDData structure
};
--
GitLab