round three of checked changes from premixing

cms-sw · Nov 16, 2014 · 137a589 · 137a589
1 parent f7b9824
commit 137a589
Show file tree

Hide file tree

Showing 13 changed files with 2,269 additions and 23 deletions.
diff --git a/Configuration/PyReleaseValidation/python/ConfigBuilder.py b/Configuration/PyReleaseValidation/python/ConfigBuilder.py
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc b/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
@@ -46,8 +46,6 @@ void CaloVNoiseSignalGenerator::fillDetIds()
 
     theDetIds.push_back(sampleItr->id().rawId());
 
-    //    std::cout << "Noise DetId " << sampleItr->id().rawId() << std::endl;
-
   }
   edm::sort_all(theDetIds);
 }

diff --git a/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc b/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
@@ -266,6 +266,7 @@ EcalDigiProducer::EcalDigiProducer( const edm::ParameterSet& params, edm::one::E
 					addNoise            ) ;
 }
 
+
 // duplicate version for Pre-Mixing, for use outside of MixingModule 
 EcalDigiProducer::EcalDigiProducer( const edm::ParameterSet& params,  edm::ConsumesCollector& iC) :
    DigiAccumulatorMixMod(),
@@ -380,7 +381,7 @@ EcalDigiProducer::EcalDigiProducer( const edm::ParameterSet& params,  edm::Consu
    const bool applyConstantTerm          = params.getParameter<bool>       ("applyConstantTerm");
    const double rmsConstantTerm          = params.getParameter<double>     ("ConstantTerm");
 
-   const bool addNoise                   = params.getParameter<bool>       ("doNoise"); 
+   const bool addNoise                   = params.getParameter<bool>       ("doENoise"); 
    const bool cosmicsPhase               = params.getParameter<bool>       ("cosmicsPhase");
    const double cosmicsShift             = params.getParameter<double>     ("cosmicsShift");
 
@@ -817,7 +818,6 @@ EcalDigiProducer::updateGeometry()
    }
 }
 
-
 CLHEP::HepRandomEngine* EcalDigiProducer::randomEngine(edm::StreamID const& streamID) {
   unsigned int index = streamID.value();
   if(index >= randomEngines_.size()) {

diff --git a/SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h b/SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h
@@ -23,6 +23,7 @@ namespace CLHEP {
 class HcalAmplifier {
 public:
   HcalAmplifier(const CaloVSimParameterMap * parameters, bool addNoise, bool PreMix1, bool PreMix2);
+
   virtual ~HcalAmplifier() {}
 
   /// the Producer will probably update this every event

diff --git a/SimCalorimetry/HcalSimAlgos/src/HcalElectronicsSim.cc b/SimCalorimetry/HcalSimAlgos/src/HcalElectronicsSim.cc
@@ -6,7 +6,6 @@
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
 #include "DataFormats/HcalDigi/interface/ZDCDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HcalUpgradeDataFrame.h"
-
 #include "CLHEP/Random/RandFlat.h"
 #include <math.h>
 

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc b/SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.cc
@@ -43,7 +43,6 @@ namespace edm {
     // initialize EcalDigitizer here...
 
     myEcalDigitizer_ = new EcalDigiProducer( ps , iC);
-
     myEcalDigitizer_->setEBNoiseSignalGenerator( & theEBSignalGenerator );
     myEcalDigitizer_->setEENoiseSignalGenerator( & theEESignalGenerator );
     myEcalDigitizer_->setESNoiseSignalGenerator( & theESSignalGenerator );
@@ -56,8 +55,6 @@ namespace edm {
   }  
 
   void DataMixingEcalDigiWorkerProd::beginRun(const edm::EventSetup& ES) {
-
-    // myEcalDigitizer_->beginRun(ES); 
   }
 
   void DataMixingEcalDigiWorkerProd::initializeEvent(const edm::Event &e, const edm::EventSetup& ES) {
@@ -94,5 +91,10 @@ namespace edm {
 
   }
 
+  void DataMixingEcalDigiWorkerProd::beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) {
+    myEcalDigitizer_->beginLuminosityBlock(lumi,setup);
+  }
+
+
 } //edm
 
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.h b/SimGeneral/DataMixingModule/plugins/DataMixingEcalDigiWorkerProd.h
@@ -62,6 +62,7 @@ namespace edm
 
     void beginRun(const edm::EventSetup& ES);
     void initializeEvent(const edm::Event &e, const edm::EventSetup& ES);
+    void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup);
 
     private:
       // data specifiers
@@ -88,7 +89,6 @@ namespace edm
       const double m_peToABarrel;
       const double m_peToAEndcap;
 
-
       EcalDigiProducer* myEcalDigitizer_;
       EBSignalGenerator theEBSignalGenerator;
       EESignalGenerator theEESignalGenerator;

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
@@ -325,6 +325,7 @@ namespace edm
 #endif
        }
     }
+
     //else {std::cout << "NO HBHE Digis!!!!" << std::endl;}
     // HO Next
 

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
@@ -65,7 +65,6 @@ namespace edm {
   }  
 
   void DataMixingHcalDigiWorkerProd::beginRun(const edm::Run& run, const edm::EventSetup& ES) {
-
     myHcalDigitizer_->beginRun(run, ES); 
   }
 

diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc b/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
@@ -70,8 +70,6 @@ namespace edm
 
     addMCDigiNoise_ = ps.getUntrackedParameter<bool>("addMCDigiNoise");  // for Sim on Sim mixing
 
-
-
     // Put Fast Sim Sequences here for Simplification: Fewer options!
 
     if(DoFastSim_) {
@@ -243,7 +241,6 @@ namespace edm
     } else {
 
       produces< edm::DetSetVector<SiStripDigi> > (SiStripDigiCollectionDM_);
-      SiStripWorker_ = new DataMixingSiStripWorker(ps, consumesCollector());
 
       if( addMCDigiNoise_ ) {
 	SiStripMCDigiWorker_ = new DataMixingSiStripMCDigiWorker(ps, consumesCollector());
@@ -332,6 +329,7 @@ namespace edm
     }
   }
 
+
   // Virtual destructor needed.
   DataMixingModule::~DataMixingModule() { 
     if(MergeEMDigis_){ 
@@ -351,7 +349,6 @@ namespace edm
 	delete SiStripRawWorker_;
       else if(addMCDigiNoise_ ) delete SiStripMCDigiWorker_;
       else delete SiStripWorker_;
-
       delete SiPixelWorker_;
     }
     if(MergePileup_) { delete PUWorker_;}
@@ -547,5 +544,10 @@ namespace edm
 
   }
 
+  void DataMixingModule::beginLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) {
+    EcalDigiWorkerProd_->beginLuminosityBlock(l1,c);
+  }
+
+
 
 } //edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingModule.h b/SimGeneral/DataMixingModule/plugins/DataMixingModule.h
@@ -64,13 +64,12 @@ namespace edm {
       virtual void doPileUp(edm::Event &e,const edm::EventSetup& ES) override;
       virtual void put(edm::Event &e,const edm::EventSetup& ES) ;
 
-      void initializeEvent(edm::Event const& e, edm::EventSetup const& eventSetup);
+      virtual void initializeEvent(edm::Event const& e, edm::EventSetup const& eventSetup);
       void beginRun(edm::Run const& run, edm::EventSetup const& eventSetup);
-
       void pileWorker(const edm::EventPrincipal&, int bcr, int EventId,const edm::EventSetup& ES, ModuleCallingContext const*);
       //virtual void beginJob();
       //virtual void endJob();
-      //virtual void beginLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override;
+      virtual void beginLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override;
       //virtual void endLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override;
       //virtual void endRun(const edm::Run& r, const edm::EventSetup& setup) override;
 

diff --git a/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py b/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py
@@ -15,7 +15,6 @@
 from SimCalorimetry.EcalSimProducers.ecalNotContainmentSim_cff import *
 from SimCalorimetry.EcalSimProducers.ecalCosmicsSim_cff import *
 
-
 import EventFilter.EcalRawToDigi.EcalUnpackerData_cfi
 import EventFilter.ESRawToDigi.esRawToDigi_cfi
 import EventFilter.HcalRawToDigi.HcalRawToDigi_cfi
@@ -38,7 +37,6 @@
 muonDTDigis = EventFilter.DTRawToDigi.dtunpacker_cfi.muonDTDigis.clone()
 
 #muonRPCDigis = EventFilter.RPCRawToDigi.rpcUnpacker_cfi.rpcunpacker.clone()
-
 #castorDigis = EventFilter.CastorRawToDigi.CastorRawToDigi_cfi.castorDigis.clone( FEDs = cms.untracked.vint32(690,691,692) )
 
 siStripDigis = EventFilter.SiStripRawToDigi.SiStripDigis_cfi.siStripDigis.clone()
@@ -157,6 +155,7 @@
     EBPileInputTag = cms.InputTag("ecalDigis","ebDigis","@MIXING"),
     EEPileInputTag = cms.InputTag("ecalDigis","eeDigis","@MIXING"),
     ESPileInputTag = cms.InputTag("ecalPreshowerDigis","","@MIXING"),
+    #ESPileInputTag = cms.InputTag("esRawToDigi","","@MIXING"),
     HBHEPileInputTag = cms.InputTag("hcalDigis","","@MIXING"),
     HOPileInputTag   = cms.InputTag("hcalDigis","","@MIXING"),
     HFPileInputTag   = cms.InputTag("hcalDigis","","@MIXING"),
@@ -182,7 +181,6 @@
 #    CSCWirePileInputTag   = cms.InputTag("muonCSCDigis","MuonCSCWireDigi","@MIXING"),
 #    CSCStripPileInputTag  = cms.InputTag("muonCSCDigis","MuonCSCStripDigi","@MIXING"),
 #    CSCCompPileInputTag   = cms.InputTag("muonCSCDigis","MuonCSCComparatorDigi","@MIXING"),
-
                    #
     #
     #  Outputs

diff --git a/SimGeneral/MixingModule/python/digi_noNoise_cfi.py b/SimGeneral/MixingModule/python/digi_noNoise_cfi.py
@@ -38,6 +38,7 @@
 theDigitizersNoNoise.pixel.AddNoise = cms.bool(True)
 theDigitizersNoNoise.pixel.addNoisyPixels = cms.bool(False)
 theDigitizersNoNoise.strip.Noise = cms.bool(False)
+theDigitizersNoNoise.strip.PreMixingMode = cms.bool(True)
+theDigitizersNoNoise.strip.FedAlgorithm = cms.int32(5) # special ZS mode: accept adc>0
 theDigitizersNoNoise.ecal.EcalPreMixStage1 = cms.bool(True)
 theDigitizersNoNoise.hcal.HcalPreMixStage1 = cms.bool(True)
-#Need Hcal statement - change variable