Merge pull request #20666 from skurz/new-fastsim-geometry_reb

New fastsim geometry reb
cms-sw · Feb 9, 2018 · 71eb66c · 71eb66c
2 parents ea1e9ff + 0c0d5f3
commit 71eb66c
Show file tree

Hide file tree

Showing 128 changed files with 7,826 additions and 476 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -1409,7 +1409,7 @@ def prepare_SIM(self, sequence = None):
 			self.executeAndRemember("process.g4SimHits.UseMagneticField = cms.bool(False)")
 	else:
 		if self._options.magField=='0T':
-			self.executeAndRemember("process.famosSimHits.UseMagneticField = cms.bool(False)")
+			self.executeAndRemember("process.fastSimProducer.detectorDefinition.magneticFieldZ = cms.untracked.double(0.)")
 
 	self.scheduleSequence(sequence.split('.')[-1],'simulation_step')
         return

diff --git a/FastSimulation/Calorimetry/interface/CalorimetryManager.h b/FastSimulation/Calorimetry/interface/CalorimetryManager.h
@@ -55,6 +55,8 @@ class CalorimetryManager{
   ~CalorimetryManager();
 
   // Does the real job
+  void initialize(RandomEngineAndDistribution const* random);
+  void reconstructTrack(FSimTrack& myTrack, RandomEngineAndDistribution const*);
   void reconstruct(RandomEngineAndDistribution const*);
 
   // Return the address of the Calorimeter 
@@ -73,6 +75,8 @@ class CalorimetryManager{
   void loadFromPreshower(edm::PCaloHitContainer & c) const;
 
   void loadMuonSimTracks(edm::SimTrackContainer & m) const;
+
+  void harvestMuonSimTracks(edm::SimTrackContainer & m) const;
 
  private:
   // Simulation of electromagnetic showers in PS, ECAL, HCAL
@@ -168,6 +172,7 @@ class CalorimetryManager{
   bool initialized_;
 
   std::vector<FSimTrack> muonSimTracks;
+  std::vector<FSimTrack> savedMuonSimTracks;
   MaterialEffects* theMuonEcalEffects; // material effects for muons in ECAL
   MaterialEffects* theMuonHcalEffects; // material effects for muons in HCAL