Merge pull request #4902 from jhgoh/RPCMuonFix

RPCMuon bugfix in MuonIdProducer
cms-sw · Aug 21, 2014 · 977d587 · 977d587
2 parents 517a798 + 4060bf0
commit 977d587
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc
@@ -186,7 +186,7 @@ void MuonEnergyDepositAnalyzer::analyze(const edm::Event& iEvent, const edm::Eve
 
     if(recoMu->isGlobalMuon())
       TransTrack = theB->build(recoMu->globalTrack());
-    if(recoMu->isTrackerMuon() && !(recoMu->isGlobalMuon()))
+    if((recoMu->isTrackerMuon() || recoMu->isRPCMuon()) && !(recoMu->isGlobalMuon()))
       TransTrack = theB->build(recoMu->innerTrack());
     if(recoMu->isStandAloneMuon() && !(recoMu->isGlobalMuon()))
       TransTrack = theB->build(recoMu->outerTrack());

diff --git a/RecoMET/METAlgorithms/src/MuonMETAlgo.cc b/RecoMET/METAlgorithms/src/MuonMETAlgo.cc
@@ -128,7 +128,7 @@ void MuonMETAlgo::GetMuDepDeltas(const reco::Muon* inputMuon,
   TrackRef mu_track;
   if(inputMuon->isGlobalMuon()) {
     mu_track = inputMuon->globalTrack();
-  } else if(inputMuon->isTrackerMuon()) {
+  } else if(inputMuon->isTrackerMuon() || inputMuon->isRPCMuon()) {
     mu_track = inputMuon->innerTrack();
   } else 
     mu_track = inputMuon->outerTrack();
@@ -174,7 +174,7 @@ void MuonMETAlgo::GetMuDepDeltas(const reco::Muon* inputMuon,
       mup4 = LorentzVector(inputMuon->globalTrack()->px(), inputMuon->globalTrack()->py(),
 			   inputMuon->globalTrack()->pz(), inputMuon->globalTrack()->p());
     }	
-  } else if(inputMuon->isTrackerMuon()) {
+  } else if(inputMuon->isTrackerMuon() || inputMuon->isRPCMuon()) {
     mup4 = LorentzVector(inputMuon->innerTrack()->px(), inputMuon->innerTrack()->py(),
 			 inputMuon->innerTrack()->pz(), inputMuon->innerTrack()->p());
   } else 

diff --git a/RecoMET/METProducers/src/MuonMETValueMapProducer.cc b/RecoMET/METProducers/src/MuonMETValueMapProducer.cc
@@ -124,7 +124,7 @@ void MuonMETValueMapProducer::determine_deltax_deltay(double& deltax, double& de
 {
   reco::TrackRef mu_track;
   if(muon.isGlobalMuon()) mu_track = muon.globalTrack();
-  else if(muon.isTrackerMuon()) mu_track = muon.innerTrack();
+  else if(muon.isTrackerMuon()||muon.isRPCMuon()) mu_track = muon.innerTrack();
   else mu_track = muon.outerTrack();
 
   TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup,
@@ -155,6 +155,7 @@ bool MuonMETValueMapProducer::should_type_MuonCandidateValuesUsed(const reco::Mu
   if(!muon.isTrackerMuon() && isAlsoTkMu_) return false;
   reco::TrackRef globTk = muon.globalTrack();
   reco::TrackRef siTk   = muon.innerTrack();
+
   if(muon.pt() < minPt_ || fabs(muon.eta()) > maxEta_) return false;
   if(globTk->chi2()/globTk->ndof() > maxNormChi2_) return false;
   if(fabs(globTk->dxy(beamSpotPosition)) > fabs(maxd0_)) return false;

diff --git a/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc b/RecoMuon/MuonIdentification/plugins/MuonIdProducer.cc
@@ -587,7 +587,6 @@ void MuonIdProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 	     {
 		// make muon
 	       reco::Muon trackerMuon( makeMuon(iEvent, iSetup, reco::TrackRef( innerTrackCollectionHandle_, i ), reco::Muon::InnerTrack ) );
-		trackerMuon.setType( reco::Muon::TrackerMuon | reco::Muon::RPCMuon );
 		fillMuonId(iEvent, iSetup, trackerMuon, *direction);
 
 		if ( debugWithTruthMatching_ ) {
@@ -602,6 +601,8 @@ void MuonIdProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 		bool newMuon = true;
 		bool goodTrackerMuon = isGoodTrackerMuon( trackerMuon );
 		bool goodRPCMuon = isGoodRPCMuon( trackerMuon );
+		if ( goodTrackerMuon ) trackerMuon.setType( trackerMuon.type() | reco::Muon::TrackerMuon );
+		if ( goodRPCMuon ) trackerMuon.setType( trackerMuon.type() | reco::Muon::RPCMuon );
 		for ( reco::MuonCollection::iterator muon = outputMuons->begin();
 		      muon !=  outputMuons->end(); ++muon )
 		  {
@@ -620,7 +621,7 @@ void MuonIdProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 		       }
 		  }
 		if ( newMuon ) {
-		   if ( goodTrackerMuon ){
+		   if ( goodTrackerMuon || goodRPCMuon ){
 		      outputMuons->push_back( trackerMuon );
 		   } else {
 		      LogTrace("MuonIdentification") << "track failed minimal number of muon matches requirement";

diff --git a/RecoMuon/MuonIdentification/src/MuonCosmicCompatibilityFiller.cc b/RecoMuon/MuonIdentification/src/MuonCosmicCompatibilityFiller.cc
@@ -229,7 +229,7 @@ MuonCosmicCompatibilityFiller::backToBack2LegCosmic(const edm::Event& iEvent, co
   reco::TrackRef track;
   if ( muon.isGlobalMuon()  )            track = muon.innerTrack();
   else if ( muon.isTrackerMuon() )       track = muon.track();
-  else if ( muon.isStandAloneMuon() )    return false;
+  else if ( muon.isStandAloneMuon() || muon.isRPCMuon() )    return false;
 
   for (unsigned int iColl = 0; iColl<trackTokens_.size(); ++iColl){
     edm::Handle<reco::TrackCollection> trackHandle;
@@ -405,7 +405,7 @@ MuonCosmicCompatibilityFiller::pvMatches(const edm::Event& iEvent, const reco::M
 
   reco::TrackRef track;
   if ( muon.isGlobalMuon() )          track = muon.innerTrack();
-  else if ( muon.isTrackerMuon() )    track = muon.track();
+  else if ( muon.isTrackerMuon() || muon.isRPCMuon() )    track = muon.track();
   else if ( muon.isStandAloneMuon())  track = muon.standAloneMuon();
 
   bool multipleMu = false;