Merge pull request #39441 from slowmoyang/ge21-me21-seg-reco__from-CM…

…SSW_12_6_0_pre2

GE21-ME21 segment reconstruction

Configuration/ProcessModifiers/python/gemcscSegmentsTesting_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier enable runnig of GEMCSCSegmentProducer in relval workflows
+gemcscSegmentsTesting = cms.Modifier()

DQM/GEM/test/testGEMEffByGEMCSCSegment.py

@@ -40,7 +40,7 @@
 process.load('RecoLocalMuon.GEMRecHit.gemRecHits_cfi')
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
 process.load("Configuration.StandardSequences.Reconstruction_cff")
-process.load('RecoLocalMuon.GEMCSCSegment.gemcscSegments_cfi')
+process.load('RecoLocalMuon.GEMCSCSegment.gemcscSegments_cff')
 process.load("DQM.GEM.gemEffByGEMCSCSegment_cff")
 
 process.muonGEMDigis.useDBEMap = True

DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py

@@ -29,7 +29,7 @@
 
 process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
 process.load("Configuration.StandardSequences.Reconstruction_cff")
-process.load('RecoLocalMuon.GEMCSCSegment.gemcscSegments_cfi')
+process.load('RecoLocalMuon.GEMCSCSegment.gemcscSegments_cff')
 process.load("DQM.GEM.GEMDQM_cff")
 process.load("DQM.GEM.gemEffByGEMCSCSegment_cff")
 

RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentBuilder.cc

@@ -32,6 +32,7 @@ GEMCSCSegmentBuilder::GEMCSCSegmentBuilder(const edm::ParameterSet& ps)
     :  // Ask factory to build this algorithm, giving it appropriate ParameterSet
       algo{GEMCSCSegmentBuilderPluginFactory::get()->create(ps.getParameter<std::string>("algo_name"),
                                                             ps.getParameter<edm::ParameterSet>("algo_psets"))},
+      enable_me21_ge21_(ps.getParameter<bool>("enableME21GE21")),
       gemgeom_{nullptr},
       cscgeom_{nullptr} {
   edm::LogVerbatim("GEMCSCSegmentBuilder")
@@ -120,14 +121,13 @@ void GEMCSCSegmentBuilder::build(const GEMRecHitCollection* recHits,
     CSCDetId CSCId = segmIt->cscDetId();
 
     // Search for Matches between GEM Roll and CSC Chamber
-    //   - only matches between ME1/1(a&b) and GE1/1
-    //   - notation: CSC ring 1 = ME1/1b; CSC ring 4 = ME1/1a
 
-    // Case A :: ME1/1 Segments can have GEM Rechits associated to them
+    // Case A :: ME1/1 and ME2/1 Segments can have GE1/1 and GE2/1 Rechits associated to them, respectively
     // ================================================================
-    if (CSCId.station() == 1 && (CSCId.ring() == 1 || CSCId.ring() == 4)) {
+    if (CSCId.isME11() or (enable_me21_ge21_ and CSCId.isME21())) {
       edm::LogVerbatim("GEMCSCSegmentBuilder")
-          << "[GEMCSCSegmentBuilder :: build] Found ME1/1 Segment in " << CSCId.rawId() << " = " << CSCId << std::endl;
+          << "[GEMCSCSegmentBuilder :: build] Found " << (CSCId.isME11() ? "ME1/1" : "ME2/1") << " Segment in "
+          << CSCId.rawId() << " = " << CSCId;
 
       // 1) Save the CSC Segment in CSC segment collection
       // -------------------------------------------------
@@ -214,13 +214,13 @@ void GEMCSCSegmentBuilder::build(const GEMRecHitCollection* recHits,
           }
         }  // end Loop over GEM Rolls
       }    // end Loop over GEM RecHits
-    }      // end requirement of CSC segment in ME1/1
+    }      // end requirement of CSC segment in ME1/1 or ME2/1
 
     // Case B :: all other CSC Chambers have no GEM Chamber associated
     // ===============================================================
-    else if (!(CSCId.station() == 1 && (CSCId.ring() == 1 || CSCId.ring() == 4))) {
-      edm::LogVerbatim("GEMCSCSegmentBuilder") << "[GEMCSCSegmentBuilder :: build] Found non-ME1/1 Segment in "
-                                               << CSCId.rawId() << " = " << CSCId << std::endl;
+    else {
+      edm::LogVerbatim("GEMCSCSegmentBuilder")
+          << "[GEMCSCSegmentBuilder :: build] Found a Segment in " << CSCId.rawId() << " = " << CSCId;
 
       // get CSC segment vector associated to this CSCDetId
       // if no vector is associated yet to this CSCDetId, create empty vector
@@ -230,10 +230,6 @@ void GEMCSCSegmentBuilder::build(const GEMRecHitCollection* recHits,
       cscsegmentvector_noGEM.push_back(segmIt->clone());
       cscSegColl_noGEM[CSCId.rawId()] = cscsegmentvector_noGEM;
     }
-
-    else {
-    }  // no other option
-
   }  // end Loop over csc segments
 
   // === Now pass CSC Segments and GEM RecHits to the Segment Algorithm ===

RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentBuilder.h

@@ -80,6 +80,7 @@ class GEMCSCSegmentBuilder {
 
 private:
   std::unique_ptr<GEMCSCSegmentAlgorithm> algo;
+  const bool enable_me21_ge21_;
   const GEMGeometry* gemgeom_;
   const CSCGeometry* cscgeom_;
 };

RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentProducer.cc

@@ -34,6 +34,30 @@ GEMCSCSegmentProducer::~GEMCSCSegmentProducer() {
   delete segmentBuilder_;
 }
 
+void GEMCSCSegmentProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  // gemcscSegments
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("inputObjectsGEM", edm::InputTag("gemRecHits"));
+  desc.add<edm::InputTag>("inputObjectsCSC", edm::InputTag("cscSegments"));
+  desc.add<bool>("enableME21GE21", false);
+  desc.add<std::string>("algo_name", "GEMCSCSegAlgoRR");
+  {
+    edm::ParameterSetDescription psd0;
+    psd0.addUntracked<bool>("GEMCSCDebug", true);
+    psd0.add<unsigned int>("minHitsPerSegment", 2);
+    psd0.add<bool>("preClustering", true);
+    psd0.add<double>("dXclusBoxMax", 1.0);
+    psd0.add<double>("dYclusBoxMax", 5.0);
+    psd0.add<bool>("preClusteringUseChaining", true);
+    psd0.add<double>("dPhiChainBoxMax", 1.0);
+    psd0.add<double>("dThetaChainBoxMax", 0.02);
+    psd0.add<double>("dRChainBoxMax", 0.5);
+    psd0.add<int>("maxRecHitsInCluster", 6);
+    desc.add<edm::ParameterSetDescription>("algo_psets", psd0);
+  }
+  descriptions.add("gemcscSegments", desc);
+}
+
 void GEMCSCSegmentProducer::produce(edm::Event& ev, const edm::EventSetup& setup) {
   LogDebug("GEMCSCSegment") << "start producing segments for " << ++iev << "th event w/ gem and csc data";
 

RecoLocalMuon/GEMCSCSegment/plugins/GEMCSCSegmentProducer.h

@@ -11,9 +11,9 @@
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
@@ -31,6 +31,8 @@ class GEMCSCSegmentProducer : public edm::stream::EDProducer<> {
   explicit GEMCSCSegmentProducer(const edm::ParameterSet&);
   /// Destructor
   ~GEMCSCSegmentProducer() override;
+  /// generate gemcscSegment_cfi
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   /// Produce the GEM-CSCSegment collection
   void produce(edm::Event&, const edm::EventSetup&) override;
 

RecoLocalMuon/GEMCSCSegment/python/gemcscSegments_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoLocalMuon.GEMCSCSegment.gemcscSegments_cfi import gemcscSegments
+
+from Configuration.ProcessModifiers.gemcscSegmentsTesting_cff import gemcscSegmentsTesting
+gemcscSegmentsTesting.toModify(gemcscSegments, enableME21GE21=True)

RecoLocalMuon/GEMCSCSegment/test/BuildFile.xml

@@ -9,13 +9,16 @@
 <use name="Geometry/Records"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/TrackingHit"/>
+<use name="CommonTools/UtilAlgos"/>
 <use name="rootcore"/>
 <use name="rootgraphics"/>
 <use name="Root"/>
 <use name="boost"/>
 <flags EDM_PLUGIN="1"/>
 <library file="TestGEMCSCSegmentAnalyzer.cc" name="testGEMCSCSegmentAnalyzer">
 </library>
+<library file="GEMCSCCoincidenceRateAnalyzer.cc" name="GEMCSCCoincidenceRateAnalyzer">
+</library>
 
 <export>
 </export>