Merge pull request #23519 from fabiocos/fc-101-port23015

Backport of #23015 to 101X, DQMOffline/Muon fixes
cms-sw · Jun 8, 2018 · c8b954d · c8b954d
2 parents 0d77e6b + 272a34f
commit c8b954d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/DQMOffline/Muon/src/EfficiencyAnalyzer.cc b/DQMOffline/Muon/src/EfficiencyAnalyzer.cc
@@ -270,9 +270,11 @@ void EfficiencyAnalyzer::analyze(const edm::Event & iEvent,const edm::EventSetup
       h_allProbes_pt->Fill(muon2->pt());
       h_allProbes_eta->Fill(muon2->eta());
       h_allProbes_phi->Fill(muon2->phi());
-      h_allProbes_inner_pt->Fill(muon2->innerTrack()->innerMomentum().Rho());
-      h_allProbes_inner_eta->Fill(muon2->innerTrack()->innerPosition().Eta());
-      h_allProbes_inner_phi->Fill(muon2->innerTrack()->innerPosition().Phi());
+      if(muon2->innerTrack()->extra().isAvailable()) {
+        h_allProbes_inner_pt->Fill(muon2->innerTrack()->innerMomentum().Rho());
+        h_allProbes_inner_eta->Fill(muon2->innerTrack()->innerPosition().Eta());
+        h_allProbes_inner_phi->Fill(muon2->innerTrack()->innerPosition().Phi());
+      }
 
       if (isMB)               h_allProbes_EB_pt->Fill(muon2->pt());
       if (isME)               h_allProbes_EE_pt->Fill(muon2->pt());
@@ -288,9 +290,11 @@ void EfficiencyAnalyzer::analyze(const edm::Event & iEvent,const edm::EventSetup
       h_passProbes_ID_pt->Fill(muon2->pt());
       h_passProbes_ID_eta->Fill(muon2->eta());
       h_passProbes_ID_phi->Fill(muon2->phi());
-      h_passProbes_ID_inner_pt->Fill(muon2->innerTrack()->innerMomentum().Rho());
-      h_passProbes_ID_inner_eta->Fill(muon2->innerTrack()->innerPosition().Eta());
-      h_passProbes_ID_inner_phi->Fill(muon2->innerTrack()->innerPosition().Phi());
+      if(muon2->innerTrack()->extra().isAvailable()) {
+        h_passProbes_ID_inner_pt->Fill(muon2->innerTrack()->innerMomentum().Rho());
+        h_passProbes_ID_inner_eta->Fill(muon2->innerTrack()->innerPosition().Eta());
+        h_passProbes_ID_inner_phi->Fill(muon2->innerTrack()->innerPosition().Phi());
+      } 
 
       if (isMB) h_passProbes_ID_EB_pt->Fill(muon2->pt());
       if (isME) h_passProbes_ID_EE_pt->Fill(muon2->pt());

diff --git a/DQMOffline/Muon/src/MuonRecoAnalyzer.cc b/DQMOffline/Muon/src/MuonRecoAnalyzer.cc
@@ -451,16 +451,16 @@ void MuonRecoAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup&
       int pvIndex = 0;   
       math::XYZPoint refPoint;
       if(doMVA) {
-         pvIndex = getPv(iTrack.index(), &(*vertex)); //HFDumpUtitilies
-         if (pvIndex > -1) {
-	   refPoint = vertex->at(pvIndex).position();
-         } else {
-	   if (&(*beamSpot)==NULL) {
-	     refPoint = beamSpot->position();
-	   } else {
-	     cout << "ERROR: No beam sport found!" << endl;
-	   }
-         }
+        pvIndex = getPv(iTrack.index(), &(*vertex)); //HFDumpUtitilies
+        if (pvIndex > -1) {
+          refPoint = vertex->at(pvIndex).position();
+        } else {
+          if(beamSpot.isValid()) {
+            refPoint = beamSpot->position();
+          } else {
+            edm::LogInfo("MuonRecoAnalyzer") << "ERROR: No beam sport found!" << endl;
+          }
+        }
       }
       ptSoftMuonMVA->Fill(iTrack->eta());
       deltaRSoftMuonMVA->Fill(getDeltaR(*iTrack,*oTrack));