Merge pull request cms-sw#33956 from Dr15Jones/removeParameterSetFromEcalObjects

Removed ParameterSet usage from CondFormats/EcalObjects

Author: cmsbuild

CondFormats/EcalObjects/interface/EcalMultifitParametersGPU.h

@@ -3,7 +3,6 @@
 
 #include <array>
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/propagate_const_array.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
 
@@ -22,7 +21,10 @@ class EcalMultifitParametersGPU {
   };
 
 #ifndef __CUDACC__
-  EcalMultifitParametersGPU(edm::ParameterSet const&);
+  EcalMultifitParametersGPU(std::vector<double> const& amplitudeEB,
+                            std::vector<double> const& amplitudeEE,
+                            std::vector<double> const& timeEB,
+                            std::vector<double> const& timeEE);
 
   ~EcalMultifitParametersGPU() = default;
 

CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h

@@ -3,7 +3,6 @@
 
 #include <array>
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/propagate_const_array.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h"
 
@@ -22,11 +21,19 @@ class EcalRecHitParametersGPU {
   };
 
 #ifndef __CUDACC__
-  EcalRecHitParametersGPU(edm::ParameterSet const &);
+  struct DBStatus {
+    DBStatus(int flag, std::vector<uint32_t> status) : recoflagbit{flag}, dbstatus(std::move(status)) {}
+    int recoflagbit;                 //must be a EcalRecHit::Flags
+    std::vector<uint32_t> dbstatus;  //must contain EcalChannelStatusCode::Code
+  };
+
+  /// channelStatusToBeExcluded must contain EcalChannelStatusCode::Code
+  EcalRecHitParametersGPU(std::vector<int> const& channelStatusToBeExcluded,
+                          std::vector<DBStatus> const& flagsMapDBReco);
 
   ~EcalRecHitParametersGPU() = default;
 
-  Product const &getProduct(cudaStream_t) const;
+  Product const& getProduct(cudaStream_t) const;
 
   using intvec = std::reference_wrapper<std::vector<int, cms::cuda::HostAllocator<int>> const>;
   using uint32vec = std::reference_wrapper<std::vector<uint32_t, cms::cuda::HostAllocator<uint32_t>> const>;

CondFormats/EcalObjects/interface/EcalSRSettings.h

@@ -14,8 +14,6 @@
 #include <string>
 #include <ostream>
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
 /** Class to hold ECAL Selective readout settings.
  * Up to CMSSW release 3.8.X, selective readout emulation settings was done from
  * CMSSW configuration file. From 3.8.X configuration is stored in condition database.

CondFormats/EcalObjects/src/EcalMultifitParametersGPU.cc

@@ -3,12 +3,10 @@
 #include "FWCore/Utilities/interface/typelookup.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
 
-EcalMultifitParametersGPU::EcalMultifitParametersGPU(edm::ParameterSet const& ps) {
-  auto const& amplitudeFitParametersEB = ps.getParameter<std::vector<double>>("EBamplitudeFitParameters");
-  auto const& amplitudeFitParametersEE = ps.getParameter<std::vector<double>>("EEamplitudeFitParameters");
-  auto const& timeFitParametersEB = ps.getParameter<std::vector<double>>("EBtimeFitParameters");
-  auto const& timeFitParametersEE = ps.getParameter<std::vector<double>>("EEtimeFitParameters");
-
+EcalMultifitParametersGPU::EcalMultifitParametersGPU(std::vector<double> const& amplitudeFitParametersEB,
+                                                     std::vector<double> const& amplitudeFitParametersEE,
+                                                     std::vector<double> const& timeFitParametersEB,
+                                                     std::vector<double> const& timeFitParametersEE) {
   amplitudeFitParametersEB_.resize(amplitudeFitParametersEB.size());
   amplitudeFitParametersEE_.resize(amplitudeFitParametersEE.size());
   timeFitParametersEB_.resize(timeFitParametersEB.size());

CondFormats/EcalObjects/src/EcalRecHitParametersGPU.cc

@@ -2,33 +2,22 @@
 
 #include "FWCore/Utilities/interface/typelookup.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h"
-#include "CommonTools/Utils/interface/StringToEnumValue.h"
 #include "CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
-EcalRecHitParametersGPU::EcalRecHitParametersGPU(edm::ParameterSet const& ps) {
-  auto const& channelStatusToBeExcluded = StringToEnumValue<EcalChannelStatusCode::Code>(
-      ps.getParameter<std::vector<std::string>>("ChannelStatusToBeExcluded"));
-
+EcalRecHitParametersGPU::EcalRecHitParametersGPU(std::vector<int> const& channelStatusToBeExcluded,
+                                                 std::vector<DBStatus> const& flagsMapDBReco) {
   channelStatusToBeExcluded_.resize(channelStatusToBeExcluded.size());
   std::copy(channelStatusToBeExcluded.begin(), channelStatusToBeExcluded.end(), channelStatusToBeExcluded_.begin());
 
-  //     https://github.com/cms-sw/cmssw/blob/266e21cfc9eb409b093e4cf064f4c0a24c6ac293/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerSimple.cc
-
-  // Translate string representation of flagsMapDBReco into enum values
-  const edm::ParameterSet& p = ps.getParameter<edm::ParameterSet>("flagsMapDBReco");
-  std::vector<std::string> recoflagbitsStrings = p.getParameterNames();
-
-  for (unsigned int i = 0; i != recoflagbitsStrings.size(); ++i) {
-    EcalRecHit::Flags recoflagbit = (EcalRecHit::Flags)StringToEnumValue<EcalRecHit::Flags>(recoflagbitsStrings[i]);
-    std::vector<std::string> dbstatus_s = p.getParameter<std::vector<std::string>>(recoflagbitsStrings[i]);
-    for (unsigned int j = 0; j != dbstatus_s.size(); ++j) {
-      EcalChannelStatusCode::Code dbstatus =
-          (EcalChannelStatusCode::Code)StringToEnumValue<EcalChannelStatusCode::Code>(dbstatus_s[j]);
+  for (auto const& flagInfo : flagsMapDBReco) {
+    EcalRecHit::Flags recoflagbit = static_cast<EcalRecHit::Flags>(flagInfo.recoflagbit);
+    for (auto v : flagInfo.dbstatus) {
+      EcalChannelStatusCode::Code dbstatus = static_cast<EcalChannelStatusCode::Code>(v);
       expanded_v_DB_reco_flags_.push_back(dbstatus);
     }
 
-    expanded_Sizes_v_DB_reco_flags_.push_back(dbstatus_s.size());
+    expanded_Sizes_v_DB_reco_flags_.push_back(flagInfo.dbstatus.size());
     expanded_flagbit_v_DB_reco_flags_.push_back(recoflagbit);
   }
 }

RecoLocalCalo/EcalRecProducers/plugins/EcalMultifitParametersGPUESProducer.cc

@@ -72,7 +72,11 @@ void EcalMultifitParametersGPUESProducer::fillDescriptions(edm::ConfigurationDes
 
 std::unique_ptr<EcalMultifitParametersGPU> EcalMultifitParametersGPUESProducer::produce(
     JobConfigurationGPURecord const&) {
-  return std::make_unique<EcalMultifitParametersGPU>(pset_);
+  return std::make_unique<EcalMultifitParametersGPU>(
+      pset_.getParameter<std::vector<double>>("EBamplitudeFitParameters"),
+      pset_.getParameter<std::vector<double>>("EEamplitudeFitParameters"),
+      pset_.getParameter<std::vector<double>>("EBtimeFitParameters"),
+      pset_.getParameter<std::vector<double>>("EEtimeFitParameters"));
 }
 
 DEFINE_FWK_EVENTSETUP_SOURCE(EcalMultifitParametersGPUESProducer);

RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitParametersGPUESProducer.cc

@@ -3,6 +3,7 @@
 #include <utility>
 
 #include "CondFormats/EcalObjects/interface/EcalRecHitParametersGPU.h"
+#include "CondFormats/EcalObjects/interface/EcalRechitChannelStatusGPU.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESProductHost.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
@@ -15,6 +16,8 @@
 #include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 #include "FWCore/Utilities/interface/typelookup.h"
 #include "HeterogeneousCore/CUDACore/interface/JobConfigurationGPURecord.h"
+#include "CommonTools/Utils/interface/StringToEnumValue.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
 class EcalRecHitParametersGPUESProducer : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
@@ -77,7 +80,32 @@ void EcalRecHitParametersGPUESProducer::fillDescriptions(edm::ConfigurationDescr
 }
 
 std::unique_ptr<EcalRecHitParametersGPU> EcalRecHitParametersGPUESProducer::produce(JobConfigurationGPURecord const&) {
-  return std::make_unique<EcalRecHitParametersGPU>(pset_);
+  auto const& channelStatusToBeExcluded = StringToEnumValue<EcalChannelStatusCode::Code>(
+      pset_.getParameter<std::vector<std::string>>("ChannelStatusToBeExcluded"));
+
+  //     https://github.com/cms-sw/cmssw/blob/266e21cfc9eb409b093e4cf064f4c0a24c6ac293/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerSimple.cc
+
+  // Translate string representation of flagsMapDBReco into enum values
+  const edm::ParameterSet& p = pset_.getParameter<edm::ParameterSet>("flagsMapDBReco");
+  std::vector<std::string> recoflagbitsStrings = p.getParameterNames();
+
+  std::vector<EcalRecHitParametersGPU::DBStatus> status;
+  status.reserve(recoflagbitsStrings.size());
+  for (auto const& recoflagbitsString : recoflagbitsStrings) {
+    EcalRecHit::Flags recoflagbit = (EcalRecHit::Flags)StringToEnumValue<EcalRecHit::Flags>(recoflagbitsString);
+    std::vector<std::string> dbstatus_s = p.getParameter<std::vector<std::string>>(recoflagbitsString);
+
+    std::vector<uint32_t> db_reco_flags;
+    db_reco_flags.reserve(dbstatus_s.size());
+    for (auto const& dbstatusString : dbstatus_s) {
+      EcalChannelStatusCode::Code dbstatus =
+          (EcalChannelStatusCode::Code)StringToEnumValue<EcalChannelStatusCode::Code>(dbstatusString);
+      db_reco_flags.push_back(dbstatus);
+    }
+    status.emplace_back(static_cast<int>(recoflagbit), db_reco_flags);
+  }
+
+  return std::make_unique<EcalRecHitParametersGPU>(channelStatusToBeExcluded, status);
 }
 
 DEFINE_FWK_EVENTSETUP_SOURCE(EcalRecHitParametersGPUESProducer);