Add in options to turn off EB/EE/ES in ECAL digitizer, default all on

cms-sw · Oct 14, 2015 · 2233d7b · 2233d7b
1 parent 2223484
commit 2233d7b
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 263 deletions.
diff --git a/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h b/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
@@ -109,44 +109,46 @@ class EcalDigiProducer : public DigiAccumulatorMixMod {
 
       const unsigned int         m_readoutFrameSize ;
    protected:
-      const EcalSimParameterMap* m_ParameterMap  ;
+      std::unique_ptr<const EcalSimParameterMap> m_ParameterMap  ;
    private:
       const std::string          m_apdDigiTag    ;
-      const APDSimParameters*    m_apdParameters ;
+      std::unique_ptr<const APDSimParameters>    m_apdParameters ;
 
-      EBHitResponse* m_APDResponse ;
+      std::unique_ptr<EBHitResponse> m_APDResponse ;
    protected:
-      EBHitResponse* m_EBResponse ;
-      EEHitResponse* m_EEResponse ;
+      std::unique_ptr<EBHitResponse> m_EBResponse ;
+      std::unique_ptr<EEHitResponse> m_EEResponse ;
    private:
-      ESHitResponse* m_ESResponse ;
-      CaloHitResponse* m_ESOldResponse ;
+      std::unique_ptr<ESHitResponse> m_ESResponse ;
+      std::unique_ptr<CaloHitResponse> m_ESOldResponse ;
 
       const bool m_addESNoise ;
       const bool m_PreMix1 ;
       const bool m_PreMix2 ;
 
       const bool m_doFastES   ;
 
-      ESElectronicsSim*     m_ESElectronicsSim     ;
-      ESOldDigitizer*       m_ESOldDigitizer       ;
-      ESElectronicsSimFast* m_ESElectronicsSimFast ;
-      ESDigitizer*          m_ESDigitizer          ;
+      const bool m_doEB, m_doEE, m_doES;
 
-      EBDigitizer*          m_APDDigitizer ;
-      EBDigitizer*          m_BarrelDigitizer ;
-      EEDigitizer*          m_EndcapDigitizer ;
+      std::unique_ptr<ESElectronicsSim>     m_ESElectronicsSim     ;
+      std::unique_ptr<ESOldDigitizer>       m_ESOldDigitizer       ;
+      std::unique_ptr<ESElectronicsSimFast> m_ESElectronicsSimFast ;
+      std::unique_ptr<ESDigitizer>          m_ESDigitizer          ;
 
-      EcalElectronicsSim*   m_ElectronicsSim ;
-      EcalCoder*            m_Coder ;
+      std::unique_ptr<EBDigitizer>          m_APDDigitizer ;
+      std::unique_ptr<EBDigitizer>          m_BarrelDigitizer ;
+      std::unique_ptr<EEDigitizer>          m_EndcapDigitizer ;
 
-      EcalElectronicsSim*   m_APDElectronicsSim ;
-      EcalCoder*            m_APDCoder ;
+      std::unique_ptr<EcalElectronicsSim>   m_ElectronicsSim ;
+      std::unique_ptr<EcalCoder>            m_Coder ;
+
+      std::unique_ptr<EcalElectronicsSim>   m_APDElectronicsSim ;
+      std::unique_ptr<EcalCoder>            m_APDCoder ;
 
       const CaloGeometry*   m_Geometry ;
 
-      CorrelatedNoisifier<EcalCorrMatrix>* m_EBCorrNoise[3] ;
-      CorrelatedNoisifier<EcalCorrMatrix>* m_EECorrNoise[3] ;
+      std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> > m_EBCorrNoise[3] ;
+      std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> > m_EECorrNoise[3] ;
 
       std::vector<CLHEP::HepRandomEngine*> randomEngines_;
 };

diff --git a/SimCalorimetry/EcalSimProducers/python/ecalDigiParameters_cff.py b/SimCalorimetry/EcalSimProducers/python/ecalDigiParameters_cff.py
@@ -6,6 +6,10 @@
     ESdigiCollection = cms.string(''),
     UseLCcorrection  = cms.untracked.bool(True),
 
+    doEB = cms.bool(True),
+    doEE = cms.bool(True),
+    doES = cms.bool(True),
+
     EBCorrNoiseMatrixG12 = cms.vdouble (
     1.00000, 0.71073, 0.55721, 0.46089, 0.40449,
     0.35931, 0.33924, 0.32439, 0.31581, 0.30481 ) ,