Merge pull request #22537 from bsunanda/Run2-hgx102

Run2-hgx102 Transfer the hash for DetId in DetId.h
cms-sw · Mar 15, 2018 · beb4bef · beb4bef
2 parents f0b49cd + bec824b
commit beb4bef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git a/DataFormats/DetId/interface/DetId.h b/DataFormats/DetId/interface/DetId.h
@@ -69,5 +69,14 @@ inline bool operator<(DetId id, uint32_t i) { return id()<i; }
 
 //std::ostream& operator<<(std::ostream& s, const DetId& id);
 
+namespace std {
+  template<> struct hash<DetId> {
+    typedef DetId argument_type;
+    typedef std::size_t result_type;
+    result_type operator()(argument_type const& id) const noexcept {
+      return std::hash<uint32_t>()(id.rawId());            
+    }
+  };
+}
 
 #endif
diff --git a/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc
@@ -44,15 +44,6 @@
 
 #include "RecoEgamma/EgammaTools/interface/ConversionTools.h"
 
-namespace std {
-  template<> 
-  struct hash<DetId> {
-    size_t operator()(const DetId& id) const {
-      return std::hash<uint32_t>()(id.rawId());
-    }
-  };  
-}
-
 ReducedEGProducer::ReducedEGProducer(const edm::ParameterSet& config) :
   photonT_(consumes<reco::PhotonCollection>(config.getParameter<edm::InputTag>("photons"))),
   ootPhotonT_(consumes<reco::PhotonCollection>(config.getParameter<edm::InputTag>("ootPhotons"))),

diff --git a/SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerTypes.h b/SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerTypes.h
@@ -7,15 +7,6 @@
 
 #include "DataFormats/DetId/interface/DetId.h"
 
-namespace std {
-  template<>
-  struct hash<DetId> {
-    std::size_t operator()(const DetId& id) const {      
-      return std::hash<uint32_t>()(id.rawId());
-    }
-  };
-}
-
 namespace hgc_digi {
 
   //15 time samples: 9 pre-samples, 1 in-time, 5 post-samples

diff --git a/SimFastTiming/FastTimingCommon/interface/FTLDigitizer.h b/SimFastTiming/FastTimingCommon/interface/FTLDigitizer.h
@@ -24,16 +24,6 @@
 #include <tuple>
 
 
-
-namespace std {
-  template<>
-  struct hash<DetId> {
-    std::size_t operator()(const DetId& detid) const {
-      return hash<uint32_t>()(detid.rawId());
-    }
-  };
-}
-
 namespace ftl_digitizer {
 
   namespace FTLHelpers {