Merge pull request #92 from jaimeleonh/AM_12_3_X_integration_com

Fixes after comments
cms-sw · Apr 12, 2022 · 2fc5e78 · 2fc5e78
2 parents 1bee309 + b33cb2b
commit 2fc5e78
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 7 deletions.
diff --git a/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc b/L1Trigger/DTTriggerPhase2/plugins/DTTrigPhase2Prod.cc
@@ -105,6 +105,8 @@ class DTTrigPhase2Prod : public edm::stream::EDProducer<> {
   void setChiSquareThreshold(float ch2Thr);
   void setMinimumQuality(MP_QUALITY q);
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   // data-members
   const DTGeometry* dtGeo_;
   edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomH;
@@ -876,4 +878,89 @@ void DTTrigPhase2Prod::processDigi(std::queue<std::pair<DTLayerId, DTDigi>>& inQ
   vec.push_back(&newQueue);
 }
 
+void DTTrigPhase2Prod::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  // dtTriggerPhase2PrimitiveDigis
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("digiTag", edm::InputTag("CalibratedDigis"));
+  desc.add<int>("timeTolerance", 999999);
+  desc.addUntracked<std::string>("geometry_tag", "");
+  desc.addUntracked<int>("trigger_with_sl", 4);
+  desc.addUntracked<double>("tanPhiTh", 1.0);
+  desc.addUntracked<double>("tanPhiThw2max", 1.3);
+  desc.addUntracked<double>("tanPhiThw2min", 0.5);
+  desc.addUntracked<double>("tanPhiThw1max", 0.9);
+  desc.addUntracked<double>("tanPhiThw1min", 0.2);
+  desc.addUntracked<double>("tanPhiThw0", 0.5);
+  desc.addUntracked<double>("chi2Th", 0.01);
+  desc.addUntracked<double>("chi2corTh", 0.1);
+  desc.add<bool>("do_correlation", true);
+  desc.addUntracked<bool>("useBX_correlation", false);
+  desc.addUntracked<double>("dT0_correlate_TP", 25.0);
+  desc.addUntracked<int>("dBX_correlate_TP", 0);
+  desc.addUntracked<double>("dTanPsi_correlate_TP", 99999.0);
+  desc.addUntracked<bool>("clean_chi2_correlation", true);
+  desc.addUntracked<bool>("allow_confirmation", true);
+  desc.addUntracked<double>("minx_match_2digis", 1.0);
+  desc.add<int>("scenario", 0);
+  desc.add<int>("df_extended", 0);
+  desc.addUntracked<bool>("filter_cousins", true);
+  desc.add<int>("max_primitives", 999);
+  desc.add<edm::FileInPath>("ttrig_filename", edm::FileInPath("L1Trigger/DTTriggerPhase2/data/wire_rawId_ttrig.txt"));
+  desc.add<edm::FileInPath>("z_filename", edm::FileInPath("L1Trigger/DTTriggerPhase2/data/wire_rawId_z.txt"));
+  desc.add<edm::FileInPath>("shift_filename", edm::FileInPath("L1Trigger/DTTriggerPhase2/data/wire_rawId_x.txt"));
+  desc.add<edm::FileInPath>("shift_theta_filename", edm::FileInPath("L1Trigger/DTTriggerPhase2/data/theta_shift.txt"));
+  desc.add<edm::FileInPath>("global_coords_filename",
+                            edm::FileInPath("L1Trigger/DTTriggerPhase2/data/global_coord_perp_x_phi0.txt"));
+  desc.add<int>("algo", 0);
+  desc.addUntracked<int>("minHits4Fit", 3);
+  desc.addUntracked<bool>("splitPathPerSL", true);
+  desc.addUntracked<bool>("debug", false);
+  desc.addUntracked<bool>("dump", false);
+  desc.add<edm::InputTag>("rpcRecHits", edm::InputTag("rpcRecHits"));
+  desc.add<bool>("useRPC", false);
+  desc.addUntracked<int>("bx_window", 1);
+  desc.addUntracked<double>("phi_window", 50.0);
+  desc.addUntracked<int>("max_quality_to_overwrite_t0", 9);
+  desc.addUntracked<bool>("storeAllRPCHits", false);
+  desc.add<bool>("activateBuffer", false);
+  desc.add<double>("superCelltimewidth", 400);
+  desc.add<int>("superCellspacewidth", 20);
+  {
+    edm::ParameterSetDescription psd0;
+    psd0.addUntracked<bool>("debug", false);
+    psd0.addUntracked<double>("angletan", 0.3);
+    psd0.addUntracked<double>("anglebinwidth", 1.0);
+    psd0.addUntracked<double>("posbinwidth", 2.1);
+    psd0.addUntracked<double>("maxdeltaAngDeg", 10);
+    psd0.addUntracked<double>("maxdeltaPos", 10);
+    psd0.addUntracked<int>("UpperNumber", 6);
+    psd0.addUntracked<int>("LowerNumber", 4);
+    psd0.addUntracked<double>("MaxDistanceToWire", 0.03);
+    psd0.addUntracked<int>("minNLayerHits", 6);
+    psd0.addUntracked<int>("minSingleSLHitsMax", 3);
+    psd0.addUntracked<int>("minSingleSLHitsMin", 3);
+    psd0.addUntracked<bool>("allowUncorrelatedPatterns", true);
+    psd0.addUntracked<int>("minUncorrelatedHits", 3);
+    desc.add<edm::ParameterSetDescription>("HoughGrouping", psd0);
+  }
+  {
+    edm::ParameterSetDescription psd0;
+    psd0.addUntracked<edm::FileInPath>(
+        "pattern_filename", edm::FileInPath("L1Trigger/DTTriggerPhase2/data/PseudoBayesPatterns_uncorrelated_v0.root"));
+    psd0.addUntracked<bool>("debug", false);
+    psd0.addUntracked<int>("minNLayerHits", 3);
+    psd0.addUntracked<int>("minSingleSLHitsMax", 3);
+    psd0.addUntracked<int>("minSingleSLHitsMin", 0);
+    psd0.addUntracked<int>("allowedVariance", 1);
+    psd0.addUntracked<bool>("allowDuplicates", false);
+    psd0.addUntracked<bool>("setLateralities", true);
+    psd0.addUntracked<bool>("allowUncorrelatedPatterns", true);
+    psd0.addUntracked<int>("minUncorrelatedHits", 3);
+    psd0.addUntracked<bool>("saveOnPlace", true);
+    psd0.addUntracked<int>("maxPathsPerMatch", 256);
+    desc.add<edm::ParameterSetDescription>("PseudoBayesPattern", psd0);
+  }
+  descriptions.add("dtTriggerPhase2PrimitiveDigis", desc);
+}
+
 DEFINE_FWK_MODULE(DTTrigPhase2Prod);
diff --git a/L1Trigger/DTTriggerPhase2/src/MPCleanHitsFilter.cc b/L1Trigger/DTTriggerPhase2/src/MPCleanHitsFilter.cc
@@ -10,16 +10,14 @@ MPCleanHitsFilter::MPCleanHitsFilter(const ParameterSet &pset) : MPFilter(pset)
   // Obtention of parameters
   debug_ = pset.getUntrackedParameter<bool>("debug");
 
-  timeTolerance_ = pset.exists("timeTolerance") ? pset.getParameter<int>("timeTolerance") : 999999;
+  timeTolerance_ = pset.getParameter<int>("timeTolerance");
   // probably something close to the max time drift (400ns/2) is a reasonable value
 }
 void MPCleanHitsFilter::run(edm::Event &iEvent,
                             const edm::EventSetup &iEventSetup,
                             MuonPathPtrs &inMPaths,
                             MuonPathPtrs &outMPaths) {
-  int counter = 0;
   for (const auto &mpath : inMPaths) {
-    ++counter;
     auto mpAux = std::make_shared<MuonPath>(*mpath);
     removeOutliers(mpAux);  // remove hits that are more than 1 bX from the meantime.
 

diff --git a/L1Trigger/DTTriggerPhase2/src/MPQualityEnhancerFilterBayes.cc b/L1Trigger/DTTriggerPhase2/src/MPQualityEnhancerFilterBayes.cc
@@ -233,10 +233,7 @@ void MPQualityEnhancerFilterBayes::filterCousins(std::vector<metaPrimitive> &inM
   // double bestChi2 = 9999;
 
   // At the beginning, we want to keep all mpaths
-  bool keep_this[inMPaths.size()];
-  for (unsigned int k = 0; k < inMPaths.size(); k++) {
-    keep_this[k] = true;
-  }
+  std::vector<bool> keep_this(inMPaths.size(), true);
 
   // If we have just one mpath, save it
   if (inMPaths.size() == 1) {