lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/electromagnetic/TestEm11/src/DetectorConstruction.cc
+4 -6
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm11/src/DetectorConstruction.cc
/// \brief Implementation of the DetectorConstruction class
//
// $Id: DetectorConstruction.cc 77288 2013-11-22 10:52:58Z gcosmo $
// $Id: DetectorConstruction.cc 98749 2016-08-09 13:43:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -67,7 +67,7 @@ DetectorConstruction::DetectorConstruction()
fAbsorThickness[0] = 0*mm; //dummy, for initialization
fAbsorThickness[1] = 1*mm;
fAbsorSizeYZ = 1.*mm;
for (G4int iAbs=0; iAbs<MaxAbsor; iAbs++) {
for (G4int iAbs=0; iAbs<kMaxAbsor; iAbs++) {
fNbOfDivisions[iAbs] = 1;
}
ComputeParameters();
@@ -230,7 +230,6 @@ G4VPhysicalVolume* DetectorConstruction::ConstructVolumes()
LayerThickness); //witdth of replica
}
PrintParameters();
//always return the physical World
@@ -260,9 +259,9 @@ void DetectorConstruction::SetNbOfAbsor(G4int ival)
{
// set the number of Absorbers
//
if (ival < 1 || ival > (MaxAbsor-1))
if (ival < 1 || ival > (kMaxAbsor-1))
{ G4cout << "\n ---> warning from SetfNbOfAbsor: "
<< ival << " must be at least 1 and and most " << MaxAbsor-1
<< ival << " must be at least 1 and and most " << kMaxAbsor-1
<< ". Command refused" << G4endl;
return;
}
@@ -346,7 +345,6 @@ void DetectorConstruction::SetNbOfDivisions(G4int iabs, G4int ival)
G4RunManager::GetRunManager()->ReinitializeGeometry();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void DetectorConstruction::ConstructSDandField()
examples/extended/electromagnetic/TestEm11/src/EventAction.cc
+2 -3
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm11/src/EventAction.cc
/// \brief Implementation of the EventAction class
//
// $Id: EventAction.cc 95740 2016-02-23 09:34:37Z gcosmo $
// $Id: EventAction.cc 98749 2016-08-09 13:43:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -56,7 +56,7 @@ EventAction::~EventAction()
void EventAction::BeginOfEventAction(const G4Event*)
{
//energy deposited per event
for (G4int k=0; k<MaxAbsor; k++) { fEdepAbsor[k] = 0.0; }
for (G4int k=0; k<kMaxAbsor; k++) { fEdepAbsor[k] = 0.0; }
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -86,4 +86,3 @@ void EventAction::EndOfEventAction(const G4Event*)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/electromagnetic/TestEm11/src/HistoManager.cc
+3 -3
View File
@@ -23,11 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file electromagnetic/TestEm5/src/HistoManager.cc
/// \file electromagnetic/TestEm11/src/HistoManager.cc
/// \brief Implementation of the HistoManager class
//
//
// $Id: HistoManager.cc 95740 2016-02-23 09:34:37Z gcosmo $
// $Id: HistoManager.cc 98749 2016-08-09 13:43:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -96,7 +96,7 @@ void HistoManager::Book()
}
G4String title2;
for (G4int k=1; k<MaxAbsor; k++) {
for (G4int k=1; k<kMaxAbsor; k++) {
title2 = "Edep in absorber " + id[k];
G4int ih
= analysisManager->CreateH1(id[kMaxHisto+k], title2, nbins, vmin, vmax);
examples/extended/electromagnetic/TestEm11/src/PhysListEmStandard.cc
+5 -4
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: PhysListEmStandard.cc 96377 2016-04-11 06:59:03Z gcosmo $
// $Id: PhysListEmStandard.cc 100280 2016-10-17 08:36:57Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -95,9 +95,10 @@ void PhysListEmStandard::ConstructProcess()
// Add standard EM Processes
//
aParticleIterator->reset();
while( (*aParticleIterator)() ){
G4ParticleDefinition* particle = aParticleIterator->value();
auto particleIterator=GetParticleIterator();
particleIterator->reset();
while( (*particleIterator)() ){
G4ParticleDefinition* particle = particleIterator->value();
G4String particleName = particle->GetParticleName();
if (particleName == "gamma") {
examples/extended/electromagnetic/TestEm11/src/PhysicsList.cc
+9 -7
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm11/src/PhysicsList.cc
/// \brief Implementation of the PhysicsList class
//
// $Id: PhysicsList.cc 96377 2016-04-11 06:59:03Z gcosmo $
// $Id: PhysicsList.cc 100280 2016-10-17 08:36:57Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -230,9 +230,10 @@ void PhysicsList::AddDecay()
//
G4Decay* fDecayProcess = new G4Decay();
theParticleIterator->reset();
while( (*theParticleIterator)() ){
G4ParticleDefinition* particle = theParticleIterator->value();
auto particleIterator=GetParticleIterator();
particleIterator->reset();
while( (*particleIterator)() ){
G4ParticleDefinition* particle = particleIterator->value();
G4ProcessManager* pmanager = particle->GetProcessManager();
if (fDecayProcess->IsApplicable(*particle) && !particle->IsShortLived()) {
@@ -276,9 +277,10 @@ void PhysicsList::AddStepMax()
// Step limitation seen as a process
fStepMaxProcess = new StepMax();
theParticleIterator->reset();
while ((*theParticleIterator)()){
G4ParticleDefinition* particle = theParticleIterator->value();
auto particleIterator=GetParticleIterator();
particleIterator->reset();
while ((*particleIterator)()){
G4ParticleDefinition* particle = particleIterator->value();
G4ProcessManager* pmanager = particle->GetProcessManager();
if (fStepMaxProcess->IsApplicable(*particle))
examples/extended/electromagnetic/TestEm11/src/Run.cc
+1 -1
View File
@@ -57,7 +57,7 @@ Run::Run(DetectorConstruction* detector)
{
for (G4int i=0; i<3; ++i) { fStatus[i] = 0; fTotEdep[i] = 0.; }
fTotEdep[1] = joule;
for (G4int i=0; i<MaxAbsor; ++i) {
for (G4int i=0; i<kMaxAbsor; ++i) {
fEdeposit[i] = 0.; fEmin[i] = joule; fEmax[i] = 0.;
fCsdaRange[i] = 0.; fXfrontNorm[i] = 0.;
}
examples/extended/electromagnetic/TestEm11/src/StepMax.cc
+1 -2
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm11/src/StepMax.cc
/// \brief Implementation of the StepMax class
//
// $Id: StepMax.cc 67268 2013-02-13 11:38:40Z ihrivnac $
// $Id: StepMax.cc 98749 2016-08-09 13:43:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -91,4 +91,3 @@ G4VParticleChange* StepMax::PostStepDoIt(const G4Track& aTrack, const G4Step&)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/electromagnetic/TestEm11/src/SteppingAction.cc
+1 -2
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm11/src/SteppingAction.cc
/// \brief Implementation of the SteppingAction class
//
// $Id: SteppingAction.cc 95740 2016-02-23 09:34:37Z gcosmo $
// $Id: SteppingAction.cc 98749 2016-08-09 13:43:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -103,4 +103,3 @@ void SteppingAction::UserSteppingAction(const G4Step* step)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/electromagnetic/TestEm11/src/SteppingVerbose.cc
+2 -2
View File
@@ -23,11 +23,11 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
/// \file radioactivedecay/rdecay01/src/SteppingVerbose.cc
/// \file electromagnetic/TestEm11/src/SteppingVerbose.cc
/// \brief Implementation of the SteppingVerbose class
//
//
// $Id: SteppingVerbose.cc 71390 2013-06-14 13:21:31Z gcosmo $
// $Id: SteppingVerbose.cc 98277 2016-07-04 18:01:33Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......