From e6e073a6a42674b485d4a37fb926493a1f2b7825 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 28 May 2015 13:28:16 +0100
Subject: [PATCH] * Fixing initialisation issue of static variable
---
NPLib/CATS/TCATSPhysics.cxx | 10 +++++-----
NPLib/MUST2/TMust2Physics.cxx | 16 ++++++++--------
NPLib/Tiara/TTiaraBarrelPhysics.cxx | 10 +++++-----
NPLib/Tiara/TTiaraHyballPhysics.cxx | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/NPLib/CATS/TCATSPhysics.cxx b/NPLib/CATS/TCATSPhysics.cxx
index b73958529..b862f50d5 100644
--- a/NPLib/CATS/TCATSPhysics.cxx
+++ b/NPLib/CATS/TCATSPhysics.cxx
@@ -941,7 +941,7 @@ namespace CATS_LOCAL{
////////////////////////////////////////////////////////////////////////
double fCATS_X_Q(const TCATSData* m_EventData , const int i){
- static string name = "CATS/D" ;
+ static string name; name = "CATS/D" ;
name+= NPL::itoa( m_EventData->GetCATSDetX(i) ) ;
name+= "_X" ;
name+= NPL::itoa( m_EventData->GetCATSStripX(i) ) ;
@@ -951,7 +951,7 @@ namespace CATS_LOCAL{
}
////////////////////////////////////////////////////////////////////////
double fCATS_Y_Q(const TCATSData* m_EventData , const int i){
- static string name = "CATS/D" ;
+ static string name; name = "CATS/D" ;
name+= NPL::itoa( m_EventData->GetCATSDetY(i) ) ;
name+= "_Y" ;
name+= NPL::itoa( m_EventData->GetCATSStripY(i) ) ;
@@ -970,7 +970,7 @@ namespace CATS_LOCAL{
}
////////////////////////////////////////////////////////////////////////
bool fCATS_Threshold_Y(const TCATSData* m_EventData , const int i){
- static string name ="CATS/D" ;
+ static string name; name ="CATS/D" ;
name+= NPL::itoa( m_EventData->GetCATSDetY(i) ) ;
name+= "_Y" ;
name+= NPL::itoa( m_EventData->GetCATSStripY(i) );
@@ -979,7 +979,7 @@ namespace CATS_LOCAL{
}
////////////////////////////////////////////////////////////////////////
double fCATS_Ped_X(const TCATSData* m_EventData, const int i){
- static string name = "CATS/D" ;
+ static string name; name = "CATS/D" ;
name+= NPL::itoa( m_EventData->GetCATSDetX(i) ) ;
name+= "_X" ;
name+= NPL::itoa( m_EventData->GetCATSStripX(i) ) ;
@@ -987,7 +987,7 @@ namespace CATS_LOCAL{
}
////////////////////////////////////////////////////////////////////////
double fCATS_Ped_Y(const TCATSData* m_EventData, const int i){
- static string name = "CATS/D" ;
+ static string name; name = "CATS/D" ;
name+= NPL::itoa( m_EventData->GetCATSDetY(i) ) ;
name+= "_Y" ;
name+= NPL::itoa( m_EventData->GetCATSStripY(i) );
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index c6f21bb5e..05293a370 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -1342,7 +1342,7 @@ namespace MUST2_LOCAL{
// DSSD
// X
double fSi_X_E(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMStripXEDetectorNbr(i) ) ;
name+= "_Si_X" ;
name+= NPL::itoa( m_EventData->GetMMStripXEStripNbr(i) ) ;
@@ -1352,7 +1352,7 @@ name+= "_E";
}
double fSi_X_T(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMStripXTDetectorNbr(i) ) ;
name+= "_Si_X" ;
name+= NPL::itoa( m_EventData->GetMMStripXTStripNbr(i) ) ;
@@ -1363,7 +1363,7 @@ name+="_T";
// Y
double fSi_Y_E(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMStripYEDetectorNbr(i) ) ;
name+= "_Si_Y" ;
name+= NPL::itoa( m_EventData->GetMMStripYEStripNbr(i) ) ;
@@ -1372,7 +1372,7 @@ name+="_E";
}
double fSi_Y_T(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMStripYTDetectorNbr(i) ) ;
name+= "_Si_Y" ;
name+= NPL::itoa( m_EventData->GetMMStripYTStripNbr(i) ) ;
@@ -1384,7 +1384,7 @@ name+="_T";
// SiLi
double fSiLi_E(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMSiLiEDetectorNbr(i) ) ;
name+= "_SiLi" ;
name+= NPL::itoa( m_EventData->GetMMSiLiEPadNbr(i) ) ;
@@ -1394,7 +1394,7 @@ name+="_E";
}
double fSiLi_T(const TMust2Data* m_EventData , const int i){
- static string name ="MUST2/T" ;
+ static string name; name ="MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMSiLiTDetectorNbr(i) ) ;
name+= "_SiLi" ;
name+= NPL::itoa( m_EventData->GetMMSiLiTPadNbr(i) );
@@ -1405,7 +1405,7 @@ name+="_T";
// CsI
double fCsI_E(const TMust2Data* m_EventData , const int i){
- static string name = "MUST2/T" ;
+ static string name; name = "MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMCsIEDetectorNbr(i) ) ;
name+= "_CsI" ;
name+= NPL::itoa( m_EventData->GetMMCsIECristalNbr(i) ) ;
@@ -1415,7 +1415,7 @@ name+="_E";
}
double fCsI_T(const TMust2Data* m_EventData , const int i){
- static string name ="MUST2/T" ;
+ static string name; name ="MUST2/T" ;
name+= NPL::itoa( m_EventData->GetMMCsITDetectorNbr(i) ) ;
name+= "_CsI" ;
name+= NPL::itoa( m_EventData->GetMMCsITCristalNbr(i) ) ;
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index b03fb668c..c65fca5b9 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -667,7 +667,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Strip_Upstream_E(const int i){
- static string name ="TIARABARREL/B" ;
+ static string name; name ="TIARABARREL/B" ;
name+= NPL::itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) ;
name+= "_UPSTREAM" ;
name+= NPL::itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) ;
@@ -677,7 +677,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Strip_Downstream_E(const int i){
- static string name = "TIARABARREL/B" ;
+ static string name; name = "TIARABARREL/B" ;
name+= NPL::itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) ;
name+= "_DOWNSTREAM" ;
name+= NPL::itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) ;
@@ -687,7 +687,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Match_Strip_Upstream_E(const int i){
- static string name = "TIARABARREL/MATCHSTICK_B" ;
+ static string name; name = "TIARABARREL/MATCHSTICK_B" ;
name+= NPL::itoa( m_EventData->GetFrontUpstreamEDetectorNbr(i) ) ;
name+= "_UPSTREAM" ;
name+= NPL::itoa( m_EventData->GetFrontUpstreamEStripNbr(i) ) ;
@@ -697,7 +697,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Match_Strip_Downstream_E(const int i){
- static string name ="TIARABARREL/MATCHSTICK_B" ;
+ static string name; name ="TIARABARREL/MATCHSTICK_B" ;
name+= NPL::itoa( m_EventData->GetFrontDownstreamEDetectorNbr(i) ) ;
name+= "_DOWNSTREAM" ;
name+= NPL::itoa( m_EventData->GetFrontDownstreamEStripNbr(i) ) ;
@@ -707,7 +707,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){
}
///////////////////////////////////////////////////////////////////////////////
double TTiaraBarrelPhysics::Cal_Back_E(const int i){
- static string name = "TIARABARREL/B" ;
+ static string name; name = "TIARABARREL/B" ;
name+= NPL::itoa( m_EventData->GetBackEDetectorNbr(i) ) ;
name+= "_BACK_E";
return CalibrationManager::getInstance()->ApplyCalibration(name, m_EventData->GetBackEEnergy(i));
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index b13512a32..097940197 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -711,7 +711,7 @@ namespace TiaraHyball_LOCAL{
// DSSD
// Ring
double fStrip_Ring_E(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetRingEDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingEStripNbr(i) ) ;
@@ -720,7 +720,7 @@ name+= "_E";
fStrip_Ring_Matchstick(m_EventData,i) );
}
double fStrip_Ring_Matchstick(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetRingEDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingEStripNbr(i) ) ;
@@ -730,7 +730,7 @@ name+= "_MATCHSTICK";
}
double fStrip_Ring_T(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetRingTDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingTStripNbr(i) ) ;
@@ -741,7 +741,7 @@ name+="_T";
// Sector
double fStrip_Sector_E(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetSectorEDetectorNbr(i) ) ;
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorEStripNbr(i) ) ;
@@ -751,7 +751,7 @@ name+="_E";
}
double fStrip_Sector_Matchstick(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetSectorEDetectorNbr(i) ) ;
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorEStripNbr(i) ) ;
@@ -761,7 +761,7 @@ name+="_MATCHSTICK";
}
double fStrip_Sector_T(const TTiaraHyballData* m_EventData , const int i){
- static string name = "TIARAHYBALL/D" ;
+ static string name; name = "TIARAHYBALL/D" ;
name+= NPL::itoa( m_EventData->GetSectorTDetectorNbr(i) );
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorTStripNbr(i) );
--
GitLab