Merge pull request #14652 from dildick/from-CMSSW_8_1_0_pre5-improvem…

…ents-to-HLT-ntuplizer Improvements to HLT ntuplizer
cms-sw · May 31, 2016 · dac62cf · dac62cf
2 parents eb2f9f4 + fbbfa1e
commit dac62cf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h b/HLTrigger/HLTanalyzers/interface/HLTAnalyzer.h
@@ -319,6 +319,8 @@ class HLTAnalyzer : public edm::EDAnalyzer {
   edm::InputTag ActivityR9_;
   edm::InputTag ActivityR9ID_;
   edm::InputTag ActivityHoverEH_;
+  edm::InputTag EcalRecHitEB_;
+  edm::InputTag EcalRecHitEE_;
 
   // AlCa OpenHLT input collections  
   /*

diff --git a/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py b/HLTrigger/HLTanalyzers/python/HLTAnalyser_cfi.py
@@ -88,6 +88,8 @@
     ActivityR9                      = cms.InputTag("hltUnseededR9shape"), # spike cleaning
     ActivityR9ID                    = cms.InputTag("hltActivityR9ID"),
     ActivityHcalForHoverE           = cms.InputTag("hltActivityPhotonHcalForHE"),
+    EcalRecHitEB                    = cms.InputTag("hltEcalRegionalEgammaRecHit","EcalRecHitsEB"),
+    EcalRecHitEE                    = cms.InputTag("hltEcalRegionalEgammaRecHit","EcalRecHitsEE"),
 
     ### egamma - standard or startup windows
     IsoElectrons                    = cms.InputTag("hltPixelMatchElectronsL1Seeded"),
@@ -182,6 +184,8 @@
     PrimaryVertices             = cms.InputTag("hltPixelVertices"),
     PrimaryVerticesHLT          = cms.InputTag('pixelVertices'),
 
+    BSProducer                  = cms.InputTag("hltOnlineBeamSpot"),
+
     ### Run parameters
     RunParameters = cms.PSet(
         HistogramFile = cms.untracked.string('openhlt.root'),

diff --git a/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc b/HLTrigger/HLTanalyzers/src/HLTAnalyzer.cc
@@ -33,6 +33,7 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) :
     // variables. Example as follows:
     std::cout << " Beginning HLTAnalyzer Analysis " << std::endl;
 
+    BSProducer_         = conf.getParameter<edm::InputTag> ("BSProducer");
     hltjets_            = conf.getParameter<edm::InputTag> ("hltjets");
     hltcorjets_         = conf.getParameter<edm::InputTag> ("hltcorjets");    
     hltcorL1L2L3jets_   = conf.getParameter<edm::InputTag> ("hltcorL1L2L3jets");    
@@ -162,14 +163,16 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) :
     HFECALClusters_           = conf.getParameter<edm::InputTag> ("HFECALClusters"); 
     HFElectrons_              = conf.getParameter<edm::InputTag> ("HFElectrons"); 
 
-   // Add ECAL Activity
-   ECALActivity_                    = conf.getParameter<edm::InputTag> ("ECALActivity");
-   ActivityEcalIso_                 = conf.getParameter<edm::InputTag> ("ActivityEcalIso");
-   ActivityHcalIso_                 = conf.getParameter<edm::InputTag> ("ActivityHcalIso");
-   ActivityTrackIso_                = conf.getParameter<edm::InputTag> ("ActivityTrackIso");
-   ActivityR9_                    = conf.getParameter<edm::InputTag> ("ActivityR9"); // spike cleaning
-   ActivityR9ID_                    = conf.getParameter<edm::InputTag> ("ActivityR9ID");
-   ActivityHoverEH_           = conf.getParameter<edm::InputTag> ("ActivityHcalForHoverE");
+    // Add ECAL Activity
+    ECALActivity_             = conf.getParameter<edm::InputTag> ("ECALActivity");
+    ActivityEcalIso_          = conf.getParameter<edm::InputTag> ("ActivityEcalIso");
+    ActivityHcalIso_          = conf.getParameter<edm::InputTag> ("ActivityHcalIso");
+    ActivityTrackIso_         = conf.getParameter<edm::InputTag> ("ActivityTrackIso");
+    ActivityR9_               = conf.getParameter<edm::InputTag> ("ActivityR9"); // spike cleaning
+    ActivityR9ID_             = conf.getParameter<edm::InputTag> ("ActivityR9ID");
+    ActivityHoverEH_          = conf.getParameter<edm::InputTag> ("ActivityHcalForHoverE");
+    EcalRecHitEB_             = conf.getParameter<edm::InputTag> ("EcalRecHitEB");
+    EcalRecHitEE_             = conf.getParameter<edm::InputTag> ("EcalRecHitEE");
 
 
    // AlCa OpenHLT input collections  
@@ -207,7 +210,6 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) :
 
     // Define all consumed products  
 
-    BSProducer_ =  edm::InputTag("hltOnlineBeamSpot");
     BSProducerToken_ = consumes<reco::BeamSpot>(BSProducer_);
     hltjetsToken_ = consumes<reco::CaloJetCollection>(hltjets_);
     hltcorjetsToken_ = consumes<reco::CaloJetCollection>(hltcorjets_);
@@ -302,8 +304,8 @@ HLTAnalyzer::HLTAnalyzer(edm::ParameterSet const& conf) :
     ActivityR9Token_ = consumes<reco::RecoEcalCandidateIsolationMap>(ActivityR9_);
     ActivityR9IDToken_ = consumes<reco::RecoEcalCandidateIsolationMap>(ActivityR9ID_);
     ActivityHoverEHToken_ = consumes<reco::RecoEcalCandidateIsolationMap>(ActivityHoverEH_);
-    EcalRecHitEBToken_ = consumes<EcalRecHitCollection>(edm::InputTag("hltEcalRegionalEgammaRecHit:EcalRecHitsEB"));
-    EcalRecHitEEToken_ = consumes<EcalRecHitCollection>(edm::InputTag("hltEcalRegionalEgammaRecHit:EcalRecHitsEE"));
+    EcalRecHitEBToken_ = consumes<EcalRecHitCollection>(EcalRecHitEB_);
+    EcalRecHitEEToken_ = consumes<EcalRecHitCollection>(EcalRecHitEE_);
 
     CandIsoToken_ = consumes<reco::RecoEcalCandidateCollection>(CandIso_);
     CandNonIsoToken_ = consumes<reco::RecoEcalCandidateCollection>(CandNonIso_);

diff --git a/HLTrigger/HLTanalyzers/src/HLTMuon.cc b/HLTrigger/HLTanalyzers/src/HLTMuon.cc
@@ -347,10 +347,11 @@ void HLTMuon::analyze(const edm::Handle<reco::MuonCollection>                 &
   else {nmuon = 0;}
 
   l1extra::L1MuonParticleCollection myMucands1; 
-  myMucands1 = * MuCands1; 
-  //  reco::RecoChargedCandidateCollection myMucands1;
-  std::sort(myMucands1.begin(),myMucands1.end(),PtGreater()); 
-
+  if (MuCands1.isValid()) {
+    myMucands1 = * MuCands1;
+    //  reco::RecoChargedCandidateCollection myMucands1;
+    std::sort(myMucands1.begin(),myMucands1.end(),PtGreater());
+  }
   /////////////////////////////// Open-HLT muons ///////////////////////////////
 
   // Dealing with L2 muons