Import Geant4 8.1.0 source tree

source/run/src/G4RunManager.cc

@@ -1,28 +1,31 @@
 //
 // ********************************************************************
-// * DISCLAIMER                                                       *
+// * License and Disclaimer                                           *
 // *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
 // *                                                                  *
 // * Neither the authors of this software system, nor their employing *
 // * institutes,nor the agencies providing financial support for this *
 // * work  make  any representation or  warranty, express or implied, *
 // * regarding  this  software system or assume any liability for its *
-// * use.                                                             *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
 // *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
 //
-// $Id: G4RunManager.cc,v 1.88 2005/11/09 10:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-08-00 $
+// $Id: G4RunManager.cc,v 1.90.2.1 2006/06/29 21:13:50 gunter Exp $
+// GEANT4 tag $Name: geant4-08-01 $
 //
 // 
 
@@ -83,6 +86,10 @@ G4RunManager::G4RunManager()
   G4ParticleTable::GetParticleTable()->CreateMessenger();
   G4ProcessTable::GetProcessTable()->CreateMessenger();
   randomNumberStatusDir = "./";
+  std::ostringstream oss;
+  HepRandom::saveFullState(oss);
+  randomNumberStatusForThisRun = oss.str();
+  randomNumberStatusForThisEvent = oss.str();
 }
 
 G4RunManager::~G4RunManager()
@@ -179,21 +186,26 @@ void G4RunManager::RunInitialization()
   if(fSDM)
   { currentRun->SetHCtable(fSDM->GetHCtable()); }
   
-  if(userRunAction) userRunAction->BeginOfRunAction(currentRun);
-
-  for(size_t itr=0;itr<previousEvents->size();itr++)
-  { delete (*previousEvents)[itr]; }
-  previousEvents->clear();
-  for(G4int i_prev=0;i_prev<n_perviousEventsToBeStored;i_prev++)
-  { previousEvents->push_back((G4Event*)0); }
-
-  runAborted = false;
+  std::ostringstream oss;
+  HepRandom::saveFullState(oss);
+  randomNumberStatusForThisRun = oss.str();
+  currentRun->SetRandomNumberStatus(randomNumberStatusForThisRun);
 
   if(storeRandomNumberStatus) {
     G4String fileN = randomNumberStatusDir + "currentRun.rndm"; 
     HepRandom::saveEngineStatus(fileN);
   }
   
+  for(size_t itr=0;itr<previousEvents->size();itr++)
+  { delete (*previousEvents)[itr]; }
+  previousEvents->clear();
+  for(G4int i_prev=0;i_prev<n_perviousEventsToBeStored;i_prev++)
+  { previousEvents->push_back((G4Event*)0); }
+
+  if(userRunAction) userRunAction->BeginOfRunAction(currentRun);
+
+  runAborted = false;
+
   if(verboseLevel>0) G4cout << "Start Run processing." << G4endl;
 }
 
@@ -248,6 +260,11 @@ G4Event* G4RunManager::GenerateEvent(G4int i_event)
 
   G4Event* anEvent = new G4Event(i_event);
 
+  std::ostringstream oss;
+  HepRandom::saveFullState(oss);
+  randomNumberStatusForThisEvent = oss.str();
+  anEvent->SetRandomNumberStatus(randomNumberStatusForThisEvent);
+
   if(storeRandomNumberStatus) {
     G4String fileN = randomNumberStatusDir + "currentEvent.rndm"; 
     HepRandom::saveEngineStatus(fileN);
@@ -321,6 +338,7 @@ void G4RunManager::InitializeGeometry()
 
   if(verboseLevel>1) G4cout << "userDetector->Construct() start." << G4endl;
   kernel->DefineWorldVolume(userDetector->Construct(),false);
+  //////////////////////////////////////////////userDetector->ConstructParallelGeometries();
   geometryInitialized = true;
 }