Use static_assert for TrajectoryStopReason as well

cms-sw · Sep 8, 2017 · 48d452e · 48d452e
1 parent dab8732
commit 48d452e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc
@@ -636,13 +636,6 @@ void TrackAnalyzer::bookHistosForHitProperties(DQMStore::IBooker & ibooker) {
       }
 
       size_t StopReasonNameSize = sizeof(StopReasonName::StopReasonName)/sizeof(std::string);
-      if(StopReasonNameSize != static_cast<unsigned int>(StopReason::SIZE)) {
-        throw cms::Exception("Assert") << "StopReason::SIZE is " << static_cast<unsigned int>(StopReason::SIZE)
-                                       << " but StopReasonName's only for "
-                                       << StopReasonNameSize
-                                       << ". Please update DataFormats/TrackReco/interface/TrajectoryStopReasons.h.";
-      }
-
       histname = "stoppingSource_";
       stoppingSource = ibooker.book1D(histname+CategoryName, histname+CategoryName, StopReasonNameSize, 0., double(StopReasonNameSize));
       stoppingSource->setAxisTitle("stopping reason",1);

diff --git a/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc b/DQM/TrackingMonitor/src/TrackBuildingAnalyzer.cc
@@ -279,13 +279,6 @@ void TrackBuildingAnalyzer::initHisto(DQMStore::IBooker & ibooker, const edm::Pa
   if (doAllTCPlots || doStopSource) {
     // DataFormats/TrackReco/interface/TrajectoryStopReasons.h
     size_t StopReasonNameSize = sizeof(StopReasonName::StopReasonName)/sizeof(std::string);
-    if(StopReasonNameSize != static_cast<unsigned int>(StopReason::SIZE)) {
-      throw cms::Exception("Assert") << "StopReason::SIZE is " << static_cast<unsigned int>(StopReason::SIZE)
-				     << " but StopReasonName's only for "
-				     << StopReasonNameSize
-				     << ". Please update DataFormats/TrackReco/interface/TrajectoryStopReasons.h.";
-    }
-
 
     histname = "StoppingSource_"+seedProducer.label() + "_";
     stoppingSource = ibooker.book1D(histname+CatagoryName,

diff --git a/DataFormats/TrackReco/src/TrajectoryStopReasons.cc b/DataFormats/TrackReco/src/TrajectoryStopReasons.cc
@@ -0,0 +1,3 @@
+#include "DataFormats/TrackReco/interface/TrajectoryStopReasons.h"
+
+static_assert(sizeof(StopReasonName::StopReasonName)/sizeof(std::string) == static_cast<unsigned int>(StopReason::SIZE), "StopReason enum and StopReasonName are out of synch");