make propagators in PropagateToMuon configurable

cms-sw · Mar 9, 2022 · 23e7243 · 23e7243
1 parent 55a1e58
commit 23e7243
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 9 deletions.
diff --git a/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py b/DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py
@@ -66,6 +66,9 @@
         useSimpleGeometry = cms.bool(True),
         useStation2 = cms.bool(True),
         fallbackToME1 = cms.bool(False),
+        propagatorAlong = cms.ESInputTag("", "SteppingHelixPropagatorAlong"),
+        propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny"),
+        propagatorOpposite = cms.ESInputTag("", "SteppingHelixPropagatorOpposite")	
     ),
 
     verbose   = cms.untracked.bool(False)

diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -155,11 +155,25 @@ def customiseFor37046(process):
             delattr(prod, 'PrescaleCSVFile')
     return process
 
-def customizeForMuonPropagation(process):
-	process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi")
-	process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi")
-	process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi") 
-	return process
+def customizeFor37180(process):
+    for filter in filters_by_type(process, "HLTMuonDimuonL3Filter"):
+        filter.propagatorAlong = cms.ESInputTag("", "hltESPSteppingHelixPropagatorAlong")
+        filter.propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny")
+        filter.propagatorOpposite = cms.ESInputTag("", "hltESPSteppingHelixPropagatorOpposite")
+    for filter in filters_by_type(process, "HLTMuonL3PreFilter"):
+        filter.propagatorAlong = cms.ESInputTag("", "hltESPSteppingHelixPropagatorAlong")
+        filter.propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny")
+        filter.propagatorOpposite = cms.ESInputTag("", "hltESPSteppingHelixPropagatorOpposite")
+    for filter in filters_by_type(process, "HLTMuonTrkFilter"):
+        filter.propagatorAlong = cms.ESInputTag("", "hltESPSteppingHelixPropagatorAlong")
+        filter.propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny")
+        filter.propagatorOpposite = cms.ESInputTag("", "hltESPSteppingHelixPropagatorOpposite")
+    for filter in filters_by_type(process, "HLTMuonTrkL1TFilter"):
+        filter.propagatorAlong = cms.ESInputTag("", "hltESPSteppingHelixPropagatorAlong")
+        filter.propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny")
+        filter.propagatorOpposite = cms.ESInputTag("", "hltESPSteppingHelixPropagatorOpposite")
+
+    return process
 
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):

diff --git a/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc b/HLTrigger/Muon/plugins/HLTMuonDimuonL3Filter.cc
@@ -186,6 +186,9 @@ void HLTMuonDimuonL3Filter::fillDescriptions(edm::ConfigurationDescriptions& des
   desc.add<bool>("useStation2", true);
   desc.add<string>("useTrack", "tracker");
   desc.add<string>("useState", "atVertex");
+  desc.add<edm::ESInputTag>("propagatorAlong",edm::ESInputTag("", "hltESPSteppingHelixPropagatorAlong"));
+  desc.add<edm::ESInputTag>("propagatorAny",edm::ESInputTag("", "SteppingHelixPropagatorAny"));
+  desc.add<edm::ESInputTag>("propagatorOpposite",edm::ESInputTag("", "hltESPSteppingHelixPropagatorOpposite"));
   descriptions.add("hltMuonDimuonL3Filter", desc);
 }
 

diff --git a/HLTrigger/Muon/plugins/HLTMuonL3PreFilter.cc b/HLTrigger/Muon/plugins/HLTMuonL3PreFilter.cc
@@ -118,6 +118,9 @@ void HLTMuonL3PreFilter::fillDescriptions(edm::ConfigurationDescriptions& descri
   desc.add<bool>("useStation2", true);
   desc.add<string>("useTrack", "tracker");
   desc.add<string>("useState", "atVertex");
+  desc.add<edm::ESInputTag>("propagatorAlong",edm::ESInputTag("", "hltESPSteppingHelixPropagatorAlong"));
+  desc.add<edm::ESInputTag>("propagatorAny",edm::ESInputTag("", "SteppingHelixPropagatorAny"));
+  desc.add<edm::ESInputTag>("propagatorOpposite",edm::ESInputTag("", "hltESPSteppingHelixPropagatorOpposite"));
   descriptions.add("hltMuonL3PreFilter", desc);
 }
 

diff --git a/HLTrigger/Muon/plugins/HLTMuonTrkFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrkFilter.cc
@@ -67,6 +67,9 @@ void HLTMuonTrkFilter::fillDescriptions(edm::ConfigurationDescriptions& descript
   desc.add<bool>("useStation2", true);
   desc.add<string>("useTrack", "tracker");
   desc.add<string>("useState", "atVertex");
+  desc.add<edm::ESInputTag>("propagatorAlong",edm::ESInputTag("", "hltESPSteppingHelixPropagatorAlong"));
+  desc.add<edm::ESInputTag>("propagatorAny",edm::ESInputTag("", "SteppingHelixPropagatorAny"));
+  desc.add<edm::ESInputTag>("propagatorOpposite",edm::ESInputTag("", "hltESPSteppingHelixPropagatorOpposite"));
   descriptions.add("hltMuonTrkFilter", desc);
 }
 

diff --git a/HLTrigger/Muon/plugins/HLTMuonTrkL1TFilter.cc b/HLTrigger/Muon/plugins/HLTMuonTrkL1TFilter.cc
@@ -64,7 +64,11 @@ void HLTMuonTrkL1TFilter::fillDescriptions(edm::ConfigurationDescriptions& descr
   desc.add<bool>("useSimpleGeometry", true);
   desc.add<bool>("useStation2", true);
   desc.add<string>("useTrack", "tracker");
-  desc.add<string>("useState", "atVertex");
+  desc.add<string>("useState", "atVertex");  
+  desc.add<edm::ESInputTag>("propagatorAlong",edm::ESInputTag("", "hltESPSteppingHelixPropagatorAlong"));
+  desc.add<edm::ESInputTag>("propagatorAny",edm::ESInputTag("", "SteppingHelixPropagatorAny"));
+  desc.add<edm::ESInputTag>("propagatorOpposite",edm::ESInputTag("", "hltESPSteppingHelixPropagatorOpposite"));
+
   descriptions.add("hltMuonTrkL1TFilter", desc);
 }
 

diff --git a/L1Trigger/L1TNtuples/python/l1MuonRecoTree_cfi.py b/L1Trigger/L1TNtuples/python/l1MuonRecoTree_cfi.py
@@ -38,6 +38,9 @@
         useState = cms.string("atVertex"), # 'innermost' and 'outermost' require the TrackExtra
         useSimpleGeometry = cms.bool(True),
         useStation2 = cms.bool(False),
+        propagatorAlong = cms.ESInputTag("", "SteppingHelixPropagatorAlong"),
+        propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny"),
+        propagatorOpposite = cms.ESInputTag("", "SteppingHelixPropagatorOpposite")
   ),
   # muon track extrapolation to 2nd station
   muProp2nd = cms.PSet(
@@ -46,6 +49,9 @@
         useSimpleGeometry = cms.bool(True),
         useStation2 = cms.bool(True),
         fallbackToME1 = cms.bool(False),
+        propagatorAlong = cms.ESInputTag("", "SteppingHelixPropagatorAlong"),
+        propagatorAny = cms.ESInputTag("", "SteppingHelixPropagatorAny"),
+        propagatorOpposite = cms.ESInputTag("", "SteppingHelixPropagatorOpposite")
   ),
 )
 
diff --git a/MuonAnalysis/MuonAssociators/src/PropagateToMuonInterface.cc b/MuonAnalysis/MuonAssociators/src/PropagateToMuonInterface.cc
@@ -27,9 +27,12 @@ PropagateToMuonInterface::PropagateToMuonInterface(const edm::ParameterSet &iCon
       useMB2InOverlap_(iConfig.existsAs<bool>("useMB2InOverlap") ? iConfig.getParameter<bool>("useMB2InOverlap")
                                                                  : false),
       magfieldToken_(iC.esConsumes<>()),
-      propagatorToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorAlong"))),
-      propagatorAnyToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
-      propagatorOppositeToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorOpposite"))),
+      propagatorToken_(iC.esConsumes<>(iConfig.getParameter<edm::ESInputTag>("propagatorAlong"))),
+      propagatorAnyToken_(iC.esConsumes<>(iConfig.getParameter<edm::ESInputTag>("propagatorAny"))),
+      propagatorOppositeToken_(iC.esConsumes<>(iConfig.getParameter<edm::ESInputTag>("propagatorOpposite"))),
+      //propagatorToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorAlong"))),
+      //propagatorAnyToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorAny"))),
+      //propagatorOppositeToken_(iC.esConsumes<>(edm::ESInputTag("", "SteppingHelixPropagatorOpposite"))),
       muonGeometryToken_(iC.esConsumes<>()) {
   std::string whichTrack = iConfig.getParameter<std::string>("useTrack");
   if (whichTrack == "none") {