Merge pull request #28319 from Dr15Jones/modernizeMTDDetLayerGeometry…

…ESProducer Modernized MTDDetLayerGeometryESProducer
cms-sw · Nov 1, 2019 · f8fb84b · f8fb84b
2 parents b1e58f3 + aec330b
commit f8fb84b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 56 deletions.
diff --git a/...tLayers/src/BTLDetLayerGeometryBuilder.cc → ...ers/plugins/BTLDetLayerGeometryBuilder.cc b/...tLayers/src/BTLDetLayerGeometryBuilder.cc → ...ers/plugins/BTLDetLayerGeometryBuilder.cc
@@ -1,4 +1,4 @@
-#include <RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.h>
+#include "BTLDetLayerGeometryBuilder.h"
 
 #include <DataFormats/ForwardDetId/interface/BTLDetId.h>
 #include <Geometry/CommonDetUnit/interface/GeomDet.h>

diff --git a/...etLayers/src/BTLDetLayerGeometryBuilder.h → ...yers/plugins/BTLDetLayerGeometryBuilder.h b/...etLayers/src/BTLDetLayerGeometryBuilder.h → ...yers/plugins/BTLDetLayerGeometryBuilder.h
diff --git a/...tLayers/src/ETLDetLayerGeometryBuilder.cc → ...ers/plugins/ETLDetLayerGeometryBuilder.cc b/...tLayers/src/ETLDetLayerGeometryBuilder.cc → ...ers/plugins/ETLDetLayerGeometryBuilder.cc
@@ -1,4 +1,4 @@
-#include <RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.h>
+#include "ETLDetLayerGeometryBuilder.h"
 
 #include <RecoMTD/DetLayers/interface/MTDRingForwardDoubleLayer.h>
 #include <RecoMTD/DetLayers/interface/MTDDetRing.h>

diff --git a/...etLayers/src/ETLDetLayerGeometryBuilder.h → ...yers/plugins/ETLDetLayerGeometryBuilder.h b/...etLayers/src/ETLDetLayerGeometryBuilder.h → ...yers/plugins/ETLDetLayerGeometryBuilder.h
diff --git a/RecoMTD/DetLayers/plugins/MTDDetLayerGeometryESProducer.cc b/RecoMTD/DetLayers/plugins/MTDDetLayerGeometryESProducer.cc
@@ -1,44 +1,60 @@
 /** \file
+ *
+ *  ESProducer for MTDDetLayerGeometry in RecoMTD/DetLayers
  *
  *  \author L. Gray - FNAL
  *
  */
 
-#include <RecoMTD/DetLayers/plugins/MTDDetLayerGeometryESProducer.h>
-#include <Geometry/Records/interface/MTDDigiGeometryRecord.h>
-
-#include <Geometry/MTDGeometryBuilder/interface/MTDGeometry.h>
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <RecoMTD/DetLayers/src/ETLDetLayerGeometryBuilder.h>
-#include <RecoMTD/DetLayers/src/BTLDetLayerGeometryBuilder.h>
+#include "RecoMTD/Records/interface/MTDRecoGeometryRecord.h"
+#include "Geometry/Records/interface/MTDDigiGeometryRecord.h"
+#include "Geometry/MTDGeometryBuilder/interface/MTDGeometry.h"
 
-#include <FWCore/Framework/interface/EventSetup.h>
-#include <FWCore/Framework/interface/ESHandle.h>
+#include "ETLDetLayerGeometryBuilder.h"
+#include "BTLDetLayerGeometryBuilder.h"
+#include "RecoMTD/DetLayers/interface/MTDDetLayerGeometry.h"
 
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
-#include <FWCore/Framework/interface/NoProxyException.h>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <memory>
 #include <iostream>
 
-using namespace edm;
+class MTDDetLayerGeometryESProducer : public edm::ESProducer {
+public:
+  /// Constructor
+  MTDDetLayerGeometryESProducer(const edm::ParameterSet& p);
 
-MTDDetLayerGeometryESProducer::MTDDetLayerGeometryESProducer(const edm::ParameterSet& p) { setWhatProduced(this); }
+  /// Produce MuonDeLayerGeometry.
+  std::unique_ptr<MTDDetLayerGeometry> produce(const MTDRecoGeometryRecord& record);
 
-MTDDetLayerGeometryESProducer::~MTDDetLayerGeometryESProducer() {}
+  static void fillDescriptions(edm::ConfigurationDescriptions&);
+
+private:
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> geomToken_;
+};
+
+using namespace edm;
+
+MTDDetLayerGeometryESProducer::MTDDetLayerGeometryESProducer(const edm::ParameterSet& p) {
+  setWhatProduced(this).setConsumes(geomToken_);
+}
 
 std::unique_ptr<MTDDetLayerGeometry> MTDDetLayerGeometryESProducer::produce(const MTDRecoGeometryRecord& record) {
-  const std::string metname = "MTD|RecoMTD|RecoMTDDetLayers|MTDDetLayerGeometryESProducer";
   auto mtdDetLayerGeometry = std::make_unique<MTDDetLayerGeometry>();
 
-  edm::ESHandle<MTDGeometry> mtd;
-  record.getRecord<MTDDigiGeometryRecord>().get(mtd);
-  if (mtd.isValid()) {
+  if (auto mtd = record.getHandle(geomToken_)) {
     // Build BTL layers
     mtdDetLayerGeometry->addBTLLayers(BTLDetLayerGeometryBuilder::buildLayers(*mtd));
     // Build ETL layers
     mtdDetLayerGeometry->addETLLayers(ETLDetLayerGeometryBuilder::buildLayers(*mtd));
   } else {
+    const std::string metname = "MTD|RecoMTD|RecoMTDDetLayers|MTDDetLayerGeometryESProducer";
     LogInfo(metname) << "No MTD geometry is available.";
   }
 
@@ -47,3 +63,10 @@ std::unique_ptr<MTDDetLayerGeometry> MTDDetLayerGeometryESProducer::produce(cons
 
   return mtdDetLayerGeometry;
 }
+
+void MTDDetLayerGeometryESProducer::fillDescriptions(edm::ConfigurationDescriptions& desc) {
+  edm::ParameterSetDescription ps;
+  desc.addDefault(ps);
+}
+
+DEFINE_FWK_EVENTSETUP_MODULE(MTDDetLayerGeometryESProducer);
diff --git a/RecoMTD/DetLayers/plugins/MTDDetLayerGeometryESProducer.h b/RecoMTD/DetLayers/plugins/MTDDetLayerGeometryESProducer.h
diff --git a/RecoMTD/DetLayers/plugins/SealModule.cc b/RecoMTD/DetLayers/plugins/SealModule.cc