Import Geant4 10.4.0 source tree
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
/// \file PhysicsList.cc
|
||||
/// \brief Implementation of the PhysicsList class
|
||||
//
|
||||
// $Id: PhysicsList.cc 103488 2017-04-11 10:16:44Z gcosmo $
|
||||
// $Id: PhysicsList.cc 105744 2017-08-16 13:13:16Z gcosmo $
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -80,8 +80,8 @@ PhysicsList::PhysicsList()
|
||||
|
||||
// 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));
|
||||
|
||||
@@ -352,7 +352,7 @@ void Run::EndOfRun(G4bool print)
|
||||
G4int count = data.fCount;
|
||||
G4double Q = data.fQ/count;
|
||||
if (print)
|
||||
G4cout << " " << std::setw(50) << name << ": " << std::setw(7) << count
|
||||
G4cout << " " << std::setw(60) << name << ": " << std::setw(7) << count
|
||||
<< " Q = " << std::setw(wid) << G4BestUnit(Q, "Energy")
|
||||
<< G4endl;
|
||||
}
|
||||
@@ -360,7 +360,7 @@ void Run::EndOfRun(G4bool print)
|
||||
//Gamma count
|
||||
//
|
||||
if (print && (fGammaCount > 0)) {
|
||||
G4cout << "\n" << std::setw(58) << "Number of gamma: N = "
|
||||
G4cout << "\n" << std::setw(58) << "number of gamma or e- (ic): N = "
|
||||
<< fNbGamma[1] << " --> " << fNbGamma[2] << G4endl;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/// \file SteppingAction.cc
|
||||
/// \brief Implementation of the SteppingAction class
|
||||
//
|
||||
// $Id: SteppingAction.cc 98748 2016-08-09 13:42:11Z gcosmo $
|
||||
// $Id: SteppingAction.cc 105744 2017-08-16 13:13:16Z gcosmo $
|
||||
//
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -138,6 +138,8 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep)
|
||||
G4ThreeVector momentum = (*secondary)[lp]->GetMomentum();
|
||||
Q += energy;
|
||||
Pbalance += momentum;
|
||||
//count e- from internal conversion together with gamma
|
||||
if (particle == G4Electron::Electron()) particle = G4Gamma::Gamma();
|
||||
//particle flag
|
||||
fParticleFlag[particle]++;
|
||||
}
|
||||
@@ -164,6 +166,7 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep)
|
||||
if (particle == G4Gamma::Gamma()) {
|
||||
run->CountGamma(nb);
|
||||
Nb = "N ";
|
||||
name = "gamma or e-";
|
||||
}
|
||||
if (ip != fParticleFlag.begin()) nuclearChannel += " + ";
|
||||
nuclearChannel += Nb + name;
|
||||
|
||||
Reference in New Issue
Block a user