moving to single record as all conds produced have the same IOV

CondFormats/DataRecord/interface/HGCalElectronicsMappingRcd.h

@@ -6,10 +6,17 @@
 // Class  :     HGCalElectronicsMappingRcd
 //
 /**\class HGCalElectronicsMappingRcd HGCalElectronicsMappingRcd.h CondFormats/DataRecords/interface/HGCalElectronicsMappingRcd.h
+<<<<<<< HEAD
  Description: This record *is temporary* and it is used to store the parameters which are used to describe 
  - dense indexing of HGCAL modules and corresponding cells in the readound sequence
  - module and cell information in the electronics mapping
  The record will change to its final format(s) once the we settle on the final formats to be used in CondDB
+=======
+
+ Description: This record is used to store the electronics mapping parameters for HGCAL
+ It contains the readout indexer classes for modules and cells as well as the characteristics of modules and cells stored in SoA
+
+>>>>>>> f199c5da48a (moving to single record as all conds produced have the same IOV)
 */
 //
 // Author:      Pedro Vieira De Castro Ferreira Da Silva

Geometry/HGCalMapping/plugins/HGCalMappingIndexESSource.cc

@@ -6,8 +6,7 @@
 #include "FWCore/Framework/interface/ESProducts.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CondFormats/DataRecord/interface/HGCalMappingModuleIndexerRcd.h"
-#include "CondFormats/DataRecord/interface/HGCalMappingCellIndexerRcd.h"
+#include "CondFormats/DataRecord/interface/HGCalElectronicsMappingRcd.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingCellIndexer.h"
 
@@ -28,17 +27,16 @@ class HGCalMappingIndexESSource : public edm::ESProducer, public edm::EventSetup
     setWhatProduced(this, &HGCalMappingIndexESSource::produceCellMapIndexer);
     setWhatProduced(this, &HGCalMappingIndexESSource::produceModuleMapIndexer);
 
-    findingRecord<HGCalMappingModuleIndexerRcd>();
-    findingRecord<HGCalMappingCellIndexerRcd>();
+    findingRecord<HGCalElectronicsMappingRcd>();
 
     buildCellMapperIndexer();
     buildModuleMapperIndexer();
   }
 
-  std::unique_ptr<HGCalMappingModuleIndexer> produceModuleMapIndexer(const HGCalMappingModuleIndexerRcd&) {
+  std::unique_ptr<HGCalMappingModuleIndexer> produceModuleMapIndexer(const HGCalElectronicsMappingRcd&) {
     return std::make_unique<HGCalMappingModuleIndexer>(modIndexer_);
   }
-  std::unique_ptr<HGCalMappingCellIndexer> produceCellMapIndexer(const HGCalMappingCellIndexerRcd&) {
+  std::unique_ptr<HGCalMappingCellIndexer> produceCellMapIndexer(const HGCalElectronicsMappingRcd&) {
     return std::make_unique<HGCalMappingCellIndexer>(cellIndexer_);
   }
 

Geometry/HGCalMapping/test/alpaka/HGCalMappingESSourceTester.cc

@@ -15,8 +15,7 @@
 #include "HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h"
 #include "DataFormats/PortableTestObjects/interface/alpaka/TestDeviceCollection.h"
 
-#include "CondFormats/DataRecord/interface/HGCalMappingModuleIndexerRcd.h"
-#include "CondFormats/DataRecord/interface/HGCalMappingCellIndexerRcd.h"
+#include "CondFormats/DataRecord/interface/HGCalElectronicsMappingRcd.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingCellIndexer.h"
 #include "CondFormats/HGCalObjects/interface/alpaka/HGCalMappingParameterDeviceCollection.h"
@@ -50,19 +49,19 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   private:
     void produce(device::Event&, device::EventSetup const&) override;
 
-    edm::ESWatcher<HGCalMappingModuleIndexerRcd> cfgWatcher_;
-    edm::ESGetToken<HGCalMappingCellIndexer, HGCalMappingCellIndexerRcd> cellIndexTkn_;
-    device::ESGetToken<hgcal::HGCalMappingCellParamDeviceCollection, HGCalMappingCellIndexerRcd> cellTkn_;
-    edm::ESGetToken<HGCalMappingModuleIndexer, HGCalMappingModuleIndexerRcd> moduleIndexTkn_;
-    device::ESGetToken<hgcal::HGCalMappingModuleParamDeviceCollection, HGCalMappingModuleIndexerRcd> moduleTkn_;
+    edm::ESWatcher<HGCalElectronicsMappingRcd> cfgWatcher_;
+    edm::ESGetToken<HGCalMappingCellIndexer, HGCalElectronicsMappingRcd> cellIndexTkn_;
+    device::ESGetToken<hgcal::HGCalMappingCellParamDeviceCollection, HGCalElectronicsMappingRcd> cellTkn_;
+    edm::ESGetToken<HGCalMappingModuleIndexer, HGCalElectronicsMappingRcd> moduleIndexTkn_;
+    device::ESGetToken<hgcal::HGCalMappingModuleParamDeviceCollection, HGCalElectronicsMappingRcd> moduleTkn_;
     const device::EDPutToken<portabletest::TestDeviceCollection> testCollToken_;
   };
 
   //
   HGCalMappingESSourceTester::HGCalMappingESSourceTester(const edm::ParameterSet& iConfig)
-      : cellIndexTkn_(esConsumes<HGCalMappingCellIndexer, HGCalMappingCellIndexerRcd>()),
+      : cellIndexTkn_(esConsumes<HGCalMappingCellIndexer, HGCalElectronicsMappingRcd>()),
         cellTkn_(esConsumes(edm::ESInputTag(""))),
-        moduleIndexTkn_(esConsumes<HGCalMappingModuleIndexer, HGCalMappingModuleIndexerRcd>()),
+        moduleIndexTkn_(esConsumes<HGCalMappingModuleIndexer, HGCalElectronicsMappingRcd>()),
         moduleTkn_(esConsumes(edm::ESInputTag(""))),
         testCollToken_{produces()} {}