Code checks

cms-sw · Oct 7, 2020 · 316e388 · 316e388
1 parent cccc646
commit 316e388
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc b/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
@@ -211,47 +213,47 @@ EcalDigiProducer::EcalDigiProducer(const edm::ParameterSet &params, edm::Consume
     }
   }
 
-  m_EBCorrNoise[0].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[0]));
-  m_EECorrNoise[0].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[0]));
-  m_EBCorrNoise[1].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[1]));
-  m_EECorrNoise[1].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[1]));
-  m_EBCorrNoise[2].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[2]));
-  m_EECorrNoise[2].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[2]));
-
-  m_Coder.reset(new EcalCoder(addNoise,
-                              m_PreMix1,
-                              m_EBCorrNoise[0].get(),
-                              m_EECorrNoise[0].get(),
-                              m_EBCorrNoise[1].get(),
-                              m_EECorrNoise[1].get(),
-                              m_EBCorrNoise[2].get(),
-                              m_EECorrNoise[2].get()));
-
-  m_ElectronicsSim.reset(
-      new EcalElectronicsSim(m_ParameterMap.get(), m_Coder.get(), applyConstantTerm, rmsConstantTerm));
+  m_EBCorrNoise[0] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(ebMatrix[0]);
+  m_EECorrNoise[0] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(eeMatrix[0]);
+  m_EBCorrNoise[1] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(ebMatrix[1]);
+  m_EECorrNoise[1] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(eeMatrix[1]);
+  m_EBCorrNoise[2] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(ebMatrix[2]);
+  m_EECorrNoise[2] = std::make_unique<CorrelatedNoisifier<EcalCorrMatrix>>(eeMatrix[2]);
+
+  m_Coder = std::make_unique<EcalCoder>(addNoise,
+                                        m_PreMix1,
+                                        m_EBCorrNoise[0].get(),
+                                        m_EECorrNoise[0].get(),
+                                        m_EBCorrNoise[1].get(),
+                                        m_EECorrNoise[1].get(),
+                                        m_EBCorrNoise[2].get(),
+                                        m_EECorrNoise[2].get());
+
+  m_ElectronicsSim =
+      std::make_unique<EcalElectronicsSim>(m_ParameterMap.get(), m_Coder.get(), applyConstantTerm, rmsConstantTerm);
 
   if (m_apdSeparateDigi) {
-    m_APDCoder.reset(new EcalCoder(false,
-                                   m_PreMix1,
-                                   m_EBCorrNoise[0].get(),
-                                   m_EECorrNoise[0].get(),
-                                   m_EBCorrNoise[1].get(),
-                                   m_EECorrNoise[1].get(),
-                                   m_EBCorrNoise[2].get(),
-                                   m_EECorrNoise[2].get()));
-
-    m_APDElectronicsSim.reset(
-        new EcalElectronicsSim(m_ParameterMap.get(), m_APDCoder.get(), applyConstantTerm, rmsConstantTerm));
-
-    m_APDDigitizer.reset(new EBDigitizer(m_APDResponse.get(), m_APDElectronicsSim.get(), false));
+    m_APDCoder = std::make_unique<EcalCoder>(false,
+                                             m_PreMix1,
+                                             m_EBCorrNoise[0].get(),
+                                             m_EECorrNoise[0].get(),
+                                             m_EBCorrNoise[1].get(),
+                                             m_EECorrNoise[1].get(),
+                                             m_EBCorrNoise[2].get(),
+                                             m_EECorrNoise[2].get());
+
+    m_APDElectronicsSim = std::make_unique<EcalElectronicsSim>(
+        m_ParameterMap.get(), m_APDCoder.get(), applyConstantTerm, rmsConstantTerm);
+
+    m_APDDigitizer = std::make_unique<EBDigitizer>(m_APDResponse.get(), m_APDElectronicsSim.get(), false);
   }
 
   if (m_doEB) {
-    m_BarrelDigitizer.reset(new EBDigitizer(m_EBResponse.get(), m_ElectronicsSim.get(), addNoise));
+    m_BarrelDigitizer = std::make_unique<EBDigitizer>(m_EBResponse.get(), m_ElectronicsSim.get(), addNoise);
   }
 
   if (m_doEE) {
-    m_EndcapDigitizer.reset(new EEDigitizer(m_EEResponse.get(), m_ElectronicsSim.get(), addNoise));
+    m_EndcapDigitizer = std::make_unique<EEDigitizer>(m_EEResponse.get(), m_ElectronicsSim.get(), addNoise);
   }
 }
 

diff --git a/SimGeneral/MixingModule/plugins/MixingModule.cc b/SimGeneral/MixingModule/plugins/MixingModule.cc
@@ -613,8 +613,8 @@ namespace edm {
 
     std::unique_ptr<PileupMixingContent> PileupMixing_;
 
-    PileupMixing_ = std::unique_ptr<PileupMixingContent>(new PileupMixingContent(
-        bunchCrossingList, numInteractionList, TrueInteractionList, eventInfoList, bunchSpace_));
+    PileupMixing_ = std::make_unique<PileupMixingContent>(
+        bunchCrossingList, numInteractionList, TrueInteractionList, eventInfoList, bunchSpace_);
 
     e.put(std::move(PileupMixing_));