From ff9bf224a0d40fa96593082f423e7bfb59172b1d Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 12 Jun 2018 15:56:58 -0500 Subject: [PATCH] Changed function local static map to be const Now the map is filled in a thread safe manner. --- .../PFClusterTools/src/PFEnergyCalibration.cc | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc b/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc index 9975bba833023..4ee129b3d3bf9 100644 --- a/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc +++ b/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc @@ -518,22 +518,22 @@ std::ostream& operator<<(std::ostream& out, if ( calib.pfCalibrations ) { - static std::map functType; - - functType["PFfa_BARREL"] = PerformanceResult::PFfa_BARREL; - functType["PFfa_ENDCAP"] = PerformanceResult::PFfa_ENDCAP; - functType["PFfb_BARREL"] = PerformanceResult::PFfb_BARREL; - functType["PFfb_ENDCAP"] = PerformanceResult::PFfb_ENDCAP; - functType["PFfc_BARREL"] = PerformanceResult::PFfc_BARREL; - functType["PFfc_ENDCAP"] = PerformanceResult::PFfc_ENDCAP; - functType["PFfaEta_BARRELH"] = PerformanceResult::PFfaEta_BARRELH; - functType["PFfaEta_ENDCAPH"] = PerformanceResult::PFfaEta_ENDCAPH; - functType["PFfbEta_BARRELH"] = PerformanceResult::PFfbEta_BARRELH; - functType["PFfbEta_ENDCAPH"] = PerformanceResult::PFfbEta_ENDCAPH; - functType["PFfaEta_BARRELEH"] = PerformanceResult::PFfaEta_BARRELEH; - functType["PFfaEta_ENDCAPEH"] = PerformanceResult::PFfaEta_ENDCAPEH; - functType["PFfbEta_BARRELEH"] = PerformanceResult::PFfbEta_BARRELEH; - functType["PFfbEta_ENDCAPEH"] = PerformanceResult::PFfbEta_ENDCAPEH; + static const std::map functType = { + {"PFfa_BARREL", PerformanceResult::PFfa_BARREL}, + {"PFfa_ENDCAP", PerformanceResult::PFfa_ENDCAP}, + {"PFfb_BARREL", PerformanceResult::PFfb_BARREL}, + {"PFfb_ENDCAP", PerformanceResult::PFfb_ENDCAP}, + {"PFfc_BARREL", PerformanceResult::PFfc_BARREL}, + {"PFfc_ENDCAP", PerformanceResult::PFfc_ENDCAP}, + {"PFfaEta_BARRELH", PerformanceResult::PFfaEta_BARRELH}, + {"PFfaEta_ENDCAPH", PerformanceResult::PFfaEta_ENDCAPH}, + {"PFfbEta_BARRELH", PerformanceResult::PFfbEta_BARRELH}, + {"PFfbEta_ENDCAPH", PerformanceResult::PFfbEta_ENDCAPH}, + {"PFfaEta_BARRELEH", PerformanceResult::PFfaEta_BARRELEH}, + {"PFfaEta_ENDCAPEH", PerformanceResult::PFfaEta_ENDCAPEH}, + {"PFfbEta_BARRELEH", PerformanceResult::PFfbEta_BARRELEH}, + {"PFfbEta_ENDCAPEH", PerformanceResult::PFfbEta_ENDCAPEH} + }; for(std::map::const_iterator func = functType.begin();