From f55cdba95dee9fb1b4a4def966b05c9668783807 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Fri, 11 Sep 2020 21:32:36 +0200
Subject: [PATCH] Migrate setConsumes() to type-deducing consumes()

---
 DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc | 4 ++--
 .../DDCMS/plugins/DDSpecParRegistryESProducer.cc          | 8 ++++----
 .../DDCMS/plugins/DDVectorRegistryESProducer.cc           | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
index 5a3492986d19c..82607d5b5aed2 100644
--- a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
+++ b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
@@ -73,14 +73,14 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
                              &DDDetectorESProducer::produceMagField,
                              edm::es::Label(iConfig.getParameter<std::string>("@module_label")));
     if (fromDB_) {
-      c.setConsumes(mfToken_, edm::ESInputTag("", label_));
+      mfToken_ = c.consumes(edm::ESInputTag("", label_));
     }
     findingRecord<IdealMagneticFieldRecord>();
   } else {
     auto c = setWhatProduced(
         this, &DDDetectorESProducer::produceGeom, edm::es::Label(iConfig.getParameter<std::string>("@module_label")));
     if (fromDB_) {
-      c.setConsumes(geomToken_, edm::ESInputTag("", label_));
+      geomToken_ = c.consumes(edm::ESInputTag("", label_));
     }
     findingRecord<IdealGeometryRecord>();
   }
diff --git a/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc b/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
index 4f41015313d1c..d4f410b93e662 100644
--- a/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
+++ b/DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
@@ -45,12 +45,12 @@ class DDSpecParRegistryESProducer : public edm::ESProducer {
   ReturnType produce(const DDSpecParRegistryRcd&);
 
 private:
-  edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
+  const edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
 };
 
-DDSpecParRegistryESProducer::DDSpecParRegistryESProducer(const edm::ParameterSet& iConfig) {
-  setWhatProduced(this).setConsumes(m_token,
-                                    edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel")));
+DDSpecParRegistryESProducer::DDSpecParRegistryESProducer(const edm::ParameterSet& iConfig)
+    : m_token(
+          setWhatProduced(this).consumes(edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel")))) {
 }
 
 DDSpecParRegistryESProducer::~DDSpecParRegistryESProducer() {}
diff --git a/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc b/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
index 94ff5bafef958..b5e908dca43ac 100644
--- a/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
+++ b/DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
@@ -47,12 +47,11 @@ class DDVectorRegistryESProducer : public edm::ESProducer {
   ReturnType produce(const DDVectorRegistryRcd&);
 
 private:
-  edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
+  const edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
 };
 
-DDVectorRegistryESProducer::DDVectorRegistryESProducer(const edm::ParameterSet& iConfig) {
-  setWhatProduced(this).setConsumes(m_token, edm::ESInputTag("", iConfig.getParameter<string>("appendToDataLabel")));
-}
+DDVectorRegistryESProducer::DDVectorRegistryESProducer(const edm::ParameterSet& iConfig)
+    : m_token(setWhatProduced(this).consumes(edm::ESInputTag("", iConfig.getParameter<string>("appendToDataLabel")))) {}
 
 DDVectorRegistryESProducer::~DDVectorRegistryESProducer() {}