---

yaml --- r: 132123 b: refs/heads/gem-CR-stand c: bb944d6 h: "refs/heads/CMSSW_6_2_X_SLHC" i: 132121: 7a07a0b 132119: f0d9bff
cms-sw · Oct 31, 2013 · b68c7cc · b68c7cc
1 parent 0a3207c
commit b68c7cc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -2,4 +2,4 @@
 refs/heads/gh-pages: 4bec1f03ca2f14e90d0ca17351c4d42d84ec2c82
 "refs/heads/CMSSW_6_2_X_SLHC": 5893ef29c12b2718b3c1385e821170f91afb5446
 "refs/heads/CMSSW_5_3_X": 90eebdc93fdcd1c69c8670cdb1376c336a5876bd
-refs/heads/gem-CR-stand: 7671daaa7917771157c6e3769daaf7f3497035b9
+refs/heads/gem-CR-stand: bb944d645dccdbaeffd931ec61e4b30a78709054
diff --git a/branches/gem-CR-stand/EventFilter/Cosmics/interface/HLTMuonPointingFilter.h b/branches/gem-CR-stand/EventFilter/Cosmics/interface/HLTMuonPointingFilter.h
@@ -13,10 +13,14 @@
 /* Base Class Headers */
 #include "FWCore/Framework/interface/EDFilter.h"
 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+
 /* Collaborating Class Declarations */
 class Propagator;
 #include "DataFormats/GeometrySurface/interface/Cylinder.h"
 #include "DataFormats/GeometrySurface/interface/Plane.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 /* C++ Headers */
 #include <string>
@@ -39,7 +43,7 @@ class HLTMuonPointingFilter : public edm::EDFilter {
   virtual bool filter(edm::Event &, edm::EventSetup const &) override;
 
 private:
-  const std::string theSTAMuonLabel;        // label of muons
+  const edm::EDGetTokenT<reco::TrackCollection> theSTAMuonToken;
   const std::string thePropagatorName;      // name of propagator to be used
   const double theRadius;                   // radius of cylinder
   const double theMaxZ;                     // half length of cylinder

diff --git a/branches/gem-CR-stand/EventFilter/Cosmics/python/PointingMuon_cfi.py b/branches/gem-CR-stand/EventFilter/Cosmics/python/PointingMuon_cfi.py
@@ -5,7 +5,7 @@
     #ecal
     radius = cms.double(129.0),
     PropagatorName = cms.string('SteppingHelixPropagator'),
-    SALabel = cms.string('cosmicMuons')
+    SALabel = cms.InputTag('cosmicMuons')
 )
 
 
diff --git a/branches/gem-CR-stand/EventFilter/Cosmics/python/hltMuonPointingFilter_cfi.py b/branches/gem-CR-stand/EventFilter/Cosmics/python/hltMuonPointingFilter_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 hltMuonPointingFilter= cms.EDFilter( "HLTMuonPointingFilter",
-    SALabel = cms.string( "hltCosmicMuonBarrelOnly" ),
+    SALabel = cms.InputTag( "hltCosmicMuonBarrelOnly" ),
     PropagatorName = cms.string( "SteppingHelixPropagatorAny" ),
     radius = cms.double( 90.0 ),
     maxZ = cms.double( 280.0 )

diff --git a/branches/gem-CR-stand/EventFilter/Cosmics/src/HLTMuonPointingFilter.cc b/branches/gem-CR-stand/EventFilter/Cosmics/src/HLTMuonPointingFilter.cc
@@ -7,8 +7,8 @@
 #include "EventFilter/Cosmics/interface/HLTMuonPointingFilter.h"
 
 /* Collaborating Class Header */
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -24,8 +24,6 @@
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-
-
 /* C++ Headers */
 using namespace std;
 using namespace edm;
@@ -34,7 +32,7 @@ using namespace edm;
 
 /// Constructor
 HLTMuonPointingFilter::HLTMuonPointingFilter(const edm::ParameterSet& pset) :
-  theSTAMuonLabel(  pset.getParameter<string>("SALabel") ),             // the name of the STA rec hits collection
+  theSTAMuonToken(  consumes<reco::TrackCollection>( pset.getParameter<edm::InputTag>("SALabel") ) ),      // token to read the muons
   thePropagatorName(pset.getParameter<std::string>("PropagatorName") ),
   theRadius(        pset.getParameter<double>("radius") ),              // cyl's radius (cm)
   theMaxZ(          pset.getParameter<double>("maxZ") ),                // cyl's half lenght (cm)
@@ -52,7 +50,7 @@ HLTMuonPointingFilter::HLTMuonPointingFilter(const edm::ParameterSet& pset) :
   thePosPlane = Plane::build(posPos,rot0);
   theNegPlane = Plane::build(posNeg,rot0);
 
-  LogDebug("HLTMuonPointing") << " SALabel : " << theSTAMuonLabel
+  LogDebug("HLTMuonPointing") << " SALabel : " << pset.getParameter<edm::InputTag>("SALabel")
     << " Radius : " << theRadius
     << " Half lenght : " << theMaxZ;
 }
@@ -87,7 +85,7 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
 
   // Get the RecTrack collection from the event
   Handle<reco::TrackCollection> staTracks;
-  event.getByLabel(theSTAMuonLabel, staTracks);
+  event.getByToken(theSTAMuonToken, staTracks);
 
   reco::TrackCollection::const_iterator staTrack;
 
@@ -133,5 +131,7 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
   return accept;
 }
 
+
 // define this as a plug-in
+#include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(HLTMuonPointingFilter);