Import Geant4 10.5.0 source tree

This commit is contained in:
Gabriele Cosmo
2018-12-07 15:15:39 +01:00
parent 6aa23be517
commit db49709b53
11370 changed files with 187480 additions and 160142 deletions
@@ -23,7 +23,6 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: ActionInitialization.cc 68058 2013-03-13 14:47:43Z gcosmo $
//
/// \file ActionInitialization.cc
/// \brief Implementation of the ActionInitialization class
@@ -26,7 +26,6 @@
/// \file DetectorConstruction.cc
/// \brief Implementation of the DetectorConstruction class
//
// $Id: DetectorConstruction.cc 108917 2018-03-16 07:18:27Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file DetectorMessenger.cc
/// \brief Implementation of the DetectorMessenger class
//
// $Id: DetectorMessenger.cc 98265 2016-07-04 17:47:54Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file hadronic/Hadr03/src/GammaNuclearPhysics.cc
/// \brief Implementation of the GammaNuclearPhysics class
//
// $Id: GammaNuclearPhysics.cc 66587 2012-12-21 11:06:44Z ihrivnac $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file HistoManager.cc
/// \brief Implementation of the HistoManager class
//
// $Id: HistoManager.cc 98265 2016-07-04 17:47:54Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file PhysicsList.cc
/// \brief Implementation of the PhysicsList class
//
// $Id: PhysicsList.cc 108917 2018-03-16 07:18:27Z gcosmo $
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -36,6 +35,7 @@
#include "G4UnitsTable.hh"
#include "G4HadronElasticPhysicsHP.hh"
#include "G4HadronElasticPhysicsXS.hh"
#include "G4HadronPhysicsFTFP_BERT_HP.hh"
#include "G4HadronPhysicsQGSP_BIC_HP.hh"
@@ -44,7 +44,7 @@
#include "G4HadronPhysicsINCLXX.hh"
#include "G4IonElasticPhysics.hh"
#include "G4IonPhysics.hh"
#include "G4IonPhysicsXS.hh"
#include "G4IonQMDPhysics.hh"
#include "G4IonPhysicsPHP.hh"
#include "G4IonINCLXXPhysics.hh"
@@ -77,11 +77,12 @@ PhysicsList::PhysicsList()
// Hadron Elastic scattering
//
RegisterPhysics( new G4HadronElasticPhysicsHP(verb));
///RegisterPhysics( new G4HadronElasticPhysicsXS(verb));
// Hadron Inelastic physics
//
RegisterPhysics( new G4HadronPhysicsFTFP_BERT_HP(verb));
////RegisterPhysics( new G4HadronPhysicsQGSP_BIC_HP(verb));
////RegisterPhysics( new G4HadronPhysicsFTFP_BERT_HP(verb));
RegisterPhysics( new G4HadronPhysicsQGSP_BIC_HP(verb));
////RegisterPhysics( new G4HadronPhysicsQGSP_BIC_AllHP(verb));
////RegisterPhysics( new G4HadronInelasticQBBC(verb));
////RegisterPhysics( new G4HadronPhysicsINCLXX(verb));
@@ -92,7 +93,7 @@ PhysicsList::PhysicsList()
// Ion Inelastic physics
//
RegisterPhysics( new G4IonPhysics(verb));
RegisterPhysics( new G4IonPhysicsXS(verb));
////RegisterPhysics( new G4IonPhysicsPHP(verb));
////RegisterPhysics( new G4IonQMDPhysics(verb));
////RegisterPhysics( new G4IonINCLXXPhysics(verb));
@@ -100,6 +101,7 @@ PhysicsList::PhysicsList()
// Gamma physics
//
RegisterPhysics( new GammaNuclearPhysics("gamma"));
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -134,7 +136,7 @@ void PhysicsList::ConstructParticle()
void PhysicsList::SetCuts()
{
SetCutValue(0.*mm, "proton");
SetCutValue(0.*mm, "proton");
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file PrimaryGeneratorAction.cc
/// \brief Implementation of the PrimaryGeneratorAction class
//
// $Id: PrimaryGeneratorAction.cc 98265 2016-07-04 17:47:54Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+16 -4
View File
@@ -26,7 +26,6 @@
/// \file Run.cc
/// \brief Implementation of the Run class
//
// $Id: Run.cc 71376 2013-06-14 07:44:50Z maire $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -50,8 +49,10 @@ Run::Run(DetectorConstruction* det)
fSumTrack(0.), fSumTrack2(0.),
fTargetXXX(false)
{
for (G4int i=0; i<3; i++) { fPbalance[i] = 0. ; }
for (G4int i=0; i<3; i++) { fPbalance[i] = 0. ; }
for (G4int i=0; i<3; i++) { fNbGamma[i] = 0 ; }
fPbalance[1] = DBL_MAX;
fNbGamma[1] = 10000;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -165,10 +166,21 @@ void Run::Merge(const G4Run* run)
// accumulate sums
//
fTotalCount += localRun->fTotalCount;
fGammaCount += localRun->fGammaCount;
fGammaCount += localRun->fGammaCount;
fSumTrack += localRun->fSumTrack;
fSumTrack2 += localRun->fSumTrack2;
fSumTrack2 += localRun->fSumTrack2;
fPbalance[0] += localRun->fPbalance[0];
G4double min,max;
min = localRun->fPbalance[1]; max = localRun->fPbalance[2];
if (fPbalance[1] > min) fPbalance[1] = min;
if (fPbalance[2] < max) fPbalance[2] = max;
fNbGamma[0] += localRun->fNbGamma[0];
G4int nbmin, nbmax;
nbmin = localRun->fNbGamma[1]; nbmax = localRun->fNbGamma[2];
if (fNbGamma[1] > nbmin) fNbGamma[1] = nbmin;
if (fNbGamma[2] < nbmax) fNbGamma[2] = nbmax;
//map: processes count
std::map<G4String,G4int>::const_iterator itp;
@@ -26,7 +26,6 @@
/// \file RunAction.cc
/// \brief Implementation of the RunAction class
//
// $Id: RunAction.cc 103488 2017-04-11 10:16:44Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file RunMessenger.cc
/// \brief Implementation of the RunMessenger class
//
// $Id: RunMessenger.cc 67268 2013-02-13 11:38:40Z ihrivnac $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -26,7 +26,6 @@
/// \file SteppingAction.cc
/// \brief Implementation of the SteppingAction class
//
// $Id: SteppingAction.cc 105744 2017-08-16 13:13:16Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -27,7 +27,6 @@
/// \brief Implementation of the SteppingVerbose class
//
//
// $Id: SteppingVerbose.cc 98265 2016-07-04 17:47:54Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......