Merge pull request #31102 from dildick/from-CMSSW_11_2_X_2020-08-06-1…

…100-csc-validation-handles

Migrate GEM/CSC validation to esConsumes

L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc

@@ -16,7 +16,6 @@
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCTriggerPrimitivesBuilder.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
@@ -89,8 +88,7 @@ CSCTriggerPrimitivesProducer::~CSCTriggerPrimitivesProducer() {}
 
 void CSCTriggerPrimitivesProducer::produce(edm::Event& ev, const edm::EventSetup& setup) {
   // get the csc geometry
-  edm::ESHandle<CSCGeometry> h = setup.getHandle(cscToken_);
-  builder_->setCSCGeometry(&*h);
+  builder_->setCSCGeometry(&setup.getData(cscToken_));
 
   // get the gem geometry if it's there
   edm::ESHandle<GEMGeometry> h_gem = setup.getHandle(gemToken_);

L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.h

@@ -40,10 +40,11 @@
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiClusterCollection.h"
 #include "L1Trigger/CSCTriggerPrimitives/interface/CSCTriggerPrimitivesBuilder.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
-#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
 #include "CondFormats/DataRecord/interface/CSCDBL1TPParametersRcd.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 
 // temporarily switch to a "one" module with a CSCTriggerPrimitivesBuilder data member
 class CSCTriggerPrimitivesProducer : public edm::one::EDProducer<> {

RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.cc

@@ -1,7 +1,7 @@
 /*
- *  Routine to calculate CSC efficiencies 
+ *  Routine to calculate CSC efficiencies
  *  Comments about the program logic are denoted by //----
- * 
+ *
  *  Stoyan Stoynev, Northwestern University.
  */
 
@@ -74,8 +74,7 @@ bool CSCEfficiency::filter(edm::Event &event, const edm::EventSetup &eventSetup)
   //---- Get the CSC Geometry :
   if (printalot)
     printf("\tget the CSC geometry.\n");
-  edm::ESHandle<CSCGeometry> cscGeom;
-  eventSetup.get<MuonGeometryRecord>().get(cscGeom);
+  edm::ESHandle<CSCGeometry> cscGeom = eventSetup.getHandle(geomToken_);
 
   // use theTrackingGeometry instead of cscGeom?
   edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
@@ -1685,6 +1684,8 @@ CSCEfficiency::CSCEfficiency(const edm::ParameterSet &pset) {
   tk_token = consumes<edm::View<reco::Track> >(pset.getParameter<edm::InputTag>("tracksTag"));
   sh_token = consumes<edm::PSimHitContainer>(pset.getParameter<edm::InputTag>("simHitTag"));
 
+  geomToken_ = esConsumes<CSCGeometry, MuonGeometryRecord>();
+
   edm::ParameterSet serviceParameters = pset.getParameter<edm::ParameterSet>("ServiceParameters");
   // maybe use the service for getting magnetic field, propagators, etc. ...
   theService = new MuonServiceProxy(serviceParameters, consumesCollector());
@@ -1942,11 +1943,11 @@ CSCEfficiency::CSCEfficiency(const edm::ParameterSet &pset) {
           //
           /*
 	  sprintf(SpecName,"Sim_Rechits_each_Ch%d",iChamber);
-	  ChHist[ec][st][rg][iChamber-FirstCh].SimRechits_each = 
+	  ChHist[ec][st][rg][iChamber-FirstCh].SimRechits_each =
 	    new TH1F(SpecName,"Existing RecHit (Sim), each;layers (1-6);entries",nLayer_bins,Layer_min,Layer_max);
 	  //
 	  sprintf(SpecName,"Sim_Simhits_each_Ch%d",iChamber);
-	  ChHist[ec][st][rg][iChamber-FirstCh].SimSimhits_each = 
+	  ChHist[ec][st][rg][iChamber-FirstCh].SimSimhits_each =
 	    new TH1F(SpecName,"Existing SimHit (Sim), each;layers (1-6);entries",nLayer_bins,Layer_min,Layer_max);
 	  */
           theFile->cd();

RecoLocalMuon/CSCEfficiency/src/CSCEfficiency.h

@@ -3,59 +3,40 @@
 
 /** \class CSCEfficiency
  *
- * Efficiency calculations 
+ * Efficiency calculations
  * Stoyan Stoynev, Northwestern University
  */
 
 // how many of the headers below are not needed?...
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <FWCore/Utilities/interface/InputTag.h>
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
-#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 
 #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include <DataFormats/CSCRecHit/interface/CSCSegmentCollection.h>
-
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-#include <Geometry/CSCGeometry/interface/CSCChamber.h>
-#include <Geometry/CSCGeometry/interface/CSCLayer.h>
-#include <Geometry/CSCGeometry/interface/CSCLayerGeometry.h>
-#include <Geometry/Records/interface/MuonGeometryRecord.h>
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 
-#include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
-#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
-
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
-
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
@@ -68,7 +49,7 @@
 #include "TrackingTools/DetLayers/interface/NavigationDirection.h"
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 
-#include <RecoMuon/TrackingTools/interface/MuonServiceProxy.h>
+#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h"
 
 #include "DataFormats/Common/interface/TriggerResults.h"
@@ -145,6 +126,8 @@ class CSCEfficiency : public edm::EDFilter {
 
   edm::EDGetTokenT<edm::TriggerResults> ht_token;
 
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> geomToken_;
+
   //
   unsigned int printout_NEvents;
   bool isData;

RecoLocalMuon/CSCValidation/src/CSCValidation.cc

@@ -122,6 +122,8 @@ CSCValidation::CSCValidation(const ParameterSet& pset) {
   // setup trees to hold global position data for rechits and segments
   if (writeTreeToFile)
     histos->setupTrees();
+
+  geomToken_ = esConsumes<CSCGeometry, MuonGeometryRecord>();
 }
 
 //////////////////
@@ -195,8 +197,7 @@ void CSCValidation::analyze(const Event& event, const EventSetup& eventSetup) {
   }
 
   // Get the CSC Geometry :
-  edm::ESHandle<CSCGeometry> cscGeom;
-  eventSetup.get<MuonGeometryRecord>().get(cscGeom);
+  edm::ESHandle<CSCGeometry> cscGeom = eventSetup.getHandle(geomToken_);
 
   // Get the RecHits collection :
   edm::Handle<CSCRecHit2DCollection> recHits;

RecoLocalMuon/CSCValidation/src/CSCValidation.h

@@ -19,25 +19,18 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
-#include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
 
 #include "EventFilter/CSCRawToDigi/interface/CSCDCCEventData.h"
@@ -64,9 +57,7 @@
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include <DataFormats/CSCRecHit/interface/CSCRecHit2D.h>
-#include <DataFormats/CSCRecHit/interface/CSCSegmentCollection.h>
+#include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
 #include "DataFormats/MuonDetId/interface/RPCDetId.h"
 
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutRecord.h"
@@ -75,9 +66,6 @@
 #include "FWCore/Common/interface/TriggerNames.h"
 
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-#include "Geometry/CSCGeometry/interface/CSCChamber.h"
-#include "Geometry/CSCGeometry/interface/CSCLayer.h"
-#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
@@ -258,6 +246,7 @@ class CSCValidation : public edm::EDAnalyzer {
   edm::EDGetTokenT<edm::TriggerResults> tr_token;
   edm::EDGetTokenT<reco::TrackCollection> sa_token;
   edm::EDGetTokenT<edm::PSimHitContainer> sh_token;
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> geomToken_;
 
   // module on/off switches
   bool makeOccupancyPlots;

Validation/CSCRecHits/src/CSCRecHitValidation.cc

@@ -1,18 +1,16 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Validation/CSCRecHits/src/CSCRecHitValidation.h"
-#include <DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h>
+#include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
 
 CSCRecHitValidation::CSCRecHitValidation(const edm::ParameterSet &ps)
     : theSimHitMap(ps.getParameter<edm::InputTag>("simHitsTag"), consumesCollector()),
-      theCSCGeometry(nullptr),
       the2DValidation(nullptr),
       theSegmentValidation(nullptr) {
   the2DValidation = new CSCRecHit2DValidation(ps.getParameter<edm::InputTag>("recHitLabel"), consumesCollector());
   theSegmentValidation = new CSCSegmentValidation(ps.getParameter<edm::InputTag>("segmentLabel"), consumesCollector());
+  geomToken_ = esConsumes<CSCGeometry, MuonGeometryRecord>();
 }
 
 CSCRecHitValidation::~CSCRecHitValidation() {
@@ -31,9 +29,7 @@ void CSCRecHitValidation::analyze(const edm::Event &e, const edm::EventSetup &ev
   theSimHitMap.fill(e);
 
   // find the geometry & conditions for this event
-  edm::ESHandle<CSCGeometry> hGeom;
-  eventSetup.get<MuonGeometryRecord>().get(hGeom);
-  theCSCGeometry = &*hGeom;
+  const CSCGeometry *theCSCGeometry = &eventSetup.getData(geomToken_);
 
   the2DValidation->setGeometry(theCSCGeometry);
   the2DValidation->setSimHitMap(&theSimHitMap);

Validation/CSCRecHits/src/CSCRecHitValidation.h

@@ -3,14 +3,15 @@
 
 // user include files
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
-#include <DQMServices/Core/interface/DQMStore.h>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "SimMuon/MCTruth/interface/PSimHitMap.h"
 #include "Validation/CSCRecHits/src/CSCRecHit2DValidation.h"
 #include "Validation/CSCRecHits/src/CSCSegmentValidation.h"
@@ -24,7 +25,7 @@ class CSCRecHitValidation : public DQMEDAnalyzer {
 
 private:
   PSimHitMap theSimHitMap;
-  const CSCGeometry *theCSCGeometry;
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> geomToken_;
 
   CSCRecHit2DValidation *the2DValidation;
   CSCSegmentValidation *theSegmentValidation;

Validation/MuonCSCDigis/interface/CSCBaseValidation.h

@@ -4,7 +4,6 @@
 // user include files
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 

Validation/MuonCSCDigis/interface/CSCStubMatcher.h

@@ -105,7 +105,7 @@ class CSCStubMatcher {
   std::shared_ptr<CSCDigiMatcher> cscDigiMatcher_;
   std::shared_ptr<GEMDigiMatcher> gemDigiMatcher_;
 
-  edm::ESHandle<CSCGeometry> csc_geom_;
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> geomToken_;
   const CSCGeometry* cscGeometry_;
 
   // all stubs (not necessarily matching) in crossed chambers with digis

Validation/MuonCSCDigis/plugins/CSCDigiValidation.cc

@@ -1,7 +1,5 @@
 #include "Validation/MuonCSCDigis/plugins/CSCDigiValidation.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Validation/MuonCSCDigis/interface/CSCALCTDigiValidation.h"
 #include "Validation/MuonCSCDigis/interface/CSCCLCTDigiValidation.h"
 #include "Validation/MuonCSCDigis/interface/CSCComparatorDigiValidation.h"
@@ -37,6 +35,7 @@ CSCDigiValidation::CSCDigiValidation(const edm::ParameterSet &ps)
     theWireDigiValidation->setSimHitMap(&theSimHitMap);
     theComparatorDigiValidation->setSimHitMap(&theSimHitMap);
   }
+  geomToken_ = esConsumes<CSCGeometry, MuonGeometryRecord>();
 }
 
 CSCDigiValidation::~CSCDigiValidation() {}
@@ -56,9 +55,7 @@ void CSCDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &even
   theSimHitMap.fill(e);
 
   // find the geometry & conditions for this event
-  edm::ESHandle<CSCGeometry> hGeom;
-  eventSetup.get<MuonGeometryRecord>().get(hGeom);
-  const CSCGeometry *pGeom = &*hGeom;
+  const CSCGeometry *pGeom = &eventSetup.getData(geomToken_);
 
   theStripDigiValidation->setGeometry(pGeom);
   theWireDigiValidation->setGeometry(pGeom);

Validation/MuonCSCDigis/plugins/CSCDigiValidation.h

@@ -3,13 +3,14 @@
 
 // user include files
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
 class CSCStripDigiValidation;
@@ -35,6 +36,8 @@ class CSCDigiValidation : public DQMEDAnalyzer {
   std::unique_ptr<CSCComparatorDigiValidation> theComparatorDigiValidation;
   std::unique_ptr<CSCALCTDigiValidation> theALCTDigiValidation;
   std::unique_ptr<CSCCLCTDigiValidation> theCLCTDigiValidation;
+
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> geomToken_;
 };
 
 #endif

Validation/MuonCSCDigis/src/CSCStubMatcher.cc

@@ -37,6 +37,8 @@ CSCStubMatcher::CSCStubMatcher(const edm::ParameterSet& pSet, edm::ConsumesColle
   alctToken_ = iC.consumes<CSCALCTDigiCollection>(cscALCT.getParameter<edm::InputTag>("inputTag"));
   lctToken_ = iC.consumes<CSCCorrelatedLCTDigiCollection>(cscLCT.getParameter<edm::InputTag>("inputTag"));
   mplctToken_ = iC.consumes<CSCCorrelatedLCTDigiCollection>(cscMPLCT.getParameter<edm::InputTag>("inputTag"));
+
+  geomToken_ = iC.esConsumes<CSCGeometry, MuonGeometryRecord>();
 }
 
 void CSCStubMatcher::init(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
@@ -48,12 +50,7 @@ void CSCStubMatcher::init(const edm::Event& iEvent, const edm::EventSetup& iSetu
   iEvent.getByToken(lctToken_, lctsH_);
   iEvent.getByToken(mplctToken_, mplctsH_);
 
-  iSetup.get<MuonGeometryRecord>().get(csc_geom_);
-  if (csc_geom_.isValid()) {
-    cscGeometry_ = &*csc_geom_;
-  } else {
-    edm::LogError("CSCStubMatcher") << "+++ Info: CSC geometry is unavailable.";
-  }
+  cscGeometry_ = &iSetup.getData(geomToken_);
 }
 
 // do the matching

Validation/MuonGEMDigis/interface/GEMDigiMatcher.h

@@ -132,7 +132,7 @@ class GEMDigiMatcher {
 
   std::shared_ptr<GEMSimHitMatcher> muonSimHitMatcher_;
 
-  edm::ESHandle<GEMGeometry> gem_geom_;
+  edm::ESGetToken<GEMGeometry, MuonGeometryRecord> geomToken_;
   const GEMGeometry* gemGeometry_;
 
   template <class T>