Making modifications requested by Thomas

delaere · Dec 16, 2013 · 141561b · 141561b
1 parent 98714d0
commit 141561b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc b/RecoMuon/GlobalMuonProducer/src/GlobalMuonProducer.cc
@@ -44,9 +44,9 @@ GlobalMuonProducer::GlobalMuonProducer(const ParameterSet& parameterSet) {
   // STA Muon Collection Label
   theSTACollectionLabel = parameterSet.getParameter<InputTag>("MuonCollectionLabel");
   staMuonsToken=consumes<reco::TrackCollection>(parameterSet.getParameter<InputTag>("MuonCollectionLabel"));
-  staMuonsTrajToken=consumes<std::vector<Trajectory> >(parameterSet.getParameter<InputTag>("MuonCollectionLabel")); 
-  staAssoMapToken=consumes<TrajTrackAssociationCollection>(parameterSet.getParameter<InputTag>("MuonCollectionLabel")); 
-  updatedStaAssoMapToken=consumes<reco::TrackToTrackMap>(parameterSet.getParameter<InputTag>("MuonCollectionLabel"));
+  staMuonsTrajToken=consumes<std::vector<Trajectory> >(parameterSet.getParameter<InputTag>("MuonCollectionLabel").label()); 
+  staAssoMapToken=consumes<TrajTrackAssociationCollection>(parameterSet.getParameter<InputTag>("MuonCollectionLabel").label()); 
+  updatedStaAssoMapToken=consumes<reco::TrackToTrackMap>(parameterSet.getParameter<InputTag>("MuonCollectionLabel").label());
 
 
 

diff --git a/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc b/RecoMuon/GlobalMuonProducer/src/TevMuonProducer.cc
@@ -38,7 +38,7 @@ TevMuonProducer::TevMuonProducer(const ParameterSet& parameterSet) {
   // GLB Muon Collection Label
   theGLBCollectionLabel = parameterSet.getParameter<InputTag>("MuonCollectionLabel");
   glbMuonsToken=consumes<reco::TrackCollection>(theGLBCollectionLabel);
-  glbMuonsTrajToken=consumes<std::vector<Trajectory> >(theGLBCollectionLabel);
+  glbMuonsTrajToken=consumes<std::vector<Trajectory> >(theGLBCollectionLabel.label());
 
   // service parameters
   ParameterSet serviceParameters = parameterSet.getParameter<ParameterSet>("ServiceParameters");

diff --git a/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc b/RecoMuon/MuonIdentification/src/MuonIdTruthInfo.cc
@@ -21,7 +21,6 @@ void MuonIdTruthInfo::truthMatchMuon(const edm::Event& iEvent,
 				     const edm::EventSetup& iSetup,
 				     reco::Muon& aMuon)
 {
-  printf("DONT FORGET TO CALL REGISTERCONSUMES()\n");
    // get a list of simulated track and find a track with the best match to
    // the muon.track(). Use its id and chamber id to localize hits
    // If a hit has non-zero local z coordinate, it's position wrt