Merge pull request #10911 from makortel/recoTrackRefSelectorStream

Transform RecoTrackRefSelector to stream::EDProducer
cms-sw · Sep 4, 2015 · 0d9bb37 · 0d9bb37
2 parents a49b412 + 53569f8
commit 0d9bb37
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CommonTools/RecoAlgos/plugins/RecoTrackRefSelector.cc b/CommonTools/RecoAlgos/plugins/RecoTrackRefSelector.cc
@@ -10,12 +10,12 @@
  *
  */
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelectorStreamProducer.h"
 //#include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 #include "CommonTools/RecoAlgos/interface/RecoTrackRefSelector.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 namespace reco {
-  typedef ObjectSelectorStream<RecoTrackRefSelector,reco::TrackRefVector> RecoTrackRefSelector;
+  typedef ObjectSelectorStreamProducer<RecoTrackRefSelector,reco::TrackRefVector> RecoTrackRefSelector;
   DEFINE_FWK_MODULE(RecoTrackRefSelector);
 }
diff --git a/CommonTools/RecoAlgos/python/recoTrackRefSelector_cfi.py b/CommonTools/RecoAlgos/python/recoTrackRefSelector_cfi.py
@@ -2,7 +2,7 @@
 
 from CommonTools.RecoAlgos.recoTrackSelectorPSet_cfi import recoTrackSelectorPSet as _recoTrackSelectorPSet
 
-recoTrackRefSelector = cms.EDFilter("RecoTrackRefSelector",
+recoTrackRefSelector = cms.EDProducer("RecoTrackRefSelector",
     _recoTrackSelectorPSet
 )
 

diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -128,13 +128,21 @@ def customiseFor10927(process):
             process.DTObjectMapESProducer = cms.ESProducer( 'DTObjectMapESProducer' )
     return process
 
+# change RecoTrackRefSelector to stream::EDProducer (PR #10911)
+def customiseFor10911(process):
+    if hasattr(process,'hltBSoftMuonMu5L3'):
+        # Switch module type from EDFilter to EDProducer
+        process.hltBSoftMuonMu5L3 = cms.EDProducer("RecoTrackRefSelector", **process.hltBSoftMuonMu5L3.parameters_())
+    return process
+
 # CMSSW version specific customizations
 def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False):
     import os
     cmsswVersion = os.environ['CMSSW_VERSION']
 
     if cmsswVersion >= "CMSSW_7_6":
         process = customiseFor10418(process)
+        process = customiseFor10911(process)
     if cmsswVersion >= "CMSSW_7_5":
         process = customiseFor10927(process)
         process = customiseFor9232(process)