Import Geant4 8.0.0 source tree
This commit is contained in:
@@ -64,7 +64,7 @@
|
||||
int main(int argc,char** argv) {
|
||||
|
||||
// choose the Random engine
|
||||
HepRandom::setTheEngine(new RanecuEngine);
|
||||
CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
|
||||
|
||||
// Construct the default run manager
|
||||
G4RunManager * runManager = new G4RunManager;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-------------------------------------------------------------------
|
||||
$Id:
|
||||
$Id: History,v 1.9 2005/12/07 16:26:39 guatelli Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -8,12 +8,17 @@ $Id:
|
||||
|
||||
Category History file
|
||||
---------------------
|
||||
07.12.2005 - S. Guatelli (DMX-V07-01-02)
|
||||
Compiles with CLHEP 2.0.2.2
|
||||
|
||||
3rd May 2005 John Allison (examples-V07-00-03)
|
||||
- Replaced vis manager with G4VisExecutive.
|
||||
15.11.2005 - G.Cosmo (DMX-V07-01-00)
|
||||
Migration to <sstream> from deprecated <strstream>.
|
||||
|
||||
03.05.2005 - J.Allison
|
||||
Replaced vis manager with G4VisExecutive.
|
||||
|
||||
07.12.2004 - S. Guatelli (DMX-V06-02-02)
|
||||
G4VParticleChange migrated
|
||||
G4VParticleChange migrated
|
||||
|
||||
29.11.2004 - S. Guatelli (DMX-V06-02-00)
|
||||
Migrated to <cmath>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: DMXMinEkineCuts.hh,v 1.2 2002/06/18 10:17:30 ahoward Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
|
||||
@@ -34,6 +34,12 @@
|
||||
// (27th November 2001)
|
||||
//
|
||||
// PhysicsList header
|
||||
//
|
||||
// History:
|
||||
// -------
|
||||
// 5/12/05: AH - modified member functions for new hadronic constructor
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
|
||||
#ifndef DMXPhysicsList_h
|
||||
@@ -94,9 +100,7 @@ private:
|
||||
// these methods Construct particles
|
||||
void ConstructMyBosons();
|
||||
void ConstructMyLeptons();
|
||||
void ConstructMyMesons();
|
||||
void ConstructMyBaryons();
|
||||
void ConstructMyIons();
|
||||
void ConstructMyHadrons();
|
||||
void ConstructMyShortLiveds();
|
||||
|
||||
};
|
||||
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
#include "DMXEventActionMessenger.hh"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "DMXEventAction.hh"
|
||||
|
||||
#include "G4UIdirectory.hh"
|
||||
@@ -126,7 +128,7 @@ void DMXEventActionMessenger::SetNewValue
|
||||
if(command == DrawHitsCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
eventAction->SetDrawHitsFlag(vl!=0);
|
||||
}
|
||||
@@ -134,7 +136,7 @@ void DMXEventActionMessenger::SetNewValue
|
||||
if(command == SavePmtCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
eventAction->SetSavePmtFlag(vl!=0);
|
||||
}
|
||||
@@ -142,7 +144,7 @@ void DMXEventActionMessenger::SetNewValue
|
||||
if(command == SaveHitsCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
eventAction->SetSaveHitsFlag(vl!=0);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: DMXMinEkineCuts.cc,v 1.4 2003/12/02 16:59:48 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-07-01 $
|
||||
// GEANT4 tag $Name: geant4-08-00 $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include "G4Tokenizer.hh"
|
||||
#include <strstream>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
DMXParticleSourceMessenger::DMXParticleSourceMessenger
|
||||
|
||||
@@ -39,6 +39,10 @@
|
||||
//
|
||||
// 14-02-03 Fix bugs in msc and hIon instanciation + cut per region
|
||||
//
|
||||
// 05-02-05 AH - changes to G4Decay - added is not short lived protection
|
||||
// and redefined particles to allow non-static creation
|
||||
// i.e. changed construction to G4MesonConstructor, G4BaryonConstructor
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
|
||||
#include "DMXPhysicsList.hh"
|
||||
@@ -90,9 +94,7 @@ void DMXPhysicsList::ConstructParticle()
|
||||
|
||||
ConstructMyBosons();
|
||||
ConstructMyLeptons();
|
||||
ConstructMyMesons();
|
||||
ConstructMyBaryons();
|
||||
ConstructMyIons();
|
||||
ConstructMyHadrons();
|
||||
ConstructMyShortLiveds();
|
||||
|
||||
}
|
||||
@@ -130,46 +132,28 @@ void DMXPhysicsList::ConstructMyLeptons()
|
||||
}
|
||||
|
||||
|
||||
// construct Mesons://///////////////////////////////////////////////////
|
||||
void DMXPhysicsList::ConstructMyMesons()
|
||||
#include "G4MesonConstructor.hh"
|
||||
#include "G4BaryonConstructor.hh"
|
||||
#include "G4IonConstructor.hh"
|
||||
|
||||
// construct Hadrons://///////////////////////////////////////////////////
|
||||
void DMXPhysicsList::ConstructMyHadrons()
|
||||
{
|
||||
// mesons
|
||||
G4PionPlus::PionPlusDefinition();
|
||||
G4PionMinus::PionMinusDefinition();
|
||||
G4PionZero::PionZeroDefinition();
|
||||
G4KaonPlus::KaonPlusDefinition();
|
||||
G4KaonMinus::KaonMinusDefinition();
|
||||
G4Eta::EtaDefinition();
|
||||
G4EtaPrime::EtaPrimeDefinition();
|
||||
G4KaonZero::KaonZeroDefinition();
|
||||
G4AntiKaonZero::AntiKaonZeroDefinition();
|
||||
G4KaonZeroLong::KaonZeroLongDefinition();
|
||||
G4KaonZeroShort::KaonZeroShortDefinition();
|
||||
G4MesonConstructor mConstructor;
|
||||
mConstructor.ConstructParticle();
|
||||
|
||||
// baryons
|
||||
G4BaryonConstructor bConstructor;
|
||||
bConstructor.ConstructParticle();
|
||||
|
||||
// ions
|
||||
G4IonConstructor iConstructor;
|
||||
iConstructor.ConstructParticle();
|
||||
|
||||
}
|
||||
|
||||
|
||||
// construct Baryons://///////////////////////////////////////////////////
|
||||
void DMXPhysicsList::ConstructMyBaryons()
|
||||
{
|
||||
// barions
|
||||
G4Proton::ProtonDefinition();
|
||||
G4AntiProton::AntiProtonDefinition();
|
||||
G4Neutron::NeutronDefinition();
|
||||
G4AntiNeutron::AntiNeutronDefinition();
|
||||
}
|
||||
|
||||
|
||||
// construct Ions://///////////////////////////////////////////////////
|
||||
void DMXPhysicsList::ConstructMyIons()
|
||||
{
|
||||
// Ions
|
||||
G4Deuteron::DeuteronDefinition();
|
||||
G4Triton::TritonDefinition();
|
||||
G4He3::He3Definition();
|
||||
G4Alpha::AlphaDefinition();
|
||||
G4GenericIon::GenericIonDefinition();
|
||||
}
|
||||
|
||||
// construct Shortliveds://///////////////////////////////////////////////////
|
||||
void DMXPhysicsList::ConstructMyShortLiveds()
|
||||
{
|
||||
@@ -255,6 +239,9 @@ void DMXPhysicsList::AddTransportation() {
|
||||
//OTHERS:
|
||||
//#include "G4hIonisation.hh" // standard hadron ionisation
|
||||
|
||||
//em process options to allow msc step-limitation to be switched off
|
||||
#include "G4EmProcessOptions.hh"
|
||||
|
||||
void DMXPhysicsList::ConstructEM() {
|
||||
|
||||
// processes:
|
||||
@@ -367,6 +354,11 @@ void DMXPhysicsList::ConstructEM() {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// turn off msc step-limitation - especially as electron cut 1nm
|
||||
G4EmProcessOptions opt;
|
||||
opt.SetMscStepLimitation(false);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -749,7 +741,7 @@ void DMXPhysicsList::ConstructGeneral() {
|
||||
G4ParticleDefinition* particle = theParticleIterator->value();
|
||||
G4ProcessManager* pmanager = particle->GetProcessManager();
|
||||
|
||||
if (theDecayProcess->IsApplicable(*particle))
|
||||
if (theDecayProcess->IsApplicable(*particle) && !particle->IsShortLived())
|
||||
{
|
||||
pmanager ->AddProcess(theDecayProcess);
|
||||
// set ordering for PostStepDoIt and AtRestDoIt
|
||||
|
||||
@@ -84,8 +84,8 @@ void DMXPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) {
|
||||
|
||||
// seeds
|
||||
// seeds = HepRandom::getTheSeeds();
|
||||
seeds[0] = *HepRandom::getTheSeeds();
|
||||
seeds[1] = *(HepRandom::getTheSeeds()+1);
|
||||
seeds[0] = *CLHEP::HepRandom::getTheSeeds();
|
||||
seeds[1] = *(CLHEP::HepRandom::getTheSeeds()+1);
|
||||
|
||||
particleGun->GeneratePrimaryVertex(anEvent);
|
||||
|
||||
|
||||
@@ -37,6 +37,9 @@
|
||||
// --------------------------------------------------------------
|
||||
|
||||
#include "DMXRunActionMessenger.hh"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "DMXRunAction.hh"
|
||||
|
||||
#include "G4UIcmdWithAString.hh"
|
||||
@@ -110,7 +113,7 @@ void DMXRunActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
|
||||
if(command == PlotEventCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
DMXRun->Setplotevent(vl!=0);
|
||||
}
|
||||
@@ -118,7 +121,7 @@ void DMXRunActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
|
||||
if(command == InteractPlotCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
DMXRun->Setinteractplot(vl!=0);
|
||||
}
|
||||
|
||||
@@ -37,6 +37,9 @@
|
||||
// --------------------------------------------------------------
|
||||
|
||||
#include "DMXStackingActionMessenger.hh"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "DMXStackingAction.hh"
|
||||
|
||||
#include "G4UIcmdWithABool.hh"
|
||||
@@ -67,7 +70,7 @@ void DMXStackingActionMessenger::SetNewValue
|
||||
if(command==KillGammasCmd) {
|
||||
G4int vl;
|
||||
const char* t = newValue;
|
||||
std::istrstream is((char*)t);
|
||||
std::istringstream is(t);
|
||||
is >> vl;
|
||||
DMXAction->SetKillGammasFlag(vl!=0);
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
/vis/open HepRep
|
||||
/vis/open HepRepXML
|
||||
/vis/drawVolume
|
||||
/vis/viewer/update
|
||||
|
||||
Reference in New Issue
Block a user