Merge pull request #23943 from vukasinmilosevic/CMSLITDPG-612v2_10_2_0

CMSLITDPG-612: Removed data v. emul. comparison bug
cms-sw · Aug 17, 2018 · 35817ee · 35817ee
2 parents fcd16ef + ba4a9f2
commit 35817ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc b/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc
@@ -273,10 +273,12 @@ void L1TStage2CaloLayer2::analyze(const edm::Event & e, const edm::EventSetup &
 	  // stage2CaloLayer2ETTHFRank_->Fill(itEtSum->hwPt());
 	} else if(l1t::EtSum::EtSumType::kMissingHt == itEtSum->getType()){    // MHT
 	  stage2CaloLayer2MHTRank_->Fill(itEtSum->hwPt());
-	  stage2CaloLayer2MHTPhi_->Fill(itEtSum->hwPhi());
+          if (itEtSum->hwPt()>0)
+		  stage2CaloLayer2MHTPhi_->Fill(itEtSum->hwPhi());
 	} else if(l1t::EtSum::EtSumType::kMissingHtHF == itEtSum->getType()){  // MHTHF
 	  stage2CaloLayer2MHTHFRank_->Fill(itEtSum->hwPt());
-	  stage2CaloLayer2MHTHFPhi_->Fill(itEtSum->hwPhi());
+	  if (itEtSum->hwPt()>0)
+	          stage2CaloLayer2MHTHFPhi_->Fill(itEtSum->hwPhi());
 	} else if(l1t::EtSum::EtSumType::kMinBiasHFP0 == itEtSum->getType()){  // MBHFP0
 	  stage2CaloLayer2MinBiasHFP0_->Fill(itEtSum->hwPt());
 	} else if(l1t::EtSum::EtSumType::kMinBiasHFM0 == itEtSum->getType()){  // MBHFM0

diff --git a/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc b/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc
@@ -488,17 +488,6 @@ bool L1TdeStage2CaloLayer2::compareJets(
 	  break;
       }
 
-      while (true) {
-
-	jetEtEmul->Fill(dataIt->hwPt());
-	jetEtaEmul->Fill(dataIt->hwEta());
-	jetPhiEmul->Fill(dataIt->hwPhi());
-
-	++dataIt;
-
-	if (dataIt == dataCol->end(currBx))
-	  break;
-      }
     }
 
     problemSummary->Fill(JETCOLLSIZE);