From ffe9a4cbd7bda180b9bf6a2b1b4c46c1626796a0 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Mon, 13 Apr 2015 09:09:50 +0100
Subject: [PATCH] * Progress on improving string concatenation
---
Inputs/DetectorConfiguration/e628.detector | 1 +
NPLib/AnnularS1/TAnnularS1Physics.cxx | 10 +-
NPLib/CATS/TCATSPhysics.cxx | 30 ++----
NPLib/CATS/TCATSSpectra.cxx | 52 ++++-----
NPLib/Core/NPDetectorManager.cxx | 13 +--
NPLib/Core/NPDetectorManager.h | 1 -
NPLib/Core/NPVDetector.cxx | 22 ++++
NPLib/Core/NPVDetector.h | 1 +
NPLib/Core/RootInput.cxx | 12 +--
NPLib/Core/RootOutput.cxx | 6 +-
NPLib/MUST2/TMust2Physics.cxx | 40 +++----
NPLib/MUST2/TMust2Spectra.cxx | 120 ++++++++++-----------
NPLib/Tiara/TTiaraBarrelPhysics.cxx | 42 +++-----
NPLib/Tiara/TTiaraBarrelSpectra.cxx | 20 ++--
NPLib/Tiara/TTiaraHyballPhysics.cxx | 33 +++---
NPLib/Tiara/TTiaraHyballSpectra.cxx | 16 +--
NPLib/Utility/npanalysis.cxx | 2 +-
17 files changed, 204 insertions(+), 217 deletions(-)
diff --git a/Inputs/DetectorConfiguration/e628.detector b/Inputs/DetectorConfiguration/e628.detector
index 01425b31a..cada95eea 100644
--- a/Inputs/DetectorConfiguration/e628.detector
+++ b/Inputs/DetectorConfiguration/e628.detector
@@ -102,6 +102,7 @@ TiaraHyballWedge
R= 0
Phi= 300
%%%%%%%%%%%%%%%%%%%%%%%%%%%
+TiaraBarrel
TiaraInnerBarrel= 1
TiaraOuterBarrel= 1
TiaraChamber= 1
diff --git a/NPLib/AnnularS1/TAnnularS1Physics.cxx b/NPLib/AnnularS1/TAnnularS1Physics.cxx
index de1398e87..28e2f3c04 100644
--- a/NPLib/AnnularS1/TAnnularS1Physics.cxx
+++ b/NPLib/AnnularS1/TAnnularS1Physics.cxx
@@ -581,7 +581,7 @@ void TAnnularS1Physics::InitializeStandardParameter(){
///////////////////////////////////////////////////////////////////////////
namespace ANNULARS1_LOCAL{
// tranform an integer to a string
- string itoa(unsigned int value){
+ stringNPA::itoa(unsigned int value){
char buffer [33];
sprintf(buffer,"%d",value);
return buffer;
@@ -590,23 +590,23 @@ namespace ANNULARS1_LOCAL{
// DSSD
// Ring
double fStrip_Ring_E(const TS1Data* m_EventData , const int& i){
- return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" + itoa( m_EventData->GetS1ThetaEDetectorNbr(i) ) + "_STRIP_FRONT" + itoa( m_EventData->GetS1ThetaEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" +NPA::itoa( m_EventData->GetS1ThetaEDetectorNbr(i) ) + "_STRIP_FRONT" +NPA::itoa( m_EventData->GetS1ThetaEStripNbr(i) ) + "_E",
m_EventData->GetS1ThetaEEnergy(i) );
}
double fStrip_Ring_T(const TS1Data* m_EventData , const int& i){
- return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" + itoa( m_EventData->GetS1ThetaTDetectorNbr(i) ) + "_STRIP_FRONT" + itoa( m_EventData->GetS1ThetaTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" +NPA::itoa( m_EventData->GetS1ThetaTDetectorNbr(i) ) + "_STRIP_FRONT" +NPA::itoa( m_EventData->GetS1ThetaTStripNbr(i) ) +"_T",
m_EventData->GetS1ThetaTTime(i) );
}
// Sector
double fStrip_Sector_E(const TS1Data* m_EventData , const int& i){
- return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" + itoa( m_EventData->GetS1PhiEDetectorNbr(i) ) + "_STRIP_BACK" + itoa( m_EventData->GetS1PhiEStripNbr(i) ) +"_E",
+ return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" +NPA::itoa( m_EventData->GetS1PhiEDetectorNbr(i) ) + "_STRIP_BACK" +NPA::itoa( m_EventData->GetS1PhiEStripNbr(i) ) +"_E",
m_EventData->GetS1PhiEEnergy(i) );
}
double fStrip_Sector_T(const TS1Data* m_EventData , const int& i){
- return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" + itoa( m_EventData->GetS1PhiTDetectorNbr(i) ) + "_STRIP_BACK" + itoa( m_EventData->GetS1PhiTStripNbr(i) ) +"_T",
+ return CalibrationManager::getInstance()->ApplyCalibration( "ANNULARS1/D" +NPA::itoa( m_EventData->GetS1PhiTDetectorNbr(i) ) + "_STRIP_BACK" +NPA::itoa( m_EventData->GetS1PhiTStripNbr(i) ) +"_T",
m_EventData->GetS1PhiTTime(i) );
}
}
diff --git a/NPLib/CATS/TCATSPhysics.cxx b/NPLib/CATS/TCATSPhysics.cxx
index 9c635e449..a77a53d01 100644
--- a/NPLib/CATS/TCATSPhysics.cxx
+++ b/NPLib/CATS/TCATSPhysics.cxx
@@ -710,10 +710,10 @@ void TCATSPhysics::AddParameterToCalibrationManager() {
CalibrationManager* Cal = CalibrationManager::getInstance();
for(int i = 0 ; i < m_NumberOfCATS ; i++){
for( int j = 0 ; j < 28 ; j++){
- Cal->AddParameter("CATS", "D"+itoa(i+1)+"_X"+itoa(j+1)+"_Q","CATS_D"+itoa(i+1)+"_X"+itoa(j+1)+"_Q") ;
- Cal->AddParameter("CATS", "D"+itoa(i+1)+"_Y"+itoa(j+1)+"_Q","CATS_D"+itoa(i+1)+"_Y"+itoa(j+1)+"_Q") ;
- Cal->AddParameter("CATS", "D"+itoa(i+1)+"_X"+itoa(j+1),"CATS_D"+itoa(i+1)+"_X"+itoa(j+1)) ;
- Cal->AddParameter("CATS", "D"+itoa(i+1)+"_Y"+itoa(j+1),"CATS_D"+itoa(i+1)+"_Y"+itoa(j+1)) ;
+ Cal->AddParameter("CATS", "D"+NPA::itoa(i+1)+"_X"+NPA::itoa(j+1)+"_Q","CATS_D"+NPA::itoa(i+1)+"_X"+NPA::itoa(j+1)+"_Q") ;
+ Cal->AddParameter("CATS", "D"+NPA::itoa(i+1)+"_Y"+NPA::itoa(j+1)+"_Q","CATS_D"+NPA::itoa(i+1)+"_Y"+NPA::itoa(j+1)+"_Q") ;
+ Cal->AddParameter("CATS", "D"+NPA::itoa(i+1)+"_X"+NPA::itoa(j+1),"CATS_D"+NPA::itoa(i+1)+"_X"+NPA::itoa(j+1)) ;
+ Cal->AddParameter("CATS", "D"+NPA::itoa(i+1)+"_Y"+NPA::itoa(j+1),"CATS_D"+NPA::itoa(i+1)+"_Y"+NPA::itoa(j+1)) ;
}
}
@@ -940,43 +940,33 @@ namespace CATS_LOCAL{
- ////////////////////////////////////////////////////////////////////////
- // transform an integer to a string
- string itoa(int value){
- std::ostringstream o;
-
- if (!(o << value))
- return "" ;
-
- return o.str();
- }
////////////////////////////////////////////////////////////////////////
double fCATS_X_Q(const TCATSData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "CATS/D" + itoa( m_EventData->GetCATSDetX(i) ) + "_X" + itoa( m_EventData->GetCATSStripX(i) ) + "_Q",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetX(i) ) + "_X" + NPA::itoa( m_EventData->GetCATSStripX(i) ) + "_Q",
m_EventData->GetCATSChargeX(i) + gRandom->Rndm() - fCATS_Ped_X(m_EventData, i) );
}
////////////////////////////////////////////////////////////////////////
double fCATS_Y_Q(const TCATSData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "CATS/D" + itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + itoa( m_EventData->GetCATSStripY(i) ) + "_Q",
+ return CalibrationManager::getInstance()->ApplyCalibration( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + NPA::itoa( m_EventData->GetCATSStripY(i) ) + "_Q",
m_EventData->GetCATSChargeY(i) + gRandom->Rndm() - fCATS_Ped_Y(m_EventData, i) );
}
////////////////////////////////////////////////////////////////////////
bool fCATS_Threshold_X(const TCATSData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyThreshold( "CATS/D" + itoa( m_EventData->GetCATSDetX(i) ) + "_X" + itoa( m_EventData->GetCATSStripX(i) ),
+ return CalibrationManager::getInstance()->ApplyThreshold( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetX(i) ) + "_X" + NPA::itoa( m_EventData->GetCATSStripX(i) ),
m_EventData->GetCATSChargeX(i));
}
////////////////////////////////////////////////////////////////////////
bool fCATS_Threshold_Y(const TCATSData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyThreshold( "CATS/D" + itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + itoa( m_EventData->GetCATSStripY(i) ),
+ return CalibrationManager::getInstance()->ApplyThreshold( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + NPA::itoa( m_EventData->GetCATSStripY(i) ),
m_EventData->GetCATSChargeY(i));
}
////////////////////////////////////////////////////////////////////////
double fCATS_Ped_X(const TCATSData* m_EventData, const int i){
- return CalibrationManager::getInstance()->GetPedestal( "CATS/D" + itoa( m_EventData->GetCATSDetX(i) ) + "_X" + itoa( m_EventData->GetCATSStripX(i) ) );
+ return CalibrationManager::getInstance()->GetPedestal( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetX(i) ) + "_X" + NPA::itoa( m_EventData->GetCATSStripX(i) ) );
}
////////////////////////////////////////////////////////////////////////
double fCATS_Ped_Y(const TCATSData* m_EventData, const int i){
- return CalibrationManager::getInstance()->GetPedestal( "CATS/D" + itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + itoa( m_EventData->GetCATSStripY(i) ) );
+ return CalibrationManager::getInstance()->GetPedestal( "CATS/D" + NPA::itoa( m_EventData->GetCATSDetY(i) ) + "_Y" + NPA::itoa( m_EventData->GetCATSStripY(i) ) );
}
}
diff --git a/NPLib/CATS/TCATSSpectra.cxx b/NPLib/CATS/TCATSSpectra.cxx
index 2c922b7c3..de2d9db8a 100644
--- a/NPLib/CATS/TCATSSpectra.cxx
+++ b/NPLib/CATS/TCATSSpectra.cxx
@@ -83,19 +83,19 @@ void TCATSSpectra::InitRawSpectra(){
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
// CATS_STRX_Q_RAW
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_Q_RAW";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_Q_RAW";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, "CATS/RAW/STRQ");
// CATS_STRY_Q_RAW
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_Q_RAW";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_Q_RAW";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, "CATS/RAW/STRQ");
// STRX_MULT
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_MULT";
AddHisto1D(name, name, fStripsNumber, 1, fStripsNumber+1, "CATS/RAW/MULT");
// STRY_MULT
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_MULT";
AddHisto1D(name, name, fStripsNumber, 1, fStripsNumber+1, "CATS/RAW/MULT");
} // end loop on number of cats
}
@@ -107,20 +107,20 @@ void TCATSSpectra::InitPreTreatedSpectra(){
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
// CATS_STRX_Q_CAL
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_Q_CAL";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_Q_CAL";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, family);
// CATS_STRY_Q_CAL
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_Q_CAL";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_Q_CAL";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, family);
// end loop on number of cats
// STRX_MULT
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_CAL_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_CAL_MULT";
AddHisto1D(name, name, fStripsNumber, 1, fStripsNumber+1, "CATS/CAL/MULT");
// STRY_MULT
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_CAL_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_CAL_MULT";
AddHisto1D(name, name, fStripsNumber, 1, fStripsNumber+1, "CATS/CAL/MULT");
} // end loop on number of cats
}
@@ -131,25 +131,25 @@ void TCATSSpectra::InitPhysicsSpectra(){
string name;
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_QSUM_STRMAX_X_CAL";
+ name = "CATS"+NPA::itoa(i+1)+"_QSUM_STRMAX_X_CAL";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, family);
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_QSUM_STRMAX_Y_CAL";
+ name = "CATS"+NPA::itoa(i+1)+"_QSUM_STRMAX_Y_CAL";
AddHisto2D(name, name, fStripsNumber, 1, fStripsNumber+1, 512, 0, 16384, family);
}
family = "CATS/PHY/CTRL";
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_QMEAN_TIME";
+ name = "CATS"+NPA::itoa(i+1)+"_QMEAN_TIME";
AddHisto1D(name, name, fEventLoopSize,0,fEventLoopSize,family);
fEventLoopQSum.push_back(0);
}
family = "CATS/PHY/POS";
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_POS";
+ name = "CATS"+NPA::itoa(i+1)+"_POS";
AddHisto2D(name, name,120,-40,40,120,-40,40,family);
- name = "CATS_STRIP_"+CATS_LOCAL::itoa(i+1)+"_POS";
+ name = "CATS_STRIP_"+NPA::itoa(i+1)+"_POS";
AddHisto2D(name, name,120,1,28,120,1,28,family);
}
@@ -172,14 +172,14 @@ void TCATSSpectra::FillRawSpectra(TCATSData* RawData){
// CATS_STRX_Q_RAW
for (unsigned int i = 0; i < RawData->GetCATSMultX(); ++i) { // loop on vector
family = "CATS/RAW/STRQ";
- name = "CATS"+CATS_LOCAL::itoa(RawData->GetCATSDetX(i))+"_STRX_Q_RAW";
+ name = "CATS"+NPA::itoa(RawData->GetCATSDetX(i))+"_STRX_Q_RAW";
GetHisto(family, name) -> Fill(RawData->GetCATSStripX(i), RawData->GetCATSChargeX(i));
} // end loop on vector
// CATS_STRY_Q_RAW
for (unsigned int i = 0; i < RawData->GetCATSMultY(); ++i) { // loop on vector
family = "CATS/RAW/STRQ";
- name = "CATS"+CATS_LOCAL::itoa(RawData->GetCATSDetY(i))+"_STRY_Q_RAW";
+ name = "CATS"+NPA::itoa(RawData->GetCATSDetY(i))+"_STRY_Q_RAW";
GetHisto(family, name) -> Fill(RawData->GetCATSStripY(i), RawData->GetCATSChargeY(i));
} // end loop on vector
@@ -189,7 +189,7 @@ void TCATSSpectra::FillRawSpectra(TCATSData* RawData){
for (unsigned int i = 0; i < RawData->GetCATSMultX(); i++) myMULT[RawData->GetCATSDetX(i)-1] += 1;
for (unsigned int i = 0; i < fNumberOfCats; i++) {
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_MULT";
family = "CATS/RAW/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -199,7 +199,7 @@ void TCATSSpectra::FillRawSpectra(TCATSData* RawData){
for (unsigned int i = 0; i < RawData->GetCATSMultY(); i++) myMULT[RawData->GetCATSDetY(i)-1] += 1;
for (unsigned int i = 0; i < fNumberOfCats; i++) {
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_MULT";
family = "CATS/RAW/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -213,14 +213,14 @@ void TCATSSpectra::FillPreTreatedSpectra(TCATSData* PreTreatedData){
// CATS_STRX_Q_CAL
for (unsigned int i = 0; i < PreTreatedData->GetCATSMultX(); ++i) { // loop on vector
family = "CATS/CAL/STRQ";
- name = "CATS"+CATS_LOCAL::itoa(PreTreatedData->GetCATSDetX(i))+"_STRX_Q_CAL";
+ name = "CATS"+NPA::itoa(PreTreatedData->GetCATSDetX(i))+"_STRX_Q_CAL";
GetHisto(family,name) -> Fill(PreTreatedData->GetCATSStripX(i), PreTreatedData->GetCATSChargeX(i));
} // end loop on vector
// CATS_STRY_Q_CAL
for (unsigned int i = 0; i < PreTreatedData->GetCATSMultY(); ++i) { // loop on vector
family = "CATS/CAL/STRQ";
- name = "CATS"+CATS_LOCAL::itoa(PreTreatedData->GetCATSDetY(i))+"_STRY_Q_CAL";
+ name = "CATS"+NPA::itoa(PreTreatedData->GetCATSDetY(i))+"_STRY_Q_CAL";
GetHisto(family,name) -> Fill(PreTreatedData->GetCATSStripY(i), PreTreatedData->GetCATSChargeY(i));
} // end loop on vector
@@ -230,7 +230,7 @@ void TCATSSpectra::FillPreTreatedSpectra(TCATSData* PreTreatedData){
for (unsigned int i = 0; i < PreTreatedData->GetCATSMultX(); i++) myMULT[PreTreatedData->GetCATSDetX(i)-1] += 1;
for (unsigned int i = 0; i < fNumberOfCats; i++) {
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRX_CAL_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRX_CAL_MULT";
family = "CATS/CAL/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -240,7 +240,7 @@ void TCATSSpectra::FillPreTreatedSpectra(TCATSData* PreTreatedData){
for (unsigned int i = 0; i < PreTreatedData->GetCATSMultY(); i++) myMULT[PreTreatedData->GetCATSDetY(i)-1] += 1;
for (unsigned int i = 0; i < fNumberOfCats; i++) {
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_STRY_CAL_MULT";
+ name = "CATS"+NPA::itoa(i+1)+"_STRY_CAL_MULT";
family = "CATS/CAL/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -253,9 +253,9 @@ void TCATSSpectra::FillPhysicsSpectra(TCATSPhysics* Physics){
// CATS_STRX_Q_CAL
for (unsigned int i = 0; i < Physics->DetNumberX.size() ; ++i) { // loop on vector
family="CATS/PHY/QSUM";
- name = "CATS"+CATS_LOCAL::itoa(Physics->DetNumberX[i])+"_QSUM_STRMAX_X_CAL";
+ name = "CATS"+NPA::itoa(Physics->DetNumberX[i])+"_QSUM_STRMAX_X_CAL";
GetHisto(family,name) -> Fill(Physics->StripMaxX[i],Physics->QsumX[i]);
- name = "CATS"+CATS_LOCAL::itoa(Physics->DetNumberX[i])+"_QSUM_STRMAX_Y_CAL";
+ name = "CATS"+NPA::itoa(Physics->DetNumberX[i])+"_QSUM_STRMAX_Y_CAL";
GetHisto(family,name) -> Fill(Physics->StripMaxY[i],Physics->QsumY[i]);
}
// An histo of size fEventLoopSize is reset every fEventLoopSize to monitor the
@@ -266,7 +266,7 @@ void TCATSSpectra::FillPhysicsSpectra(TCATSPhysics* Physics){
for (unsigned int i = 0; i < Physics->StripMaxX.size(); ++i) {
fEventLoopQSum[i]+=Physics->QsumX[i]/1000000.;
- name = "CATS"+CATS_LOCAL::itoa(i+1)+"_QMEAN_TIME";
+ name = "CATS"+NPA::itoa(i+1)+"_QMEAN_TIME";
GetHisto(family,name) ->SetBinContent(fEventLoopIndex/fEventLoopIndex,fEventLoopQSum[i]/fEventLoopIndex);
}
@@ -283,10 +283,10 @@ void TCATSSpectra::FillPhysicsSpectra(TCATSPhysics* Physics){
for (unsigned int i = 0; i < Physics->PositionX.size(); ++i) {
family = "CATS/PHY/POS";
- name = "CATS"+CATS_LOCAL::itoa(Physics->DetMaxX[i])+"_POS";
+ name = "CATS"+NPA::itoa(Physics->DetMaxX[i])+"_POS";
GetHisto(family,name) -> Fill(Physics->PositionX[i],Physics->PositionY[i]);
- name = "CATS_STRIP_"+CATS_LOCAL::itoa(Physics->DetMaxX[i])+"_POS";
+ name = "CATS_STRIP_"+NPA::itoa(Physics->DetMaxX[i])+"_POS";
GetHisto(family,name) -> Fill(Physics->StripNumberX[i],Physics->StripNumberY[i]);
}
diff --git a/NPLib/Core/NPDetectorManager.cxx b/NPLib/Core/NPDetectorManager.cxx
index 05bb7754b..fed9d4962 100644
--- a/NPLib/Core/NPDetectorManager.cxx
+++ b/NPLib/Core/NPDetectorManager.cxx
@@ -33,6 +33,7 @@
#include "NPOptionManager.h"
#include "NPCalibrationManager.h"
+
/////////////////////////////////////////////////////////////////////////////////////////////////
// Default Constructor
NPA::DetectorManager::DetectorManager(){
@@ -137,16 +138,14 @@ void NPA::DetectorManager::ReadConfigurationFile(string Path) {
/////////////////////////////////////////////////////////////////////////////////////////////////
void NPA::DetectorManager::BuildPhysicalEvent(){
#if __cplusplus > 199711L
- // add new jobs
+ // add new job
map<string,VDetector*>::iterator it;
unsigned int i = 0;
for (it = m_Detector.begin(); it != m_Detector.end(); ++it) {
m_Ready[i++]=true;
}
-
// Wait for all job to be done
- while(!IsDone()){}
-
+ while(!IsDone()){};
#else
map<string,VDetector*>::iterator it;
for (it = m_Detector.begin(); it != m_Detector.end(); ++it) {
@@ -281,26 +280,24 @@ void NPA::DetectorManager::InitThreadPool(){
m_ThreadPool.push_back( thread( &NPA::DetectorManager::StartThread,this,it->second,i++) );
m_Ready.push_back(false);
}
-
m_stop = false;
for(auto& th: m_ThreadPool){
th.detach();
}
cout << "\033[1;33m**** Detector Manager : Started " << i << " Threads ****\033[0m" << endl ;
- // Sleep to let the time to the thread to start
- this_thread::sleep_for (std::chrono::milliseconds(100));
}
////////////////////////////////////////////////////////////////////////////////
void NPA::DetectorManager::StartThread(NPA::VDetector* det,unsigned int id){
+this_thread::sleep_for(chrono::milliseconds(100));
while(!m_stop){
if(m_Ready[id]){
(det->*m_ClearEventPhysicsPtr)();
(det->*m_BuildPhysicalPtr)();
m_Ready[id]=false;
}
- }
+ }
}
////////////////////////////////////////////////////////////////////////////////
void NPA::DetectorManager::StopThread(){
diff --git a/NPLib/Core/NPDetectorManager.h b/NPLib/Core/NPDetectorManager.h
index 172205619..2e191e8ec 100644
--- a/NPLib/Core/NPDetectorManager.h
+++ b/NPLib/Core/NPDetectorManager.h
@@ -38,7 +38,6 @@
using namespace std ;
typedef void(NPA::VDetector::*VDetector_FuncPtr)(void);
-
// This class manage a map of virtual detector
namespace NPA{
class DetectorManager{
diff --git a/NPLib/Core/NPVDetector.cxx b/NPLib/Core/NPVDetector.cxx
index 8bfa0472e..aa3b50ae6 100644
--- a/NPLib/Core/NPVDetector.cxx
+++ b/NPLib/Core/NPVDetector.cxx
@@ -37,4 +37,26 @@ VDetector::VDetector(){
VDetector::~VDetector(){
}
+////////////////////////////////////////////////////////////////////////////////
+namespace NPA{
+ static string itoa_array[10000];
+
+ class itoa_proxy{
+ public:
+ itoa_proxy(){
+ char buffer[5];
+ for(int i = 0 ; i < 10000 ; i++){
+ sprintf(buffer,"%d",i);
+ itoa_array[i] = buffer;
+ }
+ }
+ };
+ static itoa_proxy itoa_p ;
+}
+
+std::string NPA::itoa(int i){
+ return NPA::itoa_array[i];
+}
+
+
diff --git a/NPLib/Core/NPVDetector.h b/NPLib/Core/NPVDetector.h
index bbed0e80c..2676d77e7 100644
--- a/NPLib/Core/NPVDetector.h
+++ b/NPLib/Core/NPVDetector.h
@@ -36,6 +36,7 @@
using namespace std;
namespace NPA {
+ std::string itoa(int);
class VDetector{
public:
diff --git a/NPLib/Core/RootInput.cxx b/NPLib/Core/RootInput.cxx
index 94706bc3b..227c58d8c 100644
--- a/NPLib/Core/RootInput.cxx
+++ b/NPLib/Core/RootInput.cxx
@@ -53,6 +53,11 @@ void RootInput::Destroy(){
////////////////////////////////////////////////////////////////////////////////
RootInput::RootInput(string configFileName){
+ // Setting Root Parameter
+ gEnv->SetValue("TFile.AsyncPrefetching", 1);
+ gEnv->SetValue("TTreeCache.Size",300000000);
+ gEnv->SetValue("TTreeCache.Prefill",1);
+
NumberOfFriend = 0;
bool CheckTreeName = false;
bool CheckRootFileName = false;
@@ -138,12 +143,7 @@ RootInput::RootInput(string configFileName){
if (!CheckRootFileName || !CheckTreeName)
cout << "\033[1;33mWARNING: Token not found for InputTree Declaration : Input Tree may not be instantiate properly\033[0m" << endl;
-
- int cachesize = 10000000; //100 MBytes
- pRootChain->SetCacheSize(cachesize);
- pRootChain->SetCacheLearnEntries(100);
-
- gEnv->SetValue("TFile.AsyncPrefetching", 1);
+
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Core/RootOutput.cxx b/NPLib/Core/RootOutput.cxx
index 408d90ecc..cc35c1a83 100644
--- a/NPLib/Core/RootOutput.cxx
+++ b/NPLib/Core/RootOutput.cxx
@@ -77,8 +77,10 @@ RootOutput::RootOutput(TString fileNameBase, TString treeNameBase)
// Init TAsciiFile objects
InitAsciiFiles();
gDirectory->cd(currentPath->GetPath());
-
- pRootTree->SetAutoSave(1000000000);
+ Long64_t inter= -3000000000;
+ pRootTree->SetAutoFlush(inter);
+ pRootTree->SetAutoSave(-inter);
+
}
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index 16f29afe3..3bd1fc29e 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -1061,20 +1061,20 @@ void TMust2Physics::AddParameterToCalibrationManager()
for(int i = 0 ; i < m_NumberOfTelescope ; ++i){
for( int j = 0 ; j < 128 ; ++j){
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_Si_X"+itoa(j+1)+"_E","MUST2_T"+itoa(i+1)+"_Si_X"+itoa(j+1)+"_E") ;
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_Si_Y"+itoa(j+1)+"_E","MUST2_T"+itoa(i+1)+"_Si_Y"+itoa(j+1)+"_E") ;
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_Si_X"+itoa(j+1)+"_T","MUST2_T"+itoa(i+1)+"_Si_X"+itoa(j+1)+"_T") ;
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_Si_Y"+itoa(j+1)+"_T","MUST2_T"+itoa(i+1)+"_Si_Y"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_Si_X"+NPA::itoa(j+1)+"_E","MUST2_T"+NPA::itoa(i+1)+"_Si_X"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_Si_Y"+NPA::itoa(j+1)+"_E","MUST2_T"+NPA::itoa(i+1)+"_Si_Y"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_Si_X"+NPA::itoa(j+1)+"_T","MUST2_T"+NPA::itoa(i+1)+"_Si_X"+NPA::itoa(j+1)+"_T") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_Si_Y"+NPA::itoa(j+1)+"_T","MUST2_T"+NPA::itoa(i+1)+"_Si_Y"+NPA::itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 16 ; ++j){
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_SiLi"+itoa(j+1)+"_E","MUST2_T"+itoa(i+1)+"_SiLi"+itoa(j+1)+"_E") ;
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_SiLi"+itoa(j+1)+"_T","MUST2_T"+itoa(i+1)+"_SiLi"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_SiLi"+NPA::itoa(j+1)+"_E","MUST2_T"+NPA::itoa(i+1)+"_SiLi"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_SiLi"+NPA::itoa(j+1)+"_T","MUST2_T"+NPA::itoa(i+1)+"_SiLi"+NPA::itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 16 ; ++j){
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_CsI"+itoa(j+1)+"_E","MUST2_T"+itoa(i+1)+"_CsI"+itoa(j+1)+"_E") ;
- Cal->AddParameter("MUST2", "T"+itoa(i+1)+"_CsI"+itoa(j+1)+"_T","MUST2_T"+itoa(i+1)+"_CsI"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_CsI"+NPA::itoa(j+1)+"_E","MUST2_T"+NPA::itoa(i+1)+"_CsI"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("MUST2", "T"+NPA::itoa(i+1)+"_CsI"+NPA::itoa(j+1)+"_T","MUST2_T"+NPA::itoa(i+1)+"_CsI"+NPA::itoa(j+1)+"_T") ;
}
}
@@ -1339,57 +1339,49 @@ TVector3 TMust2Physics::GetTelescopeNormal( const int i) const{
///////////////////////////////////////////////////////////////////////////
namespace MUST2_LOCAL{
-
- // tranform an integer to a string
- string itoa(int value){
- char buffer [33];
- sprintf(buffer,"%d",value);
- return buffer;
- }
-
// DSSD
// X
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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMStripXEDetectorNbr(i) ) + "_Si_X" + NPA::itoa( m_EventData->GetMMStripXEStripNbr(i) ) + "_E",
m_EventData->GetMMStripXEEnergy(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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMStripXTDetectorNbr(i) ) + "_Si_X" + NPA::itoa( m_EventData->GetMMStripXTStripNbr(i) ) +"_T",
m_EventData->GetMMStripXTTime(i) );
}
// Y
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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMStripYEDetectorNbr(i) ) + "_Si_Y" + NPA::itoa( m_EventData->GetMMStripYEStripNbr(i) ) +"_E",
m_EventData->GetMMStripYEEnergy(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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMStripYTDetectorNbr(i) ) + "_Si_Y" + NPA::itoa( m_EventData->GetMMStripYTStripNbr(i) ) +"_T",
m_EventData->GetMMStripYTTime(i) );
}
// SiLi
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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMSiLiEDetectorNbr(i) ) + "_SiLi" + NPA::itoa( m_EventData->GetMMSiLiEPadNbr(i) ) +"_E",
m_EventData->GetMMSiLiEEnergy(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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMSiLiTDetectorNbr(i) ) + "_SiLi" + NPA::itoa( m_EventData->GetMMSiLiTPadNbr(i) )+"_T",
m_EventData->GetMMSiLiTTime(i) );
}
// CsI
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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMCsIEDetectorNbr(i) ) + "_CsI" + NPA::itoa( m_EventData->GetMMCsIECristalNbr(i) ) +"_E",
m_EventData->GetMMCsIEEnergy(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",
+ return CalibrationManager::getInstance()->ApplyCalibration( "MUST2/T" + NPA::itoa( m_EventData->GetMMCsITDetectorNbr(i) ) + "_CsI" + NPA::itoa( m_EventData->GetMMCsITCristalNbr(i) ) +"_T",
m_EventData->GetMMCsITTime(i) );
}
diff --git a/NPLib/MUST2/TMust2Spectra.cxx b/NPLib/MUST2/TMust2Spectra.cxx
index b9b6427d8..d4ed4e15d 100644
--- a/NPLib/MUST2/TMust2Spectra.cxx
+++ b/NPLib/MUST2/TMust2Spectra.cxx
@@ -75,51 +75,51 @@ void TMust2Spectra::InitRawSpectra(){
string name;
for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
// STRX_E_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_E_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_E_RAW";
AddHisto2D(name, name, fStripX, 1, fStripX+1, 512, 0, 8192, "MUST2/RAW/STRXE");
// STRY_E_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_E_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_E_RAW";
AddHisto2D(name, name, fStripY, 1, fStripY+1, 512, 0, 8192, "MUST2/RAW/STRYE");
// STRX_T_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_T_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_T_RAW";
AddHisto2D(name, name, fStripX, 1, fStripX+1, 512, 0, 8192, "MUST2/RAW/STRXT");
// STRY_T_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_T_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_T_RAW";
AddHisto2D(name, name, fStripY, 1, fStripY+1, 512, 0, 8192, "MUST2/RAW/STRYT");
// SILI_E_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_E_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_E_RAW";
AddHisto2D(name, name, fPadSili, 1, fPadSili+1, 512, 0, 8192, "MUST2/RAW/SILIE");
// SILI_T_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_T_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_T_RAW";
AddHisto2D(name, name, fPadSili, 1, fPadSili+1, 512, 0, 8192, "MUST2/RAW/SILIT");
// CSI_E_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_E_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_E_RAW";
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 512, 0, 16384, "MUST2/RAW/CSIE");
// CSI_T_RAW
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_T_RAW";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_T_RAW";
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 512, 0, 8192, "MUST2/RAW/CSIT");
// STRX_RAW_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_RAW_MULT";
AddHisto1D(name, name, fStripX, 1, fStripX+1, "MUST2/RAW/MULT");
// STRY_RAW_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_RAW_MULT";
AddHisto1D(name, name, fStripX, 1, fStripX+1, "MUST2/RAW/MULT");
// SILI_RAW_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_RAW_MULT";
AddHisto1D(name, name, fPadSili, 1, fPadSili+1, "MUST2/RAW/MULT");
// CSI_RAW_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_RAW_MULT";
AddHisto1D(name, name, fCrystalCsI, 1, fCrystalCsI+1, "MUST2/RAW/MULT");
} // end loop on number of detectors
}
@@ -130,56 +130,56 @@ void TMust2Spectra::InitPreTreatedSpectra()
string name;
for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
// STRX_E_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_E_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_E_CAL";
AddHisto2D(name, name, fStripX, 1, fStripX+1, 500, 0, 50, "MUST2/CAL/STRXE");
// STRY_E_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_E_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_E_CAL";
AddHisto2D(name, name, fStripY, 1, fStripY+1, 500, 0, 50, "MUST2/CAL/STRYE");
// STRX_T_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_T_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_T_CAL";
AddHisto2D(name, name, fStripX, 1, fStripX+1, 500, 0, 500, "MUST2/CAL/STRXT");
// STRY_T_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_T_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_T_CAL";
AddHisto2D(name, name, fStripY, 1, fStripY+1, 500, 0, 500, "MUST2/CAL/STRYT");
// SILI_E_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_E_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_E_CAL";
AddHisto2D(name, name, fPadSili, 1, fPadSili+1, 500, 0, 50, "MUST2/CAL/SILIE");
// SILI_T_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_T_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_T_CAL";
AddHisto2D(name, name, fPadSili, 1, fPadSili+1, 500, 0, 50, "MUST2/CAL/SILIT");
// CSI_E_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_E_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_E_CAL";
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 500, 0, 500, "MUST2/CAL/CSIE");
// CSI_T_CAL
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_T_CAL";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_T_CAL";
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 500, 0, 50, "MUST2/CAL/CSIT");
// STRX_CAL_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_CAL_MULT";
AddHisto1D(name, name, fStripX, 1, fStripX+1, "MUST2/CAL/MULT");
// STRY_CAL_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_CAL_MULT";
AddHisto1D(name, name, fStripX, 1, fStripX+1, "MUST2/CAL/MULT");
// SILI_CAL_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_CAL_MULT";
AddHisto1D(name, name, fPadSili, 1, fPadSili+1, "MUST2/CAL/MULT");
// CSI_CAL_MULT
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_CAL_MULT";
AddHisto1D(name, name, fCrystalCsI, 1, fCrystalCsI+1, "MUST2/CAL/MULT");
// CSI_CAL_ID
for(unsigned int j = 0 ; j < fCrystalCsI ; j++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI"+MUST2_LOCAL::itoa(j+1)+"_CAL_ID";
+ name = "MM"+NPA::itoa(i+1)+"_CSI"+NPA::itoa(j+1)+"_CAL_ID";
AddHisto2D(name, name,8192,0,16384,500,0,50, "MUST2/CAL/ID");
}
} // end loop on number of detectors
@@ -198,7 +198,7 @@ void TMust2Spectra::InitPhysicsSpectra(){
// X-Y Energy Correlation
for (unsigned int i = 0 ; i < fNumberOfTelescope ; i++) { // loop on number of detectors
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_XY_COR";
+ name = "MM"+NPA::itoa(i+1)+"_XY_COR";
AddHisto2D(name, name,500,0,50,500,0,50, "MUST2/PHY");
}
@@ -223,19 +223,19 @@ void TMust2Spectra::InitPhysicsSpectra(){
// ID plot detector by detector
for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
// E-TOF:
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_E_TOF";
+ name = "MM"+NPA::itoa(i+1)+"_E_TOF";
AddHisto2D(name, name,500,0,50,500,200,1200,"MUST2/PHY");
// SILIE-DE:
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILIE_E";
+ name = "MM"+NPA::itoa(i+1)+"_SILIE_E";
AddHisto2D(name, name,500,0,200,500,0,50,"MUST2/PHY");
// CSI-DE:
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSIE_E";
+ name = "MM"+NPA::itoa(i+1)+"_CSIE_E";
AddHisto2D(name, name,500,0,500,500,0,50,"MUST2/PHY");
// Etot-DE:
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_Etot_E";
+ name = "MM"+NPA::itoa(i+1)+"_Etot_E";
AddHisto2D(name, name,500,0,500,500,0,50,"MUST2/PHY");
}
}
@@ -249,7 +249,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// STRX_E
for (unsigned int i = 0; i < RawData->GetMMStripXEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(RawData->GetMMStripXEDetectorNbr(i))+"_STRX_E_RAW";
+ name = "MM"+NPA::itoa(RawData->GetMMStripXEDetectorNbr(i))+"_STRX_E_RAW";
family = "MUST2/RAW/STRXE";
GetHisto(family,name)
@@ -259,7 +259,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// STRY_E
for (unsigned int i = 0; i < RawData->GetMMStripYEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa( RawData->GetMMStripYEDetectorNbr(i) )+"_STRY_E_RAW";
+ name = "MM"+NPA::itoa( RawData->GetMMStripYEDetectorNbr(i) )+"_STRY_E_RAW";
family = "MUST2/RAW/STRYE";
GetHisto(family,name)
@@ -269,7 +269,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// STRX_T
for (unsigned int i = 0; i < RawData->GetMMStripXTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(RawData->GetMMStripXTDetectorNbr(i))+"_STRX_T_RAW";
+ name = "MM"+NPA::itoa(RawData->GetMMStripXTDetectorNbr(i))+"_STRX_T_RAW";
family = "MUST2/RAW/STRXT";
GetHisto(family,name)
@@ -278,7 +278,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
}
// STRY_T
for (unsigned int i = 0; i < RawData->GetMMStripYTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(RawData->GetMMStripYTDetectorNbr(i))+"_STRY_T_RAW";
+ name = "MM"+NPA::itoa(RawData->GetMMStripYTDetectorNbr(i))+"_STRY_T_RAW";
family = "MUST2/RAW/STRYT";
GetHisto(family,name)
@@ -288,7 +288,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// SILI_E
for (unsigned int i = 0; i < RawData->GetMMSiLiEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa( RawData->GetMMSiLiEDetectorNbr(i))+"_SILI_E_RAW";
+ name = "MM"+NPA::itoa( RawData->GetMMSiLiEDetectorNbr(i))+"_SILI_E_RAW";
family = "MUST2/RAW/SILIE";
GetHisto(family,name)
@@ -298,7 +298,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// SILI_T
for (unsigned int i = 0; i < RawData->GetMMSiLiTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(RawData->GetMMSiLiTDetectorNbr(i))+"_SILI_T_RAW";
+ name = "MM"+NPA::itoa(RawData->GetMMSiLiTDetectorNbr(i))+"_SILI_T_RAW";
family = "MUST2/RAW/SILIT";
GetHisto(family,name)
@@ -308,7 +308,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// CSI_E
for (unsigned int i = 0; i < RawData->GetMMCsIEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(RawData->GetMMCsIEDetectorNbr(i))+"_CSI_E_RAW";
+ name = "MM"+NPA::itoa(RawData->GetMMCsIEDetectorNbr(i))+"_CSI_E_RAW";
family = "MUST2/RAW/CSIE";
GetHisto(family,name)
@@ -318,7 +318,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
// CSI_T
for (unsigned int i = 0; i < RawData->GetMMCsITMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa( RawData->GetMMCsITDetectorNbr(i))+"_CSI_T_RAW";
+ name = "MM"+NPA::itoa( RawData->GetMMCsITDetectorNbr(i))+"_CSI_T_RAW";
family = "MUST2/RAW/CSIT";
GetHisto(family,name)
@@ -337,7 +337,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_RAW_MULT";
family= "MUST2/RAW/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -352,7 +352,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_RAW_MULT";
family= "MUST2/RAW/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -367,7 +367,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_RAW_MULT";
family= "MUST2/RAW/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -382,7 +382,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_RAW_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_RAW_MULT";
family= "MUST2/RAW/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -396,7 +396,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
string family;
// STRX_E
for (unsigned int i = 0; i < PreTreatedData->GetMMStripXEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMStripXEDetectorNbr(i))+"_STRX_E_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMStripXEDetectorNbr(i))+"_STRX_E_CAL";
family = "MUST2/CAL/STRXE";
GetHisto(family,name)
@@ -405,7 +405,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// STRY_E
for (unsigned int i = 0; i < PreTreatedData->GetMMStripYEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa( PreTreatedData->GetMMStripYEDetectorNbr(i))+"_STRY_E_CAL";
+ name = "MM"+NPA::itoa( PreTreatedData->GetMMStripYEDetectorNbr(i))+"_STRY_E_CAL";
family = "MUST2/CAL/STRYE";
GetHisto(family,name)
@@ -414,7 +414,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// STRX_T
for (unsigned int i = 0; i < PreTreatedData->GetMMStripXTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMStripXTDetectorNbr(i))+"_STRX_T_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMStripXTDetectorNbr(i))+"_STRX_T_CAL";
family = "MUST2/CAL/STRXT";
GetHisto(family,name)
@@ -423,7 +423,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// STRY_T
for (unsigned int i = 0; i < PreTreatedData->GetMMStripYTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMStripYTDetectorNbr(i))+"_STRY_T_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMStripYTDetectorNbr(i))+"_STRY_T_CAL";
family = "MUST2/CAL/STRYT";
GetHisto(family,name)
@@ -432,7 +432,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// SILI_E
for (unsigned int i = 0; i < PreTreatedData->GetMMSiLiEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMSiLiEDetectorNbr(i) )+"_SILI_E_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMSiLiEDetectorNbr(i) )+"_SILI_E_CAL";
family = "MUST2/CAL/SILIE";
GetHisto(family,name)
@@ -441,7 +441,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// SILI_T
for (unsigned int i = 0; i < PreTreatedData->GetMMSiLiTMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMSiLiTDetectorNbr(i))+"_SILI_T_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMSiLiTDetectorNbr(i))+"_SILI_T_CAL";
family = "MUST2/CAL/SILIT";
GetHisto(family,name)
@@ -450,7 +450,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
// CSI_E
for (unsigned int i = 0; i < PreTreatedData->GetMMCsIEMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMCsIEDetectorNbr(i))+"_CSI_E_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMCsIEDetectorNbr(i))+"_CSI_E_CAL";
family = "MUST2/CAL/CSIE";
GetHisto(family,name)
@@ -460,7 +460,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
// CSI_T
for (unsigned int i = 0; i < PreTreatedData->GetMMCsITMult(); i++) {
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMCsITDetectorNbr(i))+"_CSI_T_CAL";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMCsITDetectorNbr(i))+"_CSI_T_CAL";
family = "MUST2/CAL/CSIT";
GetHisto(family,name)
@@ -479,7 +479,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRX_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRX_CAL_MULT";
family= "MUST2/CAL/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -494,7 +494,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_STRY_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_STRY_CAL_MULT";
family= "MUST2/CAL/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -509,7 +509,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_SILI_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_SILI_CAL_MULT";
family= "MUST2/CAL/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -524,7 +524,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
}
for( unsigned int i = 0; i < fNumberOfTelescope; i++){
- name = "MM"+MUST2_LOCAL::itoa(i+1)+"_CSI_CAL_MULT";
+ name = "MM"+NPA::itoa(i+1)+"_CSI_CAL_MULT";
family= "MUST2/CAL/MULT";
GetHisto(family,name)
-> Fill(myMULT[i]);
@@ -536,7 +536,7 @@ void TMust2Spectra::FillPreTreatedSpectra(TMust2Data* PreTreatedData){
for (unsigned int j = 0; j < PreTreatedData->GetMMCsIEMult(); j++) {
if(PreTreatedData->GetMMStripXEDetectorNbr(i) == PreTreatedData->GetMMCsIEDetectorNbr(j)){
- name = "MM"+MUST2_LOCAL::itoa(PreTreatedData->GetMMStripXEDetectorNbr(i))+"_CSI"+MUST2_LOCAL::itoa(PreTreatedData->GetMMCsIECristalNbr(j))+"_CAL_ID";
+ name = "MM"+NPA::itoa(PreTreatedData->GetMMStripXEDetectorNbr(i))+"_CSI"+NPA::itoa(PreTreatedData->GetMMCsIECristalNbr(j))+"_CAL_ID";
GetHisto(family,name)
-> Fill(PreTreatedData->GetMMCsIEEnergy(j),
@@ -566,7 +566,7 @@ void TMust2Spectra::FillPhysicsSpectra(TMust2Physics* Physics){
GetHisto(family,name)-> Fill(Theta,Physics->Si_E[i]);
// STRX_E_CAL
- name = "MM"+MUST2_LOCAL::itoa( Physics->TelescopeNumber[i])+"_XY_COR";
+ name = "MM"+NPA::itoa( Physics->TelescopeNumber[i])+"_XY_COR";
GetHisto(family,name)-> Fill(Physics->Si_EX[i],Physics->Si_EY[i]);
@@ -576,7 +576,7 @@ void TMust2Spectra::FillPhysicsSpectra(TMust2Physics* Physics){
name = "MM_E_TOF";
GetHisto(family,name)->Fill(Physics->Si_E[i],Physics->Si_T[i]);
- name = "MM"+MUST2_LOCAL::itoa(Physics->TelescopeNumber[i])+"_E_TOF";
+ name = "MM"+NPA::itoa(Physics->TelescopeNumber[i])+"_E_TOF";
GetHisto(family,name)->Fill(Physics->Si_E[i],Physics->Si_T[i]);
}
@@ -586,7 +586,7 @@ void TMust2Spectra::FillPhysicsSpectra(TMust2Physics* Physics){
Etot = Physics->SiLi_E[i];
GetHisto(family,name)->Fill(Physics->SiLi_E[i],Physics->Si_E[i]);
- name = "MM"+MUST2_LOCAL::itoa(Physics->TelescopeNumber[i])+"_SILIE_E";
+ name = "MM"+NPA::itoa(Physics->TelescopeNumber[i])+"_SILIE_E";
GetHisto(family,name)->Fill(Physics->SiLi_E[i],Physics->Si_E[i]);
}
@@ -594,7 +594,7 @@ void TMust2Spectra::FillPhysicsSpectra(TMust2Physics* Physics){
name = "MM_CSIE_E";
Etot += Physics->CsI_E[i];
GetHisto(family,name)->Fill(Physics->CsI_E[i],Physics->Si_E[i]);
- name = "MM"+MUST2_LOCAL::itoa(Physics->TelescopeNumber[i])+"_CSIE_E";
+ name = "MM"+NPA::itoa(Physics->TelescopeNumber[i])+"_CSIE_E";
GetHisto(family,name)->Fill(Physics->CsI_E[i],Physics->Si_E[i]);
}
@@ -602,7 +602,7 @@ void TMust2Spectra::FillPhysicsSpectra(TMust2Physics* Physics){
if(Etot>0){
name = "MM_Etot_E";
GetHisto(family,name)->Fill(Etot,Physics->Si_E[i]);
- name = "MM"+MUST2_LOCAL::itoa(Physics->TelescopeNumber[i])+"_Etot_E";
+ name = "MM"+NPA::itoa(Physics->TelescopeNumber[i])+"_Etot_E";
GetHisto(family,name)->Fill(Etot,Physics->Si_E[i]);
}
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index 8881f9ce0..6e1f76f61 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -97,8 +97,8 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
double POS =
CalibrationManager::getInstance()
->ApplyResistivePositionCalibration("TIARABARREL/B"
- +itoa(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i))
- +"_STRIP"+itoa(m_PreTreatedData->GetFrontUpstreamEStripNbr(i))
+ +NPA::itoa(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i))
+ +"_STRIP"+NPA::itoa(m_PreTreatedData->GetFrontUpstreamEStripNbr(i))
+"_POS",(ED-EU)/(EU+ED));
UpStream_E.push_back(EU);
@@ -108,9 +108,9 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
DetectorNumber.push_back(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i));
double E = (EU+ED); /* / CalibrationManager::getInstance()
->ApplyCalibration("TIARABARREL/BALLISTIC_B"
- + itoa(m_PreTreatedData->GetFrontDownstreamEDetectorNbr(i))
+ + NPA::itoa(m_PreTreatedData->GetFrontDownstreamEDetectorNbr(i))
+ "_STRIP"
- + itoa(m_PreTreatedData->GetFrontDownstreamEStripNbr(i)),
+ + NPA::itoa(m_PreTreatedData->GetFrontDownstreamEStripNbr(i)),
POS); */
Strip_E.push_back(E);
}
@@ -479,18 +479,18 @@ void TTiaraBarrelPhysics::AddParameterToCalibrationManager(){
// E and T
for(int i = 0 ; i < m_NumberOfDetector ; ++i){
for( int j = 0 ; j < 4 ; ++j){
- Cal->AddParameter("TIARABARREL","B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E","TIARABARREL_B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARABARREL","B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARABARREL","B"+NPA::itoa(i+1)+"_UPSTREAM"+NPA::itoa(j+1)+"_E","TIARABARREL_B"+NPA::itoa(i+1)+"_UPSTREAM"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARABARREL","B"+NPA::itoa(i+1)+"_DOWNSTREAM"+NPA::itoa(j+1)+"_E","TIARABARREL_B"+NPA::itoa(i+1)+"_DOWNSTREAM"+NPA::itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+NPA::itoa(i+1)+"_UPSTREAM"+NPA::itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+NPA::itoa(i+1)+"_UPSTREAM"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARABARREL","MATCHSTICK_B"+NPA::itoa(i+1)+"_DOWNSTREAM"+NPA::itoa(j+1)+"_E","TIARABARREL_MATCHSTICK_B"+NPA::itoa(i+1)+"_DOWNSTREAM"+NPA::itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARABARREL","BALLISTIC_B"+itoa(i+1)+"_STRIP"+itoa(j+1),"TIARABARREL_BALLISTIC_B"+itoa(i+1)+"_STRIP"+itoa(j+1)) ;
- Cal->AddParameter("TIARABARREL","B"+itoa(i+1)+"_STRIP"+itoa(j+1)+"_POS","TIARABARREL_B"+itoa(i+1)+"_STRIP"+itoa(j+1)+"_POS") ;
+ Cal->AddParameter("TIARABARREL","BALLISTIC_B"+NPA::itoa(i+1)+"_STRIP"+NPA::itoa(j+1),"TIARABARREL_BALLISTIC_B"+NPA::itoa(i+1)+"_STRIP"+NPA::itoa(j+1)) ;
+ Cal->AddParameter("TIARABARREL","B"+NPA::itoa(i+1)+"_STRIP"+NPA::itoa(j+1)+"_POS","TIARABARREL_B"+NPA::itoa(i+1)+"_STRIP"+NPA::itoa(j+1)+"_POS") ;
}
- Cal->AddParameter("TIARABARREL","TIARABARREL/B" + itoa( i+1 ) + "_BACK_E","TIARABARREL_B" + itoa( i+1 ) + "_BACK_E");
+ Cal->AddParameter("TIARABARREL","TIARABARREL/B" + NPA::itoa( i+1 ) + "_BACK_E","TIARABARREL_B" + NPA::itoa( i+1 ) + "_BACK_E");
}
return;
@@ -640,39 +640,29 @@ void TTiaraBarrelPhysics::InitializeStandardParameter(){
*/
return;
}
-
-///////////////////////////////////////////////////////////////////////////////
-// transform an integer to a string
-namespace TiaraBarrel_LOCAL{
- string itoa(unsigned int value){
- char buffer [33];
- sprintf(buffer,"%d",value);
- return buffer;
- }
-}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Strip_Upstream_E(const int i){
- return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) + "_UPSTREAM" + itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + NPA::itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) + "_UPSTREAM" + NPA::itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) + "_E",
Match_Strip_Upstream_E(i) );
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Strip_Downstream_E(const int i){
- return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) + "_DOWNSTREAM" + itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + NPA::itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) + "_DOWNSTREAM" + NPA::itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) + "_E",
Match_Strip_Downstream_E(i) );
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Match_Strip_Upstream_E(const int i){
- return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/MATCHSTICK_B" + itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) + "_UPSTREAM" + itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/MATCHSTICK_B" + NPA::itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) + "_UPSTREAM" + NPA::itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) + "_E",
m_EventData->GetFrontUpstreamEEnergy(i) );
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Match_Strip_Downstream_E(const int i){
- return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/MATCHSTICK_B" + itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) + "_DOWNSTREAM" + itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) + "_E",
+ return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/MATCHSTICK_B" + NPA::itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) + "_DOWNSTREAM" + NPA::itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) + "_E",
m_EventData->GetFrontDownstreamEEnergy(i) );
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Back_E(const int i){
- return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + itoa( m_EventData->GetBackEDetectorNbr(i) ) + "_BACK_E", m_EventData->GetBackEEnergy(i));
+ return CalibrationManager::getInstance()->ApplyCalibration("TIARABARREL/B" + NPA::itoa( m_EventData->GetBackEDetectorNbr(i) ) + "_BACK_E", m_EventData->GetBackEEnergy(i));
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Tiara/TTiaraBarrelSpectra.cxx b/NPLib/Tiara/TTiaraBarrelSpectra.cxx
index 20db5878f..c284e9cbc 100644
--- a/NPLib/Tiara/TTiaraBarrelSpectra.cxx
+++ b/NPLib/Tiara/TTiaraBarrelSpectra.cxx
@@ -109,7 +109,7 @@ void TTiaraBarrelSpectra::InitRawSpectra(){
// Inner Barrel
for(unsigned int i = 0 ; i < fNumberOfDetector ; i++){
for(unsigned int j = 0 ; j < fInnerBarrelStrip;j++){
- name = "IB"+TiaraBarrel_LOCAL::itoa(i+1)+"_VS"+TiaraBarrel_LOCAL::itoa(j+1)+"_RAW";
+ name = "IB"+NPA::itoa(i+1)+"_VS"+NPA::itoa(j+1)+"_RAW";
AddHisto2D(name, name,1024,0,0,1024,0,0,BaseFamily+"VS");
}
}
@@ -123,10 +123,10 @@ void TTiaraBarrelSpectra::InitPreTreatedSpectra(){
// Inner Barrel
for(unsigned int i = 0 ; i < fNumberOfDetector ; i++){
for(unsigned int j = 0 ; j < fInnerBarrelStrip;j++){
- name = "IB"+TiaraBarrel_LOCAL::itoa(i+1)+"_VS"+TiaraBarrel_LOCAL::itoa(j+1)+"_CAL";
+ name = "IB"+NPA::itoa(i+1)+"_VS"+NPA::itoa(j+1)+"_CAL";
AddHisto2D(name,name,2048,0,0,2048,0,0,BaseFamily+"VS");
}
- name = "IB"+TiaraBarrel_LOCAL::itoa(i+1)+"_VS_BACK_CAL";
+ name = "IB"+NPA::itoa(i+1)+"_VS_BACK_CAL";
AddHisto2D(name,name,2048,0,0,2048,0,0,BaseFamily+"VS");
}
}
@@ -139,7 +139,7 @@ string name ;
// Inner Barrel
for(unsigned int i = 0 ; i < fNumberOfDetector ; i++){
for(unsigned int j = 0 ; j < fInnerBarrelStrip;j++){
- name = "IB"+TiaraBarrel_LOCAL::itoa(i+1)+"_EPOS"+TiaraBarrel_LOCAL::itoa(j+1)+"_CAL";
+ name = "IB"+NPA::itoa(i+1)+"_EPOS"+NPA::itoa(j+1)+"_CAL";
AddHisto2D(name, name,1000,-0.5,1.5,1000,0,30,BaseFamily);
}
}
@@ -147,7 +147,7 @@ string name ;
// Inner Barrel
for(unsigned int i = 0 ; i < fNumberOfDetector ; i++){
for(unsigned int j = 0 ; j < fInnerBarrelStrip;j++){
- name = "IB"+TiaraBarrel_LOCAL::itoa(i+1)+"_ETHETA"+TiaraBarrel_LOCAL::itoa(j+1)+"_CAL";
+ name = "IB"+NPA::itoa(i+1)+"_ETHETA"+NPA::itoa(j+1)+"_CAL";
AddHisto2D(name, name,360,0,180,1000,0,30,BaseFamily);
}
}
@@ -235,7 +235,7 @@ void TTiaraBarrelSpectra::FillRawSpectra(TTiaraBarrelData* RawData){
int DoStreamDetNbr = RawData->GetFrontDownstreamEDetectorNbr(j);
int DoStreamStrNbr = RawData->GetFrontDownstreamEStripNbr(j);
if(UpStreamDetNbr==DoStreamDetNbr && UpStreamStrNbr==DoStreamStrNbr){
- name = "IB"+TiaraBarrel_LOCAL::itoa(UpStreamDetNbr)+"_VS"+TiaraBarrel_LOCAL::itoa(UpStreamStrNbr)+"_RAW";
+ name = "IB"+NPA::itoa(UpStreamDetNbr)+"_VS"+NPA::itoa(UpStreamStrNbr)+"_RAW";
GetHisto(family,name)
->Fill(RawData->GetFrontUpstreamEEnergy(i),RawData->GetFrontDownstreamEEnergy(j));
}
@@ -262,13 +262,13 @@ string BaseFamily = "TIARA/BARREL/CAL/";
int DoStreamDetNbr = PreTreatedData->GetFrontDownstreamEDetectorNbr(j);
int DoStreamStrNbr = PreTreatedData->GetFrontDownstreamEStripNbr(j);
if(UpStreamDetNbr==DoStreamDetNbr && UpStreamStrNbr==DoStreamStrNbr){
- name = "IB"+TiaraBarrel_LOCAL::itoa(UpStreamDetNbr)+"_VS"+TiaraBarrel_LOCAL::itoa(UpStreamStrNbr)+"_CAL";
+ name = "IB"+NPA::itoa(UpStreamDetNbr)+"_VS"+NPA::itoa(UpStreamStrNbr)+"_CAL";
GetHisto(family,name)
->Fill(PreTreatedData->GetFrontUpstreamEEnergy(i),PreTreatedData->GetFrontDownstreamEEnergy(j));
for (unsigned int k = 0; k < sizeB; k++) {
if(UpStreamDetNbr == PreTreatedData->GetBackEDetectorNbr(k)){
- name = "IB"+TiaraBarrel_LOCAL::itoa(UpStreamDetNbr)+"_VS_BACK_CAL";
+ name = "IB"+NPA::itoa(UpStreamDetNbr)+"_VS_BACK_CAL";
GetHisto(family,name)
->Fill(PreTreatedData->GetFrontUpstreamEEnergy(i)
+PreTreatedData->GetFrontDownstreamEEnergy(j),
@@ -288,11 +288,11 @@ void TTiaraBarrelSpectra::FillPhysicsSpectra(TTiaraBarrelPhysics* Physics){
// Inner Barrel
//unsigned int size = Physics->Strip_E.size();
for(unsigned int i = 0 ; i < Physics->Strip_E.size() ; i++){
- name ="IB"+TiaraBarrel_LOCAL::itoa(Physics->DetectorNumber[i])+"_EPOS"+TiaraBarrel_LOCAL::itoa(Physics->Strip_N[i])+"_CAL";
+ name ="IB"+NPA::itoa(Physics->DetectorNumber[i])+"_EPOS"+NPA::itoa(Physics->Strip_N[i])+"_CAL";
GetHisto(family,name)
->Fill(Physics->Strip_Pos[i],Physics->Strip_E[i]);
- name = "IB"+TiaraBarrel_LOCAL::itoa(Physics->DetectorNumber[i])+"_ETHETA"+TiaraBarrel_LOCAL::itoa(Physics->Strip_N[i])+"_CAL";
+ name = "IB"+NPA::itoa(Physics->DetectorNumber[i])+"_ETHETA"+NPA::itoa(Physics->Strip_N[i])+"_CAL";
double Theta = Physics->GetPositionOfInteraction(i).Angle(TVector3(0,0,1));
GetHisto(family,name)
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index d248d84eb..bbe7c1c1f 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -545,16 +545,16 @@ void TTiaraHyballPhysics::AddParameterToCalibrationManager(){
for(int i = 0 ; i < m_NumberOfDetector ; ++i){
for( int j = 0 ; j < 24 ; ++j){
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_MATCHSTICK") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_E","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_MATCHSTICK") ;
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_T","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_RING"+NPA::itoa(j+1)+"_T") ;
}
for( int j = 0 ; j < 48 ; ++j){
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E") ;
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_MATCHSTICK") ;
- Cal->AddParameter("TIARAHYBALL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T","TIARAHYBALL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_E","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_E") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_MATCHSTICK","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_MATCHSTICK") ;
+ Cal->AddParameter("TIARAHYBALL", "D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_T","TIARAHYBALL_D"+NPA::itoa(i+1)+"_STRIP_SECTOR"+NPA::itoa(j+1)+"_T") ;
}
}
return;
@@ -707,43 +707,36 @@ void TTiaraHyballPhysics::InitializeStandardParameter(){
///////////////////////////////////////////////////////////////////////////
namespace TiaraHyball_LOCAL{
-
- // transform an integer to a string
- string itoa(unsigned int value){
- char buffer [33];
- sprintf(buffer,"%d",value);
- return buffer;
- }
-
+ CalibrationManager* Cal = CalibrationManager::getInstance();
// DSSD
// Ring
double fStrip_Ring_E(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingEStripNbr(i) ) + "_E",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + NPA::itoa( m_EventData->GetRingEStripNbr(i) ) + "_E",
fStrip_Ring_Matchstick(m_EventData,i) );
}
double fStrip_Ring_Matchstick(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingEStripNbr(i) ) + "_MATCHSTICK",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetRingEDetectorNbr(i) ) + "_STRIP_RING" + NPA::itoa( m_EventData->GetRingEStripNbr(i) ) + "_MATCHSTICK",
m_EventData->GetRingEEnergy(i) );
}
double fStrip_Ring_T(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetRingTDetectorNbr(i) ) + "_STRIP_RING" + itoa( m_EventData->GetRingTStripNbr(i) ) +"_T",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetRingTDetectorNbr(i) ) + "_STRIP_RING" + NPA::itoa( m_EventData->GetRingTStripNbr(i) ) +"_T",
m_EventData->GetRingTTime(i) );
}
// Sector
double fStrip_Sector_E(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetSectorEDetectorNbr(i) ) + "_STRIP_SECTOR" + itoa( m_EventData->GetSectorEStripNbr(i) ) +"_E",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetSectorEDetectorNbr(i) ) + "_STRIP_SECTOR" + NPA::itoa( m_EventData->GetSectorEStripNbr(i) ) +"_E",
fStrip_Sector_Matchstick(m_EventData,i) );
}
double fStrip_Sector_Matchstick(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetSectorEDetectorNbr(i) ) + "_STRIP_SECTOR" + itoa( m_EventData->GetSectorEStripNbr(i) ) +"_MATCHSTICK",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetSectorEDetectorNbr(i) ) + "_STRIP_SECTOR" + NPA::itoa( m_EventData->GetSectorEStripNbr(i) ) +"_MATCHSTICK",
m_EventData->GetSectorEEnergy(i) );
}
double fStrip_Sector_T(const TTiaraHyballData* m_EventData , const int i){
- return CalibrationManager::getInstance()->ApplyCalibration( "TIARAHYBALL/D" + itoa( m_EventData->GetSectorTDetectorNbr(i) ) + "_STRIP_SECTOR" + itoa( m_EventData->GetSectorTStripNbr(i) ) +"_T",
+ return Cal->ApplyCalibration("TIARAHYBALL/D" + NPA::itoa( m_EventData->GetSectorTDetectorNbr(i) ) + "_STRIP_SECTOR" + NPA::itoa( m_EventData->GetSectorTStripNbr(i) ) +"_T",
m_EventData->GetRingTTime(i) );
}
diff --git a/NPLib/Tiara/TTiaraHyballSpectra.cxx b/NPLib/Tiara/TTiaraHyballSpectra.cxx
index 4e758bd5f..64bef28b4 100644
--- a/NPLib/Tiara/TTiaraHyballSpectra.cxx
+++ b/NPLib/Tiara/TTiaraHyballSpectra.cxx
@@ -83,11 +83,11 @@ void TTiaraHyballSpectra::InitRawSpectra(){
// MULT
for (unsigned int i = 0; i < fWedgesNumber; ++i) { // loop on number of wedges
// RING_RAW_MULT
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_RING_E_RAW_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_RING_E_RAW_MULT";
AddHisto1D(name, name, fRingsNumber, 1, fRingsNumber+1, "TIARA/HYBALL/RAW/MULT");
// SECTOR_RAW_MULT
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_SECT_E_RAW_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_SECT_E_RAW_MULT";
AddHisto1D(name, name, fSectorsNumber, 1, fSectorsNumber+1, "TIARA/HYBALL/RAW/MULT");
} // end loop on number of wedges
}
@@ -117,11 +117,11 @@ void TTiaraHyballSpectra::InitPreTreatedSpectra(){
// MULT
for (unsigned int i = 0; i < fWedgesNumber; ++i) { // loop on number of wedges
// RING_CAL_MULT
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_RING_E_CAL_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_RING_E_CAL_MULT";
AddHisto1D(name, name, fRingsNumber, 1, fRingsNumber+1, "TIARA/HYBALL/CAL/MULT");
// SECTOR_CAL_MULT
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_SECT_E_CAL_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_SECT_E_CAL_MULT";
AddHisto1D(name, name, fSectorsNumber, 1, fSectorsNumber+1, "TIARA/HYBALL/CAL/MULT");
} // end loop on number of wedges
}
@@ -189,7 +189,7 @@ void TTiaraHyballSpectra::FillRawSpectra(TTiaraHyballData* RawData){
for (unsigned int i = 0; i < RawData->GetRingEMult(); i++) myMULT[(RawData->GetRingEDetectorNbr(i)-1)] += 1;
for (unsigned int i = 0; i < fWedgesNumber; i++) {
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_RING_E_RAW_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_RING_E_RAW_MULT";
family = "TIARA/HYBALL/RAW/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -199,7 +199,7 @@ void TTiaraHyballSpectra::FillRawSpectra(TTiaraHyballData* RawData){
for (unsigned int i = 0; i < RawData->GetSectorEMult(); i++) myMULT[(RawData->GetSectorEDetectorNbr(i)-1)] += 1;
for (unsigned int i = 0; i < fWedgesNumber; i++) {
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_SECT_E_RAW_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_SECT_E_RAW_MULT";
family = "TIARA/HYBALL/RAW/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -250,7 +250,7 @@ void TTiaraHyballSpectra::FillPreTreatedSpectra(TTiaraHyballData* PreTreatedData
for (unsigned int i = 0; i < PreTreatedData->GetRingEMult(); i++) myMULT[(PreTreatedData->GetRingEDetectorNbr(i)-1)] += 1;
for (unsigned int i = 0; i < fWedgesNumber; i++) {
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_RING_E_CAL_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_RING_E_CAL_MULT";
family = "TIARA/HYBALL/CAL/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
@@ -260,7 +260,7 @@ void TTiaraHyballSpectra::FillPreTreatedSpectra(TTiaraHyballData* PreTreatedData
for (unsigned int i = 0; i < PreTreatedData->GetSectorEMult(); i++) myMULT[(PreTreatedData->GetSectorEDetectorNbr(i)-1)] += 1;
for (unsigned int i = 0; i < fWedgesNumber; i++) {
- name = "HYB_W"+TiaraHyball_LOCAL::itoa(i+1)+"_SECT_E_CAL_MULT";
+ name = "HYB_W"+NPA::itoa(i+1)+"_SECT_E_CAL_MULT";
family = "TIARA/HYBALL/CAL/MULT";
GetHisto(family,name) -> Fill(myMULT[i]);
}
diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx
index b82318d23..75e087167 100644
--- a/NPLib/Utility/npanalysis.cxx
+++ b/NPLib/Utility/npanalysis.cxx
@@ -96,7 +96,7 @@ int main(int argc , char** argv){
else{
for (unsigned int i = 0 ; i < nentries; i++) {
- // Get the raw Data
+ // Get the raw Data
Chain -> GetEntry(i);
// Build the current event
myDetector->BuildPhysicalEvent();
--
GitLab