diff --git a/NPLib/AnnularS1/TAnnularS1Physics.cxx b/NPLib/AnnularS1/TAnnularS1Physics.cxx
index 28e2f3c041bce2ee175edf91098e37606f445f50..ea818fe6c395f8a139ab1473ac2a94fd308ba9f0 100644
--- a/NPLib/AnnularS1/TAnnularS1Physics.cxx
+++ b/NPLib/AnnularS1/TAnnularS1Physics.cxx
@@ -449,17 +449,17 @@ void TAnnularS1Physics::AddParameterToCalibrationManager(){
for(int i = 0 ; i < m_NumberOfDetector ; ++i){
for( int j = 0 ; j < 24 ; ++j){
- Cal->AddParameter("ANNULARS1", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E",
- "ANNULARS1_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E");
- Cal->AddParameter("ANNULARS1", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T",
- "ANNULARS1_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T");
+ Cal->AddParameter("ANNULARS1", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E",
+ "ANNULARS1_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E");
+ Cal->AddParameter("ANNULARS1", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T",
+ "ANNULARS1_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T");
}
for( int j = 0 ; j < 48 ; ++j){
- Cal->AddParameter("ANNULARS1", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E",
- "ANNULARS1_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E");
- Cal->AddParameter("ANNULARS1", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T",
- "ANNULARS1_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T");
+ Cal->AddParameter("ANNULARS1", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E",
+ "ANNULARS1_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E");
+ Cal->AddParameter("ANNULARS1", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T",
+ "ANNULARS1_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T");
}
}
@@ -580,13 +580,6 @@ void TAnnularS1Physics::InitializeStandardParameter(){
///////////////////////////////////////////////////////////////////////////
namespace ANNULARS1_LOCAL{
- // tranform an integer to a string
- stringNPA::itoa(unsigned int value){
- char buffer [33];
- sprintf(buffer,"%d",value);
- return buffer;
- }
-
// DSSD
// Ring
double fStrip_Ring_E(const TS1Data* m_EventData , const int& i){
diff --git a/NPLib/Charissa/TCharissaPhysics.cxx b/NPLib/Charissa/TCharissaPhysics.cxx
index 77e3b76ecf9b3cc897a924b2d2996b56579666f4..9062734b8471a5392cceae0ce2ffb8fd3c66e1a1 100644
--- a/NPLib/Charissa/TCharissaPhysics.cxx
+++ b/NPLib/Charissa/TCharissaPhysics.cxx
@@ -990,19 +990,19 @@ void TCharissaPhysics::AddParameterToCalibrationManager()
for(unsigned int i = 0 ; i < m_NumberOfTelescope ; ++i){
for(unsigned int j = 0 ; j < m_NumberOfStrip ; ++j){
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_DE_X"+itoa(j+1)+"_E","CHARISSA_T"+itoa(i+1)+"_DE_X"+itoa(j+1)+"_E") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_DE_Y"+itoa(j+1)+"_E","CHARISSA_T"+itoa(i+1)+"_DE_Y"+itoa(j+1)+"_E") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_DE_X"+itoa(j+1)+"_T","CHARISSA_T"+itoa(i+1)+"_DE_X"+itoa(j+1)+"_T") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_DE_Y"+itoa(j+1)+"_T","CHARISSA_T"+itoa(i+1)+"_DE_Y"+itoa(j+1)+"_T") ;
-
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_E_X"+itoa(j+1)+"_E","CHARISSA_T"+itoa(i+1)+"_E_X"+itoa(j+1)+"_E") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_E_Y"+itoa(j+1)+"_E","CHARISSA_T"+itoa(i+1)+"_E_Y"+itoa(j+1)+"_E") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_E_X"+itoa(j+1)+"_T","CHARISSA_T"+itoa(i+1)+"_E_X"+itoa(j+1)+"_T") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_E_Y"+itoa(j+1)+"_T","CHARISSA_T"+itoa(i+1)+"_E_Y"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_DE_X"+ NPA::itoa(j+1)+"_E","CHARISSA_T"+ NPA::itoa(i+1)+"_DE_X"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_DE_Y"+ NPA::itoa(j+1)+"_E","CHARISSA_T"+ NPA::itoa(i+1)+"_DE_Y"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_DE_X"+ NPA::itoa(j+1)+"_T","CHARISSA_T"+ NPA::itoa(i+1)+"_DE_X"+ NPA::itoa(j+1)+"_T") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_DE_Y"+ NPA::itoa(j+1)+"_T","CHARISSA_T"+ NPA::itoa(i+1)+"_DE_Y"+ NPA::itoa(j+1)+"_T") ;
+
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_E_X"+ NPA::itoa(j+1)+"_E","CHARISSA_T"+ NPA::itoa(i+1)+"_E_X"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_E_Y"+ NPA::itoa(j+1)+"_E","CHARISSA_T"+ NPA::itoa(i+1)+"_E_Y"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_E_X"+ NPA::itoa(j+1)+"_T","CHARISSA_T"+ NPA::itoa(i+1)+"_E_X"+ NPA::itoa(j+1)+"_T") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_E_Y"+ NPA::itoa(j+1)+"_T","CHARISSA_T"+ NPA::itoa(i+1)+"_E_Y"+ NPA::itoa(j+1)+"_T") ;
}
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_CsI_E","CHARISSA_T"+itoa(i+1)+"_CsI_E") ;
- Cal->AddParameter("CHARISSA", "T"+itoa(i+1)+"_CsI_T","CHARISSA_T"+itoa(i+1)+"_CsI_T") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_CsI_E","CHARISSA_T"+ NPA::itoa(i+1)+"_CsI_E") ;
+ Cal->AddParameter("CHARISSA", "T"+ NPA::itoa(i+1)+"_CsI_T","CHARISSA_T"+ NPA::itoa(i+1)+"_CsI_T") ;
}
@@ -1304,26 +1304,26 @@ namespace CHARISSA_LOCAL
// X
double fDE_X_E(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer1StripXEDetectorNbr(i) ) + "_DE_X" + itoa( m_EventData->GetCharissaLayer1StripXEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer1StripXEDetectorNbr(i) ) + "_DE_X" + NPA::itoa( m_EventData->GetCharissaLayer1StripXEStripNbr(i) ) + "_E",
m_EventData->GetCharissaLayer1StripXEEnergy(i) );
}
double fDE_X_T(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer1StripXTDetectorNbr(i) ) + "_DE_X" + itoa( m_EventData->GetCharissaLayer1StripXTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer1StripXTDetectorNbr(i) ) + "_DE_X" + NPA::itoa( m_EventData->GetCharissaLayer1StripXTStripNbr(i) ) +"_T",
m_EventData->GetCharissaLayer1StripXTTime(i) );
}
// Y
double fDE_Y_E(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer1StripYEDetectorNbr(i) ) + "_DE_Y" + itoa( m_EventData->GetCharissaLayer1StripYEStripNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer1StripYEDetectorNbr(i) ) + "_DE_Y" + NPA::itoa( m_EventData->GetCharissaLayer1StripYEStripNbr(i) ) +"_E",
m_EventData->GetCharissaLayer1StripYEEnergy(i) );
}
double fDE_Y_T(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer1StripYTDetectorNbr(i) ) + "_DE_Y" + itoa( m_EventData->GetCharissaLayer1StripYTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer1StripYTDetectorNbr(i) ) + "_DE_Y" + NPA::itoa( m_EventData->GetCharissaLayer1StripYTStripNbr(i) ) +"_T",
m_EventData->GetCharissaLayer1StripYTTime(i) );
}
@@ -1331,26 +1331,26 @@ namespace CHARISSA_LOCAL
// X
double fE_X_E(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer2StripXEDetectorNbr(i) ) + "_E_X" + itoa( m_EventData->GetCharissaLayer2StripXEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer2StripXEDetectorNbr(i) ) + "_E_X" + NPA::itoa( m_EventData->GetCharissaLayer2StripXEStripNbr(i) ) + "_E",
m_EventData->GetCharissaLayer2StripXEEnergy(i) );
}
double fE_X_T(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer2StripXTDetectorNbr(i) ) + "_E_X" + itoa( m_EventData->GetCharissaLayer2StripXTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer2StripXTDetectorNbr(i) ) + "_E_X" + NPA::itoa( m_EventData->GetCharissaLayer2StripXTStripNbr(i) ) +"_T",
m_EventData->GetCharissaLayer2StripXTTime(i) );
}
// Y
double fE_Y_E(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer2StripYEDetectorNbr(i) ) + "_E_Y" + itoa( m_EventData->GetCharissaLayer2StripYEStripNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer2StripYEDetectorNbr(i) ) + "_E_Y" + NPA::itoa( m_EventData->GetCharissaLayer2StripYEStripNbr(i) ) +"_E",
m_EventData->GetCharissaLayer2StripYEEnergy(i) );
}
double fE_Y_T(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaLayer2StripYTDetectorNbr(i) ) + "_E_Y" + itoa( m_EventData->GetCharissaLayer2StripYTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaLayer2StripYTDetectorNbr(i) ) + "_E_Y" + NPA::itoa( m_EventData->GetCharissaLayer2StripYTStripNbr(i) ) +"_T",
m_EventData->GetCharissaLayer2StripYTTime(i) );
}
@@ -1358,13 +1358,13 @@ namespace CHARISSA_LOCAL
// CsI
double fCsI_E(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaCsIEDetectorNbr(i) ) + "_CsI" + itoa( m_EventData->GetCharissaCsIECristalNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaCsIEDetectorNbr(i) ) + "_CsI" + NPA::itoa( m_EventData->GetCharissaCsIECristalNbr(i) ) +"_E",
m_EventData->GetCharissaCsIEEnergy(i) );
}
double fCsI_T(const TCharissaData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + itoa( m_EventData->GetCharissaCsITDetectorNbr(i) ) + "_CsI" + itoa( m_EventData->GetCharissaCsITCristalNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CHARISSA/T" + NPA::itoa( m_EventData->GetCharissaCsITDetectorNbr(i) ) + "_CsI" + NPA::itoa( m_EventData->GetCharissaCsITCristalNbr(i) ) +"_T",
m_EventData->GetCharissaCsITTime(i) );
}
diff --git a/NPLib/ChateauCristal/TChateauCristalPhysics.cxx b/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
index 07a72d39015d6cd47f513526a9c9a016815fa6c8..61eb0e67805c75809ea423e2e095c35315426423 100644
--- a/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
+++ b/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
@@ -167,8 +167,8 @@ void TChateauCristalPhysics::AddParameterToCalibrationManager()
CalibrationManager* Cal = CalibrationManager::getInstance();
for(int i = 0 ; i < m_NumberOfDetectors ; ++i){
- Cal->AddParameter("ChateauCristal", "Detector"+itoa(i)+"_E","ChateauCristal_DETECTOR_"+itoa(i)+"_E") ;
- Cal->AddParameter("ChateauCristal", "Detector"+itoa(i)+"_T","ChateauCristal_DETECTOR_"+itoa(i)+"_T") ;
+ Cal->AddParameter("ChateauCristal", "Detector"+ NPA::itoa(i)+"_E","ChateauCristal_DETECTOR_"+ NPA::itoa(i)+"_E") ;
+ Cal->AddParameter("ChateauCristal", "Detector"+ NPA::itoa(i)+"_T","ChateauCristal_DETECTOR_"+ NPA::itoa(i)+"_T") ;
}
}
@@ -492,13 +492,13 @@ double TChateauCristalPhysics::DopplerCorrection(double E, double Theta)
///////////////////////////////////////////////////////////////////////////
double ChateauCristal_LOCAL::fChateauCristal_E( const TChateauCristalData* m_EventData , const int i )
{
- return CalibrationManager::getInstance()->ApplyCalibration("ChateauCristal/Detector" + itoa( m_EventData->GetChateauCristalEDetectorNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration("ChateauCristal/Detector" + NPA::itoa( m_EventData->GetChateauCristalEDetectorNbr(i) ) +"_E",
m_EventData->GetChateauCristalEnergy(i)+gRandom->Uniform()-0.5 );
}
double ChateauCristal_LOCAL::fChateauCristal_T( const TChateauCristalData* m_EventData , const int i )
{
- return CalibrationManager::getInstance()->ApplyCalibration("ChateauCristal/Detector" + itoa( m_EventData->GetChateauCristalTDetectorNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration("ChateauCristal/Detector" + NPA::itoa( m_EventData->GetChateauCristalTDetectorNbr(i) ) +"_T",
m_EventData->GetChateauCristalTime(i) +gRandom->Uniform()-0.5);
}
diff --git a/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx b/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
index d0bca7a89ca0b7e8ce0dd63138c0ee36d546b735..4eb8c99f36a7de624246d1179e4299b4b92d35f9 100644
--- a/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
+++ b/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
@@ -555,12 +555,12 @@ void TComptonTelescopePhysics::AddParameterToCalibrationManager()
for (int i = 0; i < m_NumberOfDetector; ++i) {
for (int j = 0; j < 32; ++j) {
- Cal->AddParameter("COMPTONTELESCOPE", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E", "COMPTONTELESCOPE_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E");
- Cal->AddParameter("COMPTONTELESCOPE", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T", "COMPTONTELESCOPE_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T");
+ Cal->AddParameter("COMPTONTELESCOPE", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E", "COMPTONTELESCOPE_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E");
+ Cal->AddParameter("COMPTONTELESCOPE", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T", "COMPTONTELESCOPE_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T");
}
for (int j = 0; j < 32; ++j) {
- Cal->AddParameter("COMPTONTELESCOPE", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E", "COMPTONTELESCOPE_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E");
- Cal->AddParameter("COMPTONTELESCOPE", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T", "COMPTONTELESCOPE_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T");
+ Cal->AddParameter("COMPTONTELESCOPE", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E", "COMPTONTELESCOPE_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E");
+ Cal->AddParameter("COMPTONTELESCOPE", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T", "COMPTONTELESCOPE_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T");
}
}
@@ -729,13 +729,13 @@ namespace ComptonTelescope_LOCAL
// Front
double fStrip_Front_E(const TComptonTelescopeData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("COMPTONTELESCOPE/D" + itoa(m_EventData->GetCTTrackerFrontEDetectorNbr(i)) + "_STRIP_FRONT" + itoa(m_EventData->GetCTTrackerFrontEStripNbr(i)) + "_E", m_EventData->GetCTTrackerFrontEEnergy(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("COMPTONTELESCOPE/D" + NPA::itoa(m_EventData->GetCTTrackerFrontEDetectorNbr(i)) + "_STRIP_FRONT" + NPA::itoa(m_EventData->GetCTTrackerFrontEStripNbr(i)) + "_E", m_EventData->GetCTTrackerFrontEEnergy(i));
}
// Back
double fStrip_Back_E(const TComptonTelescopeData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("COMPTONTELESCOPE/D" + itoa(m_EventData->GetCTTrackerBackEDetectorNbr(i)) + "_STRIP_BACK" + itoa(m_EventData->GetCTTrackerBackEStripNbr(i)) + "_E", m_EventData->GetCTTrackerBackEEnergy(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("COMPTONTELESCOPE/D" + NPA::itoa(m_EventData->GetCTTrackerBackEDetectorNbr(i)) + "_STRIP_BACK" + NPA::itoa(m_EventData->GetCTTrackerBackEStripNbr(i)) + "_E", m_EventData->GetCTTrackerBackEEnergy(i));
}
}
diff --git a/NPLib/EXL/TExlPhysics.cxx b/NPLib/EXL/TExlPhysics.cxx
index d62fa0de84208cca50791774ef4a63eee08fed38..4d43ebf26be1910f0631a588c115d05aaa4a4ff8 100644
--- a/NPLib/EXL/TExlPhysics.cxx
+++ b/NPLib/EXL/TExlPhysics.cxx
@@ -220,8 +220,8 @@ void TExlPhysics::AddParameterToCalibrationManager()
for(unsigned int i = 0 ; i < NumberOfCrystal ; i++)
{
- Cal->AddParameter("EXL", "_E_"+itoa(i+1),"EXL_E_"+itoa(i+1)) ;
- Cal->AddParameter("EXL", "_T_"+itoa(i+1),"EXL_T_"+itoa(i+1)) ;
+ Cal->AddParameter("EXL", "_E_"+ NPA::itoa(i+1),"EXL_E_"+ NPA::itoa(i+1)) ;
+ Cal->AddParameter("EXL", "_T_"+ NPA::itoa(i+1),"EXL_T_"+ NPA::itoa(i+1)) ;
}
}
@@ -266,7 +266,7 @@ void TExlPhysics::BuildSimplePhysicalEvent()
if(EventData->GetEnergy(i)>m_E_RAW_Threshold)
{
CrystalNumber.push_back( EventData->GetExlNumber(i)) ;
- EXL_Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("EXL/_E_" + itoa( EventData->GetExlNumber(i) ),EventData->GetEnergy(i) ) );
+ EXL_Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("EXL/_E_" + NPA::itoa( EventData->GetExlNumber(i) ),EventData->GetEnergy(i) ) );
}
}
}
@@ -280,7 +280,7 @@ void TExlPhysics::BuildSimplePhysicalEvent()
{
for(unsigned int i = 0 ; i < EventData->GetTimeMult() ; i++)
{
- //EXL_Time.push_back( CalibrationManager::getInstance()->ApplyCalibration("EXL/_T_" + itoa( EventData->GetExlNumber(i) ),EventData->GetTime(i) ) );
+ //EXL_Time.push_back( CalibrationManager::getInstance()->ApplyCalibration("EXL/_T_" + NPA::itoa( EventData->GetExlNumber(i) ),EventData->GetTime(i) ) );
EXL_Time=EventData->GetTime(i);
}
}
diff --git a/NPLib/Exogam/TExogamPhysics.cxx b/NPLib/Exogam/TExogamPhysics.cxx
index 058c85572bc1279080577fa317c90623e580730a..74e5ed40afe9c3bf8fbe4618b15692e7e62e87bb 100644
--- a/NPLib/Exogam/TExogamPhysics.cxx
+++ b/NPLib/Exogam/TExogamPhysics.cxx
@@ -79,8 +79,8 @@ void TExogamPhysics::PreTreat()
int clover = EventData -> GetECCEClover(i);
int cristal = EventData -> GetECCECristal(i);
- if(EventData -> GetECCEEnergy(i) < 3000) cristal_E = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+itoa(clover)+"_Cr"+itoa(cristal)+"_Elow", EventData -> GetECCEEnergy(i));
- else cristal_E = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+itoa(clover)+"_Cr"+itoa(cristal)+"_Ehigh", EventData -> GetECCEEnergy(i));
+ if(EventData -> GetECCEEnergy(i) < 3000) cristal_E = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+ NPA::itoa(clover)+"_Cr"+ NPA::itoa(cristal)+"_Elow", EventData -> GetECCEEnergy(i));
+ else cristal_E = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+ NPA::itoa(clover)+"_Cr"+ NPA::itoa(cristal)+"_Ehigh", EventData -> GetECCEEnergy(i));
if(cristal_E > Threshold_ECC)
@@ -95,7 +95,7 @@ void TExogamPhysics::PreTreat()
if(clover == EventData -> GetECCTClover(k) && cristal == EventData -> GetECCTCristal(k)){
// cout << EventData -> GetECCTTime(k) << endl;
- if(EventData -> GetECCTTime(k) < 16383) cristal_T = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+itoa(clover)+"_Cr"+itoa(cristal)+"_T", EventData -> GetECCTTime(k));
+ if(EventData -> GetECCTTime(k) < 16383) cristal_T = CalibrationManager::getInstance()-> ApplyCalibration("EXOGAM/Cl"+ NPA::itoa(clover)+"_Cr"+ NPA::itoa(cristal)+"_T", EventData -> GetECCTTime(k));
else cristal_T = 2500;
//if(cristal_T >5000 && cristal_T !=25000 ) cout << "PreTreat " << cristal_T << " " << EventData -> GetECCTTime(k) << " " << clover << " " << cristal << " " << EventData->GetECCTMult() << endl;
@@ -140,7 +140,7 @@ void TExogamPhysics::PreTreat()
if(EventData -> GetGOCCEEEnergy(i) > RawThreshold_GOCCE)
{
- segment_E = CalibrationManager::getInstance()->ApplyCalibration("EXOGAM/Cl"+itoa(clover)+"_Cr"+itoa(cristal)+"_Seg"+itoa(segment)+"_E", EventData -> GetGOCCEEEnergy(i));
+ segment_E = CalibrationManager::getInstance()->ApplyCalibration("EXOGAM/Cl"+ NPA::itoa(clover)+"_Cr"+ NPA::itoa(cristal)+"_Seg"+ NPA::itoa(segment)+"_E", EventData -> GetGOCCEEEnergy(i));
if(segment_E > Threshold_GOCCE)
{
@@ -633,13 +633,13 @@ void TExogamPhysics::AddParameterToCalibrationManager()
{
for( int j = 0 ; j < 4 ; j++)
{
- Cal->AddParameter("EXOGAM", "Cl"+itoa(i)+"_Cr"+itoa(j)+"_Elow" ,"EXOGAM_Cl"+itoa(i)+"_Cr"+itoa(j)+"_Elow");
- Cal->AddParameter("EXOGAM", "Cl"+itoa(i)+"_Cr"+itoa(j)+"_Ehigh","EXOGAM_Cl"+itoa(i)+"_Cr"+itoa(j)+"_Ehigh");
- Cal->AddParameter("EXOGAM", "Cl"+itoa(i)+"_Cr"+itoa(j)+"_T","EXOGAM_Cl"+itoa(i)+"_Cr"+itoa(j)+"_T") ;
+ Cal->AddParameter("EXOGAM", "Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Elow" ,"EXOGAM_Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Elow");
+ Cal->AddParameter("EXOGAM", "Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Ehigh","EXOGAM_Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Ehigh");
+ Cal->AddParameter("EXOGAM", "Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_T","EXOGAM_Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_T") ;
for( int k = 0 ; k < 4 ; k++)
{
- Cal->AddParameter("EXOGAM", "Cl"+itoa(i)+"_Cr"+itoa(j)+"_Seg"+itoa(k)+"_E","EXOGAM_Cl"+itoa(i)+"_Cr"+itoa(j)+"_Seg"+itoa(k)+"_E") ;
+ Cal->AddParameter("EXOGAM", "Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Seg"+ NPA::itoa(k)+"_E","EXOGAM_Cl"+ NPA::itoa(i)+"_Cr"+ NPA::itoa(j)+"_Seg"+ NPA::itoa(k)+"_E") ;
}
}
}
diff --git a/NPLib/LaBr3/TLaBr3Physics.cxx b/NPLib/LaBr3/TLaBr3Physics.cxx
index 5d92f996de494a7f23a5e972a61376a331cb6d28..e0a096f9c1660f5070b65ebd4c4870523dbe878c 100644
--- a/NPLib/LaBr3/TLaBr3Physics.cxx
+++ b/NPLib/LaBr3/TLaBr3Physics.cxx
@@ -210,8 +210,8 @@ void TLaBr3Physics::AddParameterToCalibrationManager()
for(int i = 0 ; i < NumberOfDetector ; i++)
{
- Cal->AddParameter("LaBr3", "Detector"+itoa(i+1)+"_E","LaBr3_Detector"+itoa(i+1)+"_E") ;
- Cal->AddParameter("LaBr3", "Detector"+itoa(i+1)+"_T","LaBr3_Detector"+itoa(i+1)+"_T") ;
+ Cal->AddParameter("LaBr3", "Detector"+ NPA::itoa(i+1)+"_E","LaBr3_Detector"+ NPA::itoa(i+1)+"_E") ;
+ Cal->AddParameter("LaBr3", "Detector"+ NPA::itoa(i+1)+"_T","LaBr3_Detector"+ NPA::itoa(i+1)+"_T") ;
}
}
@@ -279,7 +279,7 @@ void TLaBr3Physics::PreTreat(){
{
if( EventData->GetEEnergy(i)>m_LaBr3_RAW_Threshold )
{
- E=CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector" + itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i));
+ E=CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector" + NPA::itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i));
if(E>m_LaBr3_E_Threshold)
{
PreTreatedData->SetENumber( EventData->GetENumber(i) );
@@ -289,7 +289,7 @@ void TLaBr3Physics::PreTreat(){
}
for(unsigned int i = 0 ; i < EventData->GetTimeMult() ; ++i)
{
- T=CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector"+itoa(EventData->GetTNumber(i))+"_T",EventData->GetTTime(i) ) ;
+ T=CalibrationManager::getInstance()->ApplyCalibration("LaBr3/Detector"+ NPA::itoa(EventData->GetTNumber(i))+"_T",EventData->GetTTime(i) ) ;
PreTreatedData->SetTNumber( EventData->GetTNumber(i) );
PreTreatedData->SetTTime( T );
diff --git a/NPLib/Misc/TTacPhysics.cxx b/NPLib/Misc/TTacPhysics.cxx
index 7afe2046b290c021aa6d4a5e2a40c6f2c9b1adc6..b17408d6ee4ce1fc347cdce9e89c8b913542165f 100644
--- a/NPLib/Misc/TTacPhysics.cxx
+++ b/NPLib/Misc/TTacPhysics.cxx
@@ -81,7 +81,7 @@ void TTacPhysics::AddParameterToCalibrationManager()
for(int i = 0 ; i < 8 ; i++)
{
- Cal->AddParameter("TAC", "_T"+itoa(i+1),"TAC_T"+itoa(i+1)) ;
+ Cal->AddParameter("TAC", "_T"+ NPA::itoa(i+1),"TAC_T"+ NPA::itoa(i+1)) ;
}
}
@@ -126,10 +126,10 @@ void TTacPhysics::BuildSimplePhysicalEvent()
{
TacNumber.push_back(EventData->GetTAC_MM_HF_DetectorNbr(i));
}
- Time_TAC_1=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(0) ),EventData->GetTAC_MM_HF() );
- Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM_HF() );
- Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM_HF() );
- Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM_HF() );
+ Time_TAC_1=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPA::itoa( EventData->GetTAC_MM_HF_DetectorNbr(0) ),EventData->GetTAC_MM_HF() );
+ Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPA::itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM_HF() );
+ Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPA::itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM_HF() );
+ Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPA::itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM_HF() );
}
diff --git a/NPLib/Plastic/TPlasticPhysics.cxx b/NPLib/Plastic/TPlasticPhysics.cxx
index 25edccbea88d54089c5168b7bc1f8fbc40b959bc..264cf64b060bf1bd9578e39e3d5f8068950d84ca 100644
--- a/NPLib/Plastic/TPlasticPhysics.cxx
+++ b/NPLib/Plastic/TPlasticPhysics.cxx
@@ -247,8 +247,8 @@ void TPlasticPhysics::AddParameterToCalibrationManager()
{
for( int j = 0 ; j < 16 ; j++)
{
- Cal->AddParameter("Plastic", "Detector"+itoa(i+1)+"_E","Plastic_Detector"+itoa(i+1)+"_E") ;
- Cal->AddParameter("Plastic", "Detector"+itoa(i+1)+"_T","Plastic_Detector"+itoa(i+1)+"_T") ;
+ Cal->AddParameter("Plastic", "Detector"+ NPA::itoa(i+1)+"_E","Plastic_Detector"+ NPA::itoa(i+1)+"_E") ;
+ Cal->AddParameter("Plastic", "Detector"+ NPA::itoa(i+1)+"_T","Plastic_Detector"+ NPA::itoa(i+1)+"_T") ;
}
}
@@ -291,8 +291,8 @@ void TPlasticPhysics::BuildSimplePhysicalEvent()
for(unsigned int i = 0 ; i < EventData->GetEnergyMult() ; i++)
{
DetectorNumber.push_back( EventData->GetPlasticNumber(i) ) ;
- Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("Plastic/Detector" + itoa( EventData->GetPlasticNumber(i) ) +"_E",EventData->GetEnergy(i) ) );
- Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "Plastic/Detector" + itoa( EventData->GetPlasticNumber(i) ) +"_T",EventData->GetTime(i) ) );
+ Energy.push_back( CalibrationManager::getInstance()->ApplyCalibration("Plastic/Detector" + NPA::itoa( EventData->GetPlasticNumber(i) ) +"_E",EventData->GetEnergy(i) ) );
+ Time.push_back( CalibrationManager::getInstance()->ApplyCalibration( "Plastic/Detector" + NPA::itoa( EventData->GetPlasticNumber(i) ) +"_T",EventData->GetTime(i) ) );
}
}
diff --git a/NPLib/SSSD/TSSSDPhysics.cxx b/NPLib/SSSD/TSSSDPhysics.cxx
index 499ac9b98be0b482f129a0723235ddf7c62da849..29544aa6b5e30b0ac487cf94af8496b9ce7fea9a 100644
--- a/NPLib/SSSD/TSSSDPhysics.cxx
+++ b/NPLib/SSSD/TSSSDPhysics.cxx
@@ -255,8 +255,8 @@ void TSSSDPhysics::AddParameterToCalibrationManager()
for( int j = 0 ; j < 16 ; ++j)
{
- Cal->AddParameter("SSSD", "Detector"+itoa(i+1)+"_Strip"+itoa(j+1)+"_E","SSSD_DETECTOR_"+itoa(i+1)+"_STRIP_"+itoa(j+1)+"_E") ;
- Cal->AddParameter("SSSD", "Detector"+itoa(i+1)+"_Strip"+itoa(j+1)+"_T","SSSD_DETECTOR_"+itoa(i+1)+"_STRIP_"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("SSSD", "Detector"+ NPA::itoa(i+1)+"_Strip"+ NPA::itoa(j+1)+"_E","SSSD_DETECTOR_"+ NPA::itoa(i+1)+"_STRIP_"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("SSSD", "Detector"+ NPA::itoa(i+1)+"_Strip"+ NPA::itoa(j+1)+"_T","SSSD_DETECTOR_"+ NPA::itoa(i+1)+"_STRIP_"+ NPA::itoa(j+1)+"_T") ;
}
}
@@ -444,14 +444,14 @@ void TSSSDPhysics::ReadAnalysisConfig()
///////////////////////////////////////////////////////////////////////////
double SSSD_LOCAL::fSi_E( const TSSSDData* EventData , const int i )
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SSSD/Detector" + itoa( EventData->GetEnergyDetectorNbr(i) ) + "_Strip" + itoa( EventData->GetEnergyStripNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SSSD/Detector" + NPA::itoa( EventData->GetEnergyDetectorNbr(i) ) + "_Strip" + NPA::itoa( EventData->GetEnergyStripNbr(i) ) +"_E",
EventData->GetEnergy(i) );
}
double SSSD_LOCAL::fSi_T( const TSSSDData* EventData , const int i )
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SSSD/Detector" + itoa( EventData->GetEnergyDetectorNbr(i) ) + "_Strip" + itoa( EventData->GetEnergyStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SSSD/Detector" + NPA::itoa( EventData->GetEnergyDetectorNbr(i) ) + "_Strip" + NPA::itoa( EventData->GetEnergyStripNbr(i) ) +"_T",
EventData->GetTime(i) );
}
diff --git a/NPLib/Sharc/TSharcPhysics.cxx b/NPLib/Sharc/TSharcPhysics.cxx
index 6279dd3860411b5bdc4071b5da34354c060380e3..c74440441a0de5f2510abcab7c11c70d5ab30886 100644
--- a/NPLib/Sharc/TSharcPhysics.cxx
+++ b/NPLib/Sharc/TSharcPhysics.cxx
@@ -614,20 +614,20 @@ void TSharcPhysics::AddParameterToCalibrationManager(){
for( int j = 0 ; j < 24 ; ++j)
{
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E","SHARC_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_E") ;
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T","SHARC_D"+itoa(i+1)+"_STRIP_FRONT"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E","SHARC_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T","SHARC_D"+ NPA::itoa(i+1)+"_STRIP_FRONT"+ NPA::itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 48 ; ++j)
{
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E","SHARC_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_E") ;
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T","SHARC_D"+itoa(i+1)+"_STRIP_BACK"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E","SHARC_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T","SHARC_D"+ NPA::itoa(i+1)+"_STRIP_BACK"+ NPA::itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 1 ; ++j)
{
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_PAD"+itoa(j+1)+"_E","SHARC_D"+itoa(i+1)+"_PAD_E") ;
- Cal->AddParameter("SHARC", "D"+itoa(i+1)+"_PAD"+itoa(j+1)+"_T","SHARC_D"+itoa(i+1)+"_PAD_T") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_PAD"+ NPA::itoa(j+1)+"_E","SHARC_D"+ NPA::itoa(i+1)+"_PAD_E") ;
+ Cal->AddParameter("SHARC", "D"+ NPA::itoa(i+1)+"_PAD"+ NPA::itoa(j+1)+"_T","SHARC_D"+ NPA::itoa(i+1)+"_PAD_T") ;
}
}
@@ -870,26 +870,26 @@ namespace Sharc_LOCAL
// Front
double fStrip_Front_E(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetFront_DetectorNbr(i) ) + "_STRIP_FRONT" + itoa( m_EventData->GetFront_StripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetFront_DetectorNbr(i) ) + "_STRIP_FRONT" + NPA::itoa( m_EventData->GetFront_StripNbr(i) ) + "_E",
m_EventData->GetFront_Energy(i) );
}
double fStrip_Front_T(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetFront_DetectorNbr(i) ) + "_STRIP_FRONT" + itoa( m_EventData->GetFront_StripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetFront_DetectorNbr(i) ) + "_STRIP_FRONT" + NPA::itoa( m_EventData->GetFront_StripNbr(i) ) +"_T",
m_EventData->GetFront_TimeCFD(i) );
}
// Back
double fStrip_Back_E(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetBack_DetectorNbr(i) ) + "_STRIP_BACK" + itoa( m_EventData->GetBack_StripNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetBack_DetectorNbr(i) ) + "_STRIP_BACK" + NPA::itoa( m_EventData->GetBack_StripNbr(i) ) +"_E",
m_EventData->GetBack_Energy(i) );
}
double fStrip_Back_T(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetBack_DetectorNbr(i) ) + "_STRIP_BACK" + itoa( m_EventData->GetBack_StripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetBack_DetectorNbr(i) ) + "_STRIP_BACK" + NPA::itoa( m_EventData->GetBack_StripNbr(i) ) +"_T",
m_EventData->GetFront_TimeCFD(i) );
}
@@ -897,13 +897,13 @@ namespace Sharc_LOCAL
// PAD
double fPAD_E(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetPAD_DetectorNbr(i) ) + "_PAD" +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetPAD_DetectorNbr(i) ) + "_PAD" +"_E",
m_EventData->GetPAD_Energy(i) );
}
double fPAD_T(const TSharcData* m_EventData , const int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + itoa( m_EventData->GetPAD_DetectorNbr(i) ) + "_PAD" +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "SHARC/D" + NPA::itoa( m_EventData->GetPAD_DetectorNbr(i) ) + "_PAD" +"_T",
m_EventData->GetPAD_TimeCFD(i) );
}
diff --git a/NPLib/SiLi/TSiLiPhysics.cxx b/NPLib/SiLi/TSiLiPhysics.cxx
index 8473b817bc01b03eff752b5c97d742fd6ef28afa..be51677dd820ccf14830d1c59e7cb56b589f27d4 100644
--- a/NPLib/SiLi/TSiLiPhysics.cxx
+++ b/NPLib/SiLi/TSiLiPhysics.cxx
@@ -193,8 +193,8 @@ void TSiLiPhysics::AddParameterToCalibrationManager()
for(int i = 0 ; i < NumberOfDetector ; i++)
{
- Cal->AddParameter("SiLi", "Detector"+itoa(i+1)+"_E","SiLi_Detector"+itoa(i+1)+"_E") ;
- Cal->AddParameter("SiLi", "Detector"+itoa(i+1)+"_T","SiLi_Detector"+itoa(i+1)+"_T") ;
+ Cal->AddParameter("SiLi", "Detector"+ NPA::itoa(i+1)+"_E","SiLi_Detector"+ NPA::itoa(i+1)+"_E") ;
+ Cal->AddParameter("SiLi", "Detector"+ NPA::itoa(i+1)+"_T","SiLi_Detector"+ NPA::itoa(i+1)+"_T") ;
}
}
@@ -262,7 +262,7 @@ void TSiLiPhysics::PreTreat(){
{
if( EventData->GetEEnergy(i)>m_SiLi_RAW_Threshold )
{
- E=CalibrationManager::getInstance()->ApplyCalibration("SiLi/Detector" + itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i));
+ E=CalibrationManager::getInstance()->ApplyCalibration("SiLi/Detector" + NPA::itoa( EventData->GetENumber(i) ) +"_E",EventData->GetEEnergy(i));
if(E>m_SiLi_E_Threshold)
{
PreTreatedData->SetENumber( EventData->GetENumber(i) );
@@ -272,7 +272,7 @@ void TSiLiPhysics::PreTreat(){
}
for(unsigned int i = 0 ; i < EventData->GetTimeMult() ; ++i)
{
- T=CalibrationManager::getInstance()->ApplyCalibration("SiLi/Detector"+itoa(EventData->GetTNumber(i))+"_T",EventData->GetTTime(i) ) ;
+ T=CalibrationManager::getInstance()->ApplyCalibration("SiLi/Detector"+ NPA::itoa(EventData->GetTNumber(i))+"_T",EventData->GetTTime(i) ) ;
PreTreatedData->SetTNumber( EventData->GetTNumber(i) );
PreTreatedData->SetTTime( T );
diff --git a/NPLib/SiRes/TSiResPhysics.cxx b/NPLib/SiRes/TSiResPhysics.cxx
index 95fc2dc94b871ecaeaf0ba62b7ec8d23e17a0f12..dabf481db3ddd91bad0f6dd5b2f151da3c29faf9 100644
--- a/NPLib/SiRes/TSiResPhysics.cxx
+++ b/NPLib/SiRes/TSiResPhysics.cxx
@@ -199,10 +199,10 @@ void TSiResPhysics::AddParameterToCalibrationManager()
{
for( int j = 0 ; j < 4 ; j++)
{
- Cal->AddParameter("SiRes", "Detector"+itoa(i+1)+"_E","SiRes_Detector"+itoa(i+1)+"_E") ;
+ Cal->AddParameter("SiRes", "Detector"+ NPA::itoa(i+1)+"_E","SiRes_Detector"+ NPA::itoa(i+1)+"_E") ;
}
- Cal->AddParameter("SiRes", "Detector"+itoa(i+1)+"_EBack","SiRes_Detector"+itoa(i+1)+"_EBack") ;
- Cal->AddParameter("SiRes", "Detector"+itoa(i+1)+"_T","SiRes_Detector"+itoa(i+1)+"_T") ;
+ Cal->AddParameter("SiRes", "Detector"+ NPA::itoa(i+1)+"_EBack","SiRes_Detector"+ NPA::itoa(i+1)+"_EBack") ;
+ Cal->AddParameter("SiRes", "Detector"+ NPA::itoa(i+1)+"_T","SiRes_Detector"+ NPA::itoa(i+1)+"_T") ;
}
}
@@ -276,7 +276,7 @@ void TSiResPhysics::PreTreat(){
if( EventData->GetEEnergy(i)>m_SiRes_RAW_Threshold )
{
- E=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector" + itoa( EventData->GetEDetectorNumber(i) ) +"_Channel"+itoa( EventData->GetEChannelNumber(i) )+"_E",EventData->GetEEnergy(i));
+ E=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector" + NPA::itoa( EventData->GetEDetectorNumber(i) ) +"_Channel"+ NPA::itoa( EventData->GetEChannelNumber(i) )+"_E",EventData->GetEEnergy(i));
//if(E>m_SiRes_E_Threshold)
{
N=EventData->GetEDetectorNumber(i);
@@ -290,14 +290,14 @@ void TSiResPhysics::PreTreat(){
{
if( EventData->GetEEnergyBack(i)>m_SiRes_RAWBack_Threshold && EventData->GetEEnergyBackDetectorNumber(i)==N )
{
- E=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector" + itoa( EventData->GetEEnergyBackDetectorNumber(i) ) +"_E",EventData->GetEEnergyBack(i));
+ E=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector" + NPA::itoa( EventData->GetEEnergyBackDetectorNumber(i) ) +"_E",EventData->GetEEnergyBack(i));
if(E>m_SiRes_EBack_Threshold)
{
PreTreatedData->SetEEnergyBackDetectorNumber( EventData->GetEEnergyBackDetectorNumber(i) );
PreTreatedData->SetEEnergyBack( E );
if(EventData->GetTimeMult()>0)
{
- T=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector"+itoa(EventData->GetTDetectorNumber(i))+"_T",EventData->GetTTime(i) ) ;
+ T=CalibrationManager::getInstance()->ApplyCalibration("SiRes/Detector"+ NPA::itoa(EventData->GetTDetectorNumber(i))+"_T",EventData->GetTTime(i) ) ;
}
PreTreatedData->SetTTime( T );
}
diff --git a/NPLib/Speg/TSpegPhysics.cxx b/NPLib/Speg/TSpegPhysics.cxx
index d38dca52e9790c11dbca3606bb7b0d79fba6fdaf..30558d7b2a86e27fbb964f588800b1aa5a534a97 100644
--- a/NPLib/Speg/TSpegPhysics.cxx
+++ b/NPLib/Speg/TSpegPhysics.cxx
@@ -878,30 +878,30 @@ void TSpegPhysics::AddParameterToCalibrationManager()
CalibrationManager* Cal5 = CalibrationManager::getInstance();
for(int i = 0 ; i < degree_of_calibration_angle_with_Brho+1 ; i++)
{
- Cal5->AddParameter("SPEG", "_tfoc_calibration_with_Brho_"+itoa(i),"SPEG_tfoc_calibration_with_Brho_"+itoa(i)) ;
- Cal5->AddParameter("SPEG", "_phifoc_calibration_with_Brho_"+itoa(i),"SPEG_phifoc_calibration_with_Brho_"+itoa(i)) ;
+ Cal5->AddParameter("SPEG", "_tfoc_calibration_with_Brho_"+ NPA::itoa(i),"SPEG_tfoc_calibration_with_Brho_"+ NPA::itoa(i)) ;
+ Cal5->AddParameter("SPEG", "_phifoc_calibration_with_Brho_"+ NPA::itoa(i),"SPEG_phifoc_calibration_with_Brho_"+ NPA::itoa(i)) ;
}
CalibrationManager* Cal6 = CalibrationManager::getInstance();
for(int i = 0 ; i < degree_of_correction_angle_with_Brho+1 ; i++)
{
- Cal6->AddParameter("SPEG", "_tfoc_correction_with_Brho_"+itoa(i),"SPEG_tfoc_correction_with_Brho_"+itoa(i)) ;
- Cal6->AddParameter("SPEG", "_phifoc_correction_with_Brho_"+itoa(i),"SPEG_phifoc_correction_with_Brho_"+itoa(i)) ;
+ Cal6->AddParameter("SPEG", "_tfoc_correction_with_Brho_"+ NPA::itoa(i),"SPEG_tfoc_correction_with_Brho_"+ NPA::itoa(i)) ;
+ Cal6->AddParameter("SPEG", "_phifoc_correction_with_Brho_"+ NPA::itoa(i),"SPEG_phifoc_correction_with_Brho_"+ NPA::itoa(i)) ;
}
CalibrationManager* Cal7 = CalibrationManager::getInstance();
for(int i = 0 ; i < 128 ; i++)
{
- Cal7->AddParameter("SPEG", "_DC_S11_decal_"+itoa(i+1),"SPEG_DC_S11_decal_"+itoa(i+1)) ;
- Cal7->AddParameter("SPEG", "_DC_S12_decal_"+itoa(i+1),"SPEG_DC_S12_decal_"+itoa(i+1)) ;
- Cal7->AddParameter("SPEG", "_DC_S21_decal_"+itoa(i+1),"SPEG_DC_S21_decal_"+itoa(i+1)) ;
- Cal7->AddParameter("SPEG", "_DC_S22_decal_"+itoa(i+1),"SPEG_DC_S22_decal_"+itoa(i+1)) ;
+ Cal7->AddParameter("SPEG", "_DC_S11_decal_"+ NPA::itoa(i+1),"SPEG_DC_S11_decal_"+ NPA::itoa(i+1)) ;
+ Cal7->AddParameter("SPEG", "_DC_S12_decal_"+ NPA::itoa(i+1),"SPEG_DC_S12_decal_"+ NPA::itoa(i+1)) ;
+ Cal7->AddParameter("SPEG", "_DC_S21_decal_"+ NPA::itoa(i+1),"SPEG_DC_S21_decal_"+ NPA::itoa(i+1)) ;
+ Cal7->AddParameter("SPEG", "_DC_S22_decal_"+ NPA::itoa(i+1),"SPEG_DC_S22_decal_"+ NPA::itoa(i+1)) ;
}
CalibrationManager* Cal8 = CalibrationManager::getInstance();
for(int i = 0 ; i < 128 ; i++)
{
- Cal8->AddParameter("SPEG", "_DC_S11_"+itoa(i+1),"SPEG_DC_S11_"+itoa(i+1)) ;
- Cal8->AddParameter("SPEG", "_DC_S12_"+itoa(i+1),"SPEG_DC_S12_"+itoa(i+1)) ;
- Cal8->AddParameter("SPEG", "_DC_S21_"+itoa(i+1),"SPEG_DC_S21_"+itoa(i+1)) ;
- Cal8->AddParameter("SPEG", "_DC_S22_"+itoa(i+1),"SPEG_DC_S22_"+itoa(i+1)) ;
+ Cal8->AddParameter("SPEG", "_DC_S11_"+ NPA::itoa(i+1),"SPEG_DC_S11_"+ NPA::itoa(i+1)) ;
+ Cal8->AddParameter("SPEG", "_DC_S12_"+ NPA::itoa(i+1),"SPEG_DC_S12_"+ NPA::itoa(i+1)) ;
+ Cal8->AddParameter("SPEG", "_DC_S21_"+ NPA::itoa(i+1),"SPEG_DC_S21_"+ NPA::itoa(i+1)) ;
+ Cal8->AddParameter("SPEG", "_DC_S22_"+ NPA::itoa(i+1),"SPEG_DC_S22_"+ NPA::itoa(i+1)) ;
}
}
@@ -1141,7 +1141,7 @@ else
}
else
{
- Q_S11.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S11_"+itoa(EventDCData->GetSpegDCStripNbr11(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S11_decal_"+itoa(EventDCData->GetSpegDCStripNbr11(j)), EventDCData->GetSpegDCEnergy11(j)))))+gRandom->Uniform(0,1)-0.5);
+ Q_S11.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S11_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr11(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S11_decal_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr11(j)), EventDCData->GetSpegDCEnergy11(j)))))+gRandom->Uniform(0,1)-0.5);
}
}
}
@@ -1163,7 +1163,7 @@ else
}
else
{
- Q_S12.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S12_"+itoa(EventDCData->GetSpegDCStripNbr12(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S12_decal_"+itoa(EventDCData->GetSpegDCStripNbr12(j)), EventDCData->GetSpegDCEnergy12(j)))))+gRandom->Uniform(0,1)-0.5);
+ Q_S12.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S12_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr12(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S12_decal_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr12(j)), EventDCData->GetSpegDCEnergy12(j)))))+gRandom->Uniform(0,1)-0.5);
}
}
}
@@ -1185,7 +1185,7 @@ else
}
else
{
- Q_S21.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S21_"+itoa(129-EventDCData->GetSpegDCStripNbr21(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S21_decal_"+itoa(EventDCData->GetSpegDCStripNbr21(j)), EventDCData->GetSpegDCEnergy21(j)))))+gRandom->Uniform(0,1)-0.5);
+ Q_S21.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S21_"+ NPA::itoa(129-EventDCData->GetSpegDCStripNbr21(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S21_decal_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr21(j)), EventDCData->GetSpegDCEnergy21(j)))))+gRandom->Uniform(0,1)-0.5);
}
}
}
@@ -1207,7 +1207,7 @@ else
}
else
{
- Q_S22.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S22_"+itoa(129-EventDCData->GetSpegDCStripNbr22(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S22_decal_"+itoa(EventDCData->GetSpegDCStripNbr22(j)), EventDCData->GetSpegDCEnergy22(j)))))+gRandom->Uniform(0,1)-0.5);
+ Q_S22.push_back((CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S22_"+ NPA::itoa(129-EventDCData->GetSpegDCStripNbr22(j)),(CalibrationManager::getInstance()->ApplyCalibration("SPEG/_DC_S22_decal_"+ NPA::itoa(EventDCData->GetSpegDCStripNbr22(j)), EventDCData->GetSpegDCEnergy22(j)))))+gRandom->Uniform(0,1)-0.5);
}
}
}
@@ -1539,7 +1539,7 @@ else
for(int n = 0 ; n < degree_of_correction_angle_with_Brho+1 ; n++)
{
param_theta = 0;
- cor_theta = (CalibrationManager::getInstance()->GetCorrection("SPEG/_tfoc_correction_with_Brho_"+itoa(n)));
+ cor_theta = (CalibrationManager::getInstance()->GetCorrection("SPEG/_tfoc_correction_with_Brho_"+ NPA::itoa(n)));
for(unsigned int l=0; l<cor_theta.size() ; l++)
{
param_theta += cor_theta[l]*pow(xfoc_cor_phifoc,(int)l);
@@ -1553,7 +1553,7 @@ else
for(int n = 0 ; n < degree_of_correction_angle_with_Brho+1 ; n++)
{
param_phi = 0;
- cor_phi = (CalibrationManager::getInstance()->GetCorrection("SPEG/_phifoc_correction_with_Brho_"+itoa(n)));
+ cor_phi = (CalibrationManager::getInstance()->GetCorrection("SPEG/_phifoc_correction_with_Brho_"+ NPA::itoa(n)));
for(unsigned int l=0; l<cor_phi.size() ; l++)
{
param_phi += cor_phi[l]*pow(xfoc_cor_phifoc,(int)l);
@@ -1567,7 +1567,7 @@ else
for(int n = 0 ; n < degree_of_calibration_angle_with_Brho+1 ; n++)
{
param_theta = 0;
- cal_theta = (CalibrationManager::getInstance()->GetCorrection("SPEG/_tfoc_calibration_with_Brho_"+itoa(n)));
+ cal_theta = (CalibrationManager::getInstance()->GetCorrection("SPEG/_tfoc_calibration_with_Brho_"+ NPA::itoa(n)));
for(unsigned int l=0; l<cal_theta.size() ; l++)
{
param_theta += cal_theta[l]*pow(xfoc_cor_phifoc,(int)l);
@@ -1589,7 +1589,7 @@ else
for(int n = 0 ; n < degree_of_calibration_angle_with_Brho+1 ; n++)
{
param_phi = 0;
- cal_phi = (CalibrationManager::getInstance()->GetCorrection("SPEG/_phifoc_calibration_with_Brho_"+itoa(n)));
+ cal_phi = (CalibrationManager::getInstance()->GetCorrection("SPEG/_phifoc_calibration_with_Brho_"+ NPA::itoa(n)));
for(unsigned int l=0; l<cal_phi.size() ; l++)
{
param_phi += cal_phi[l]*pow(xfoc_cor_phifoc,(int)l);
diff --git a/NPLib/W1/TW1Physics.cxx b/NPLib/W1/TW1Physics.cxx
index a01a78446e75f416da7317908979b1c6a1424c1c..cf9935a4796aba3e895c483a0f622824e0a51fe2 100644
--- a/NPLib/W1/TW1Physics.cxx
+++ b/NPLib/W1/TW1Physics.cxx
@@ -275,11 +275,11 @@ void TW1Physics::AddParameterToCalibrationManager()
for (int i = 0; i < m_NumberOfDetector; i++) {
for (int j = 0; j < m_NumberOfStrips; j++) {
// Energy
- Cal->AddParameter("W1", "Detector"+itoa(i+1)+"_Front_"+itoa(j+1)+"_E", "W1_DETECTOR"+itoa(i+1)+"_FRONT_"+itoa(j+1)+"_E");
- Cal->AddParameter("W1", "Detector"+itoa(i+1)+"_Back_"+itoa(j+1)+"_E", "W1_DETECTOR"+itoa(i+1)+"_BACK_"+itoa(j+1)+"_E");
+ Cal->AddParameter("W1", "Detector"+ NPA::itoa(i+1)+"_Front_"+ NPA::itoa(j+1)+"_E", "W1_DETECTOR"+ NPA::itoa(i+1)+"_FRONT_"+ NPA::itoa(j+1)+"_E");
+ Cal->AddParameter("W1", "Detector"+ NPA::itoa(i+1)+"_Back_"+ NPA::itoa(j+1)+"_E", "W1_DETECTOR"+ NPA::itoa(i+1)+"_BACK_"+ NPA::itoa(j+1)+"_E");
// Time
- Cal->AddParameter("W1", "Detector"+itoa(i+1)+"_Front_"+itoa(j+1)+"_T", "W1_DETECTOR"+itoa(i+1)+"_FRONT_"+itoa(j+1)+"_T");
- Cal->AddParameter("W1", "Detector"+itoa(i+1)+"_Back_"+itoa(j+1)+"_T", "W1_DETECTOR"+itoa(i+1)+"_BACK_"+itoa(j+1)+"_T");
+ Cal->AddParameter("W1", "Detector"+ NPA::itoa(i+1)+"_Front_"+ NPA::itoa(j+1)+"_T", "W1_DETECTOR"+ NPA::itoa(i+1)+"_FRONT_"+ NPA::itoa(j+1)+"_T");
+ Cal->AddParameter("W1", "Detector"+ NPA::itoa(i+1)+"_Back_"+ NPA::itoa(j+1)+"_T", "W1_DETECTOR"+ NPA::itoa(i+1)+"_BACK_"+ NPA::itoa(j+1)+"_T");
}
}
}
@@ -837,28 +837,28 @@ void TW1Physics::ReadAnalysisConfig()
///////////////////////////////////////////////////////////////////////////
double LOCAL::fW1_Front_E(TW1Data* m_EventData , int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + itoa(m_EventData->GetW1FrontEDetectorNbr(i)) + "_Front_" + itoa(m_EventData->GetW1FrontEStripNbr(i)) +"_E", m_EventData->GetW1FrontEEnergy(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + NPA::itoa(m_EventData->GetW1FrontEDetectorNbr(i)) + "_Front_" + NPA::itoa(m_EventData->GetW1FrontEStripNbr(i)) +"_E", m_EventData->GetW1FrontEEnergy(i));
}
double LOCAL::fW1_Back_E(TW1Data* m_EventData , int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + itoa(m_EventData->GetW1BackEDetectorNbr(i)) + "_Back_" + itoa(m_EventData->GetW1BackEStripNbr(i)) +"_E", m_EventData->GetW1BackEEnergy(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + NPA::itoa(m_EventData->GetW1BackEDetectorNbr(i)) + "_Back_" + NPA::itoa(m_EventData->GetW1BackEStripNbr(i)) +"_E", m_EventData->GetW1BackEEnergy(i));
}
double LOCAL::fW1_Front_T(TW1Data* m_EventData , int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + itoa(m_EventData->GetW1FrontTDetectorNbr(i)) + "_Front_" + itoa(m_EventData->GetW1FrontTStripNbr(i)) +"_T", m_EventData->GetW1FrontTTime(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + NPA::itoa(m_EventData->GetW1FrontTDetectorNbr(i)) + "_Front_" + NPA::itoa(m_EventData->GetW1FrontTStripNbr(i)) +"_T", m_EventData->GetW1FrontTTime(i));
}
double LOCAL::fW1_Back_T(TW1Data* m_EventData , int i)
{
- return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + itoa(m_EventData->GetW1BackTDetectorNbr(i)) + "_Back_" + itoa(m_EventData->GetW1BackTStripNbr(i)) +"_T", m_EventData->GetW1BackTTime(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("W1/Detector" + NPA::itoa(m_EventData->GetW1BackTDetectorNbr(i)) + "_Back_" + NPA::itoa(m_EventData->GetW1BackTStripNbr(i)) +"_T", m_EventData->GetW1BackTTime(i));
}
////////////////////////////////////////////////////////////////////////////////
// Construct Method to be pass to the DetectorFactory //