diff --git a/NPLib/LaBr3/TLaBr3Physics.cxx b/NPLib/LaBr3/TLaBr3Physics.cxx index 78f540f0b1972348b49207b75c94b520f53f497c..7b765a3d596893c7afce8e504e542bb2a0595102 100644 --- a/NPLib/LaBr3/TLaBr3Physics.cxx +++ b/NPLib/LaBr3/TLaBr3Physics.cxx @@ -60,8 +60,7 @@ TLaBr3Physics::~TLaBr3Physics() /////////////////////////////////////////////////////////////////////////// void TLaBr3Physics::Clear() { - DetectorTNumber.clear() ; - DetectorENumber.clear() ; + DetectorNumber.clear() ; Energy.clear() ; Time.clear() ; } @@ -286,13 +285,9 @@ void TLaBr3Physics::BuildSimplePhysicalEvent() { for(unsigned int i = 0 ; i < EventData->GetEnergyMult() ; i++) { - DetectorENumber.push_back( EventData->GetENumber(i) ) ; + DetectorNumber.push_back( EventData->GetENumber(i) ) ; Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector" + itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i) ) ); - } - for(unsigned int i = 0 ; i < EventData->GetEnergyMult() ; i++) - { - DetectorTNumber.push_back( EventData->GetTNumber(i) ) ; - Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "LaBr3/Detector" + itoa( EventData->GetTNumber(i) ) +"_T",EventData->GetTTime(i) ) ); + Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "LaBr3/Detector" + itoa( EventData->GetENumber(i) ) +"_T",EventData->GetTTime(i) ) ); } } diff --git a/NPLib/LaBr3/TLaBr3Physics.h b/NPLib/LaBr3/TLaBr3Physics.h index 6e8e23ff8b96d032a85c9eb8defed6068b838942..8637d3d0a365e445acd5836f3cc2c30c1eaf014c 100644 --- a/NPLib/LaBr3/TLaBr3Physics.h +++ b/NPLib/LaBr3/TLaBr3Physics.h @@ -45,8 +45,7 @@ class TLaBr3Physics : public TObject, public NPA::VDetector void Clear(const Option_t*) {}; public: // Calibrated Data - vector<UShort_t> DetectorENumber ; - vector<UShort_t> DetectorTNumber ; + vector<UShort_t> DetectorNumber ; vector<Double_t> Energy; vector<Double_t> Time;