Merge pull request #13732 from Martin-Grunewald/FixMuonMigration81X

Need unqiue cfi file names in fillDescription to avoid overwriting in HLT (81X)
cms-sw · Mar 16, 2016 · 3252410 · 3252410
2 parents 42fb0e1 + 44581c4
commit 3252410
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/Calibration/HcalIsolatedTrackReco/python/isolPixelTrackProdL1T_cfi.py b/Calibration/HcalIsolatedTrackReco/python/isolPixelTrackProdL1T_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+#IsolatedPixelTrackCandidateProducer default configuration
+isolPixelTrackProd    = cms.EDProducer("IsolatedPixelTrackCandidateL1TProducer",
+    L1eTauJetsSource           = cms.InputTag( 'hltCaloStage2Digis','Tau' ),
+    tauAssociationCone         = cms.double( 0.0 ),
+    tauUnbiasCone              = cms.double( 1.2 ),
+    PixelTracksSources         = cms.VInputTag( "hltPixelTracks" ),
+    ExtrapolationConeSize      = cms.double(1.0),
+    PixelIsolationConeSizeAtEC = cms.double(40),
+    L1GTSeedLabel              = cms.InputTag( "hltL1sIsoTrack" ),
+    MaxVtxDXYSeed              = cms.double( 101.0 ),
+    MaxVtxDXYIsol              = cms.double( 101.0 ),
+    VertexLabel                = cms.InputTag( "hltPixelVertices" ),
+    MagFieldRecordName         = cms.string("VolumeBasedMagneticField"),
+    minPTrack                  = cms.double( 5.0 ),
+    maxPTrackForIsolation      = cms.double( 3.0 ),
+    EBEtaBoundary              = cms.double(1.479)
+)
+
+
diff --git a/HLTrigger/Muon/src/HLTMuonDimuonL2FromL1TFilter.cc b/HLTrigger/Muon/src/HLTMuonDimuonL2FromL1TFilter.cc
@@ -123,7 +123,7 @@ HLTMuonDimuonL2FromL1TFilter::fillDescriptions(edm::ConfigurationDescriptions& d
   desc.add<double>("MinPtBalance",-1.0);
   desc.add<double>("MaxPtBalance",999999.0);
   desc.add<double>("NSigmaPt",0.0);
-  descriptions.add("hltMuonDimuonL2Filter", desc);
+  descriptions.add("hltMuonDimuonL2FromL1TFilter", desc);
 }
 
 // ------------ method called to produce the data  ------------

diff --git a/HLTrigger/Muon/src/HLTMuonL1TtoL3TkPreFilter.cc b/HLTrigger/Muon/src/HLTMuonL1TtoL3TkPreFilter.cc
@@ -85,7 +85,7 @@ HLTMuonL1TtoL3TkPreFilter::fillDescriptions(edm::ConfigurationDescriptions& desc
   desc.add<double>("MaxDz",9999.0);
   desc.add<double>("MinPt",0.0);
   desc.add<double>("NSigmaPt",9999.0);
-  descriptions.add("hltMuonL1toL3TkPreFilter", desc);
+  descriptions.add("hltMuonL1TtoL3TkPreFilter", desc);
 }
 
 // ------------ method called to produce the data  ------------

diff --git a/HLTrigger/Muon/src/HLTMuonL2FromL1TPreFilter.cc b/HLTrigger/Muon/src/HLTMuonL2FromL1TPreFilter.cc
@@ -127,7 +127,7 @@ HLTMuonL2FromL1TPreFilter::fillDescriptions(edm::ConfigurationDescriptions& desc
   desc.add<double>("MinDxySig",-1.0);
   desc.add<double>("MinPt",0.0);
   desc.add<double>("NSigmaPt",0.0);
-  descriptions.add("hltMuonL2PreFilter",desc);
+  descriptions.add("hltMuonL2FromL1TPreFilter",desc);
 }
 
 //

diff --git a/HLTrigger/Muon/src/HLTMuonTrkL1TFilter.cc b/HLTrigger/Muon/src/HLTMuonTrkL1TFilter.cc
@@ -61,7 +61,7 @@ HLTMuonTrkL1TFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptio
   desc.add<double>("minPt",24);
   desc.add<unsigned int>("minN",1);
   desc.add<double>("maxAbsEta",1e99);
-  descriptions.add("hltMuonTrkFilter",desc);
+  descriptions.add("hltMuonTrkL1TFilter",desc);
 }
 
 bool

diff --git a/HLTrigger/Muon/src/HLTScoutingMuonProducer.cc b/HLTrigger/Muon/src/HLTScoutingMuonProducer.cc
@@ -130,5 +130,5 @@ void HLTScoutingMuonProducer::fillDescriptions(edm::ConfigurationDescriptions& d
                                 "hltMuonTkRelIsolationCut0p09Map:combinedRelativeIsoDeposits"));
     desc.add<double>("muonPtCut", 4.0);
     desc.add<double>("muonEtaCut", 2.4);
-    descriptions.add("scoutingMuonProducer", desc);
+    descriptions.add("hltScoutingMuonProducer", desc);
 }
diff --git a/HLTrigger/special/src/HLTPixelIsolTrackFilter.cc b/HLTrigger/special/src/HLTPixelIsolTrackFilter.cc
@@ -43,7 +43,7 @@ HLTPixelIsolTrackFilter::fillDescriptions(edm::ConfigurationDescriptions& descri
   desc.add<bool>("filterTrackEnergy",true);
   desc.add<int>("NMaxTrackCandidates",10);
   desc.add<bool>("DropMultiL2Event",false);
-  descriptions.add("isolPixelTrackFilter",desc);
+  descriptions.add("hltPixelIsolTrackFilter",desc);
 }
 
 bool HLTPixelIsolTrackFilter::hltFilter(edm::Event& iEvent, const edm::EventSetup& iSetup, trigger::TriggerFilterObjectWithRefs & filterproduct) const {

diff --git a/HLTrigger/special/src/HLTPixelIsolTrackL1TFilter.cc b/HLTrigger/special/src/HLTPixelIsolTrackL1TFilter.cc
@@ -43,7 +43,7 @@ HLTPixelIsolTrackL1TFilter::fillDescriptions(edm::ConfigurationDescriptions& des
   desc.add<bool>("filterTrackEnergy",true);
   desc.add<int>("NMaxTrackCandidates",10);
   desc.add<bool>("DropMultiL2Event",false);
-  descriptions.add("isolPixelTrackFilter",desc);
+  descriptions.add("hltPixelIsolTrackL1TFilter",desc);
 }
 
 bool HLTPixelIsolTrackL1TFilter::hltFilter(edm::Event& iEvent, const edm::EventSetup& iSetup, trigger::TriggerFilterObjectWithRefs & filterproduct) const {