Import Geant4 8.0.0 source tree
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
// the relevant particles. Optical processes are declared.
|
||||
//
|
||||
#include "G4ios.hh"
|
||||
#include "iomanip.h"
|
||||
//#include "iomanip.h"
|
||||
#include "globals.hh"
|
||||
|
||||
#include "UltraPhysicsList.hh"
|
||||
|
||||
@@ -56,8 +56,8 @@ UltraRunAction::UltraRunAction()
|
||||
|
||||
G4int seed = 1; // RANLUX seed
|
||||
G4int luxury = 3; // RANLUX luxury level (3 is default)
|
||||
HepRandom::setTheSeed(seed,luxury);
|
||||
HepRandom::showEngineStatus();
|
||||
CLHEP::HepRandom::setTheSeed(seed,luxury);
|
||||
CLHEP::HepRandom::showEngineStatus();
|
||||
|
||||
theRunActMessenger = new UltraRunActionMessenger(this);
|
||||
}
|
||||
@@ -83,8 +83,8 @@ void UltraRunAction::BeginOfRunAction(const G4Run* aRun)
|
||||
|
||||
// save Rndm status
|
||||
if (saveRndm > 0)
|
||||
{ HepRandom::showEngineStatus();
|
||||
HepRandom::saveEngineStatus("beginOfRun.rndm");
|
||||
{ CLHEP::HepRandom::showEngineStatus();
|
||||
CLHEP::HepRandom::saveEngineStatus("beginOfRun.rndm");
|
||||
}
|
||||
|
||||
G4UImanager* UI = G4UImanager::GetUIpointer();
|
||||
@@ -103,8 +103,8 @@ void UltraRunAction::EndOfRunAction(const G4Run* aRun)
|
||||
|
||||
// save Rndm status
|
||||
if (saveRndm == 1)
|
||||
{ HepRandom::showEngineStatus();
|
||||
HepRandom::saveEngineStatus("endOfRun.rndm");
|
||||
{ CLHEP::HepRandom::showEngineStatus();
|
||||
CLHEP::HepRandom::saveEngineStatus("endOfRun.rndm");
|
||||
}
|
||||
|
||||
// Write histograms to file
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "G4UIparameter.hh"
|
||||
#include "G4UImanager.hh"
|
||||
#include "G4ios.hh"
|
||||
#include <strstream>
|
||||
#include <sstream>
|
||||
|
||||
UltraRunActionMessenger::UltraRunActionMessenger(UltraRunAction* aRunAction)
|
||||
:theRunAction(aRunAction)
|
||||
@@ -70,7 +70,7 @@ void UltraRunActionMessenger::SetNewValue(G4UIcommand * command,G4String newValu
|
||||
if( command==runIDCmd )
|
||||
{
|
||||
G4int id;
|
||||
std::istrstream is((char*)nv);
|
||||
std::istringstream is(nv);
|
||||
is >> id;
|
||||
|
||||
theRunAction->MySetRunID(id);
|
||||
|
||||
Reference in New Issue
Block a user