Merge CMSSW_9_4_X into CMSSW_9_4_AN_X.

cms-sw · Aug 28, 2018 · b842efe · b842efe
2 parents 3dd5c7e + 994fca2
commit b842efe
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 38 deletions.
diff --git a/FastSimulation/Calorimetry/src/CalorimetryManager.cc b/FastSimulation/Calorimetry/src/CalorimetryManager.cc
@@ -172,7 +172,7 @@ CalorimetryManager::~CalorimetryManager()
 
 void CalorimetryManager::reconstruct(RandomEngineAndDistribution const* random)
 {
-
+  theHFShowerLibrary->SetRandom(random);
   if(!evtsToDebug_.empty())
     {
       std::vector<unsigned int>::const_iterator itcheck=find(evtsToDebug_.begin(),evtsToDebug_.end(),mySimEvent->id().event());
@@ -196,6 +196,8 @@ void CalorimetryManager::reconstruct(RandomEngineAndDistribution const* random)
       initialized_=true;
     }
   clean();
+
+
 
   LogInfo("FastCalorimetry") << "Reconstructing " << (int) mySimEvent->nTracks() << " tracks." << std::endl;
   for( int fsimi=0; fsimi < (int) mySimEvent->nTracks() ; ++fsimi) {
@@ -555,6 +557,8 @@ void CalorimetryManager::reconstructHCAL(const FSimTrack& myTrack,
 void CalorimetryManager::HDShowerSimulation(const FSimTrack& myTrack, RandomEngineAndDistribution const* random){//,
   // const edm::ParameterSet& fastCalo){
 
+  theHFShowerLibrary->SetRandom(random);
+
   //  TimeMe t(" FASTEnergyReconstructor::HDShower");
   const XYZTLorentzVector& moment = myTrack.momentum();
 

diff --git a/FastSimulation/EventProducer/src/FamosProducer.cc b/FastSimulation/EventProducer/src/FamosProducer.cc
@@ -2,6 +2,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
@@ -52,7 +53,7 @@ FamosProducer::FamosProducer(edm::ParameterSet const & p)
 }
 
 FamosProducer::~FamosProducer() 
-{ if ( famosManager_ ) delete famosManager_; }
+{ delete famosManager_; }
 
 void
 FamosProducer::beginRun(edm::Run const& run, const edm::EventSetup & es) {
@@ -117,7 +118,6 @@ void FamosProducer::produce(edm::Event & iEvent, const edm::EventSetup & es)
    iEvent.put(std::move(p5),"EcalHitsEE");
    iEvent.put(std::move(p6),"EcalHitsES");
    iEvent.put(std::move(p7),"HcalHits");
-
 }
 
 DEFINE_FWK_MODULE(FamosProducer);
diff --git a/FastSimulation/ShowerDevelopment/interface/FastHFShowerLibrary.h b/FastSimulation/ShowerDevelopment/interface/FastHFShowerLibrary.h
@@ -36,6 +36,7 @@ class DDCompactView;
 class FSimEvent;
 class FSimTrack;
 class HFShowerLibrary;
+class RandomEngineAndDistribution;
 
 class FastHFShowerLibrary {
 
@@ -52,6 +53,8 @@ class FastHFShowerLibrary {
   void                modifyDepth(uint32_t &id);
   const std::map<CaloHitID,float>& getHitsMap() { return hitMap; };
 
+  void  SetRandom(const RandomEngineAndDistribution *);
+
 private:
 
   const edm::ParameterSet fast;

diff --git a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc
@@ -6,6 +6,7 @@
 #include "FastSimulation/ShowerDevelopment/interface/FastHFShowerLibrary.h"
 #include "FastSimulation/Event/interface/FSimEvent.h"
 #include "FastSimulation/Event/interface/FSimTrack.h"
+#include "FastSimulation/Utilities/interface/RandomEngineAndDistribution.h"
 #include "SimG4CMS/Calo/interface/HFFibreFiducial.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
@@ -72,6 +73,15 @@ void const FastHFShowerLibrary::initHFShowerLibrary(const edm::EventSetup& iSetu
   hfshower->initRun(partTable, hcalConstants); // init particle code
 }
 
+void FastHFShowerLibrary::SetRandom(const RandomEngineAndDistribution * rnd)
+{
+  // define Geant4 engine per thread
+  G4Random::setTheEngine(&(rnd->theEngine()));
+  LogDebug("FastHFShowerLibrary::recoHFShowerLibrary") 
+    << "Begin of event " << G4UniformRand() << "  " 
+    << rnd->theEngine().name() << "  " << rnd->theEngine();
+}
+
 void FastHFShowerLibrary::recoHFShowerLibrary(const FSimTrack& myTrack) {
 
 #ifdef DebugLog

diff --git a/FastSimulation/TrackingRecHitProducer/interface/TrackingRecHitAlgorithm.h b/FastSimulation/TrackingRecHitProducer/interface/TrackingRecHitAlgorithm.h
@@ -6,10 +6,8 @@
 
 #include "FastSimulation/TrackingRecHitProducer/interface/TrackingRecHitProduct.h"
 
-//#include "CLHEP/Random/RandomEngine.h"
 #include "FastSimulation/Utilities/interface/RandomEngineAndDistribution.h"
 
-
 #include <string>
 #include <memory>
 

diff --git a/FastSimulation/TrackingRecHitProducer/src/TrackingRecHitAlgorithm.cc b/FastSimulation/TrackingRecHitProducer/src/TrackingRecHitAlgorithm.cc
@@ -20,7 +20,7 @@
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 TrackingRecHitAlgorithm::TrackingRecHitAlgorithm(
     const std::string& name,
@@ -74,7 +74,7 @@ const RandomEngineAndDistribution& TrackingRecHitAlgorithm::getRandomEngine() co
 
 void TrackingRecHitAlgorithm::beginStream(const edm::StreamID& id)
 {
-    _randomEngine = std::make_shared<RandomEngineAndDistribution>(id);
+  _randomEngine = std::make_shared<RandomEngineAndDistribution>(id);
 }
 
 void TrackingRecHitAlgorithm::beginEvent(edm::Event& event, const edm::EventSetup& eventSetup)
@@ -90,6 +90,7 @@ void TrackingRecHitAlgorithm::beginEvent(edm::Event& event, const edm::EventSetu
     _trackerTopology = trackerTopologyHandle.product();
     _trackerGeometry = trackerGeometryHandle.product();
     _misalignedTrackerGeometry = misalignedGeometryHandle.product();
+
 }
 
 TrackingRecHitProductPtr TrackingRecHitAlgorithm::process(TrackingRecHitProductPtr product) const

diff --git a/FastSimulation/Utilities/interface/RandomEngineAndDistribution.h b/FastSimulation/Utilities/interface/RandomEngineAndDistribution.h
@@ -27,35 +27,19 @@ class RandomEngineAndDistribution {
   CLHEP::HepRandomEngine& theEngine() const { return *engine_; }
 
   inline double flatShoot(double xmin=0.0, double xmax=1.0) const {
-    if(rootEngine_) {
-      return xmin + (xmax - xmin) * rootEngine_->Rndm();
-    } else {
-      CLHEP::RandFlat flatDistribution(*engine_);
-      return xmin + (xmax - xmin) * flatDistribution.fire();
-    }
+    return xmin + (xmax - xmin) * engine_->flat();
   }
 
   inline double gaussShoot(double mean=0.0, double sigma=1.0) const {
-    if(rootEngine_) {
-      return rootEngine_->Gaus(mean,sigma);
-    } else {
-      CLHEP::RandGaussQ gaussianDistribution(*engine_);
-      return mean + sigma * gaussianDistribution.fire();
-    }
+    return CLHEP::RandGauss::shoot(engine_, mean, sigma);
   }
 
   inline unsigned int poissonShoot(double mean) const{
-    if(rootEngine_) {
-      return rootEngine_->Poisson(mean);
-    } else {
-      CLHEP::RandPoissonQ poissonDistribution(*engine_);
-      return poissonDistribution.fire(mean);
-    }
+    return CLHEP::RandPoissonQ::shoot(engine_, mean);
   }
 
  private:
 
   CLHEP::HepRandomEngine* engine_;
-  TRandom3* rootEngine_;
 };
 #endif // FastSimulation_Utilities_RandomEngineAndDistribution_H
diff --git a/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc b/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc
@@ -8,8 +8,7 @@
 #include "CLHEP/Random/RandomEngine.h"
 
 RandomEngineAndDistribution::RandomEngineAndDistribution(edm::StreamID const& streamID) :
-  engine_(nullptr),
-  rootEngine_(nullptr) {
+  engine_(nullptr) {
   edm::Service<edm::RandomNumberGenerator> rng;
   if ( ! rng.isAvailable() ) {
     throw cms::Exception("Configuration") <<
@@ -18,15 +17,10 @@ RandomEngineAndDistribution::RandomEngineAndDistribution(edm::StreamID const& st
       "or remove the module that requires it.";
   }
   engine_ = &rng->getEngine(streamID);
-
-  // Get the TRandom3 egine, to benefit from Root functional random generation
-  if ( engine_->name() == "TRandom3" )
-    rootEngine_ = ( (edm::TRandomAdaptor*) engine_ )->getRootEngine();
 }
 
 RandomEngineAndDistribution::RandomEngineAndDistribution(edm::LuminosityBlockIndex const& luminosityBlockIndex) :
-  engine_(nullptr),
-  rootEngine_(nullptr) {
+  engine_(nullptr) {
   edm::Service<edm::RandomNumberGenerator> rng;
   if ( ! rng.isAvailable() ) {
     throw cms::Exception("Configuration") <<
@@ -35,10 +29,6 @@ RandomEngineAndDistribution::RandomEngineAndDistribution(edm::LuminosityBlockInd
       "or remove the module that requires it.";
   }
   engine_ = &rng->getEngine(luminosityBlockIndex);
-
-  // Get the TRandom3 egine, to benefit from Root functional random generation
-  if ( engine_->name() == "TRandom3" )
-    rootEngine_ = ( (edm::TRandomAdaptor*) engine_ )->getRootEngine();
 }
 
 RandomEngineAndDistribution::~RandomEngineAndDistribution() {