Merge pull request #37 from geonmo/master

change namespace "helpers" to "SimMuL1_helpers" and remove legacy.
gem-sw · Aug 30, 2013 · 9dcda3c · 9dcda3c
2 parents 0aa94d2 + 0679aa4
commit 9dcda3c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/SimMuL1/interface/Helpers.h b/SimMuL1/interface/Helpers.h
@@ -1,7 +1,7 @@
 #ifndef SimMuL1_Helpers_h
 #define SimMuL1_Helpers_h
 
-namespace helpers
+namespace SimMuL1_helpers
 {
 bool
 isME1bEtaRegion(float eta, float eta_min = 1.64, float eta_max = 2.14)

diff --git a/SimMuL1/plugins/GEMCSCTriggerRate.cc b/SimMuL1/plugins/GEMCSCTriggerRate.cc
@@ -29,11 +29,12 @@
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
 #include "GEMCode/GEMValidation/src/SimTrackMatchManager.h"
-
+#include "GEMCode/SimMuL1/interface/Helpers.h"
 using namespace std;
 using namespace reco;
 using namespace edm;
 
+using namespace SimMuL1_helpers;
 namespace 
 {
   const Double_t ETA_BIN = 0.0125 *2;

diff --git a/SimMuL1/plugins/GEMCSCTriggerRate.h b/SimMuL1/plugins/GEMCSCTriggerRate.h
@@ -201,8 +201,8 @@ class GEMCSCTriggerRate : public edm::EDFilter
   // calculates the weight of the event to reproduce a min bias
   //spectrum, from G. Wrochna's note CMSS 1997/096
 
-  bool isME42EtaRegion(float eta);
-  bool isME42RPCEtaRegion(float eta);
+  //bool isME42EtaRegion(float eta);
+  //bool isME42RPCEtaRegion(float eta);
 
   static void setupTFModeHisto(TH1D* h);