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

Import Geant4 9.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:37:50 +02:00
parent a8e9364cea
commit 96c8bcd0af
6923 changed files with 198390 additions and 41849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/im_r_matrix/src/G4CollisionComposite.cc
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4CollisionComposite.cc,v 1.6 2006/06/29 20:37:18 gunter Exp $ //
// $Id: G4CollisionComposite.cc,v 1.7 2007/07/05 21:43:24 dennis Exp $ //
#include "globals.hh"
#include "G4CollisionComposite.hh"
@@ -121,11 +121,11 @@ G4bool G4CollisionComposite::IsInCharge(const G4KineticTrack& trk1,
// The composite is in charge if any of its components is in charge
const G4CollisionVector* components = GetComponents();
if (components)
const G4CollisionVector* comps = GetComponents();
if (comps)
{
G4CollisionVector::const_iterator iter;
for (iter = components->begin(); iter != components->end(); ++iter)
for (iter = comps->begin(); iter != comps->end(); ++iter)
{
if ( ((*iter))->IsInCharge(trk1,trk2) ) isInCharge = true;
}
source/processes/hadronic/models/im_r_matrix/src/G4ParticleTypeConverter.cc
+2 -2
View File
@@ -219,9 +219,9 @@ G4ParticleTypeConverter::GenericType G4ParticleTypeConverter::GetGenericType(con
if(defMap[i].first == aParticleDef) return defMap[i].second;
}
G4cerr << "Unknown Particle : " << aParticleDef->GetParticleName() << G4endl;
//GF G4cerr << "Unknown Particle : " << aParticleDef->GetParticleName() << G4endl;
return UNKNOWN;
throw G4HadronicException(__FILE__, __LINE__, "G4ParticleTypeConverter: unknown particle type!");
// throw G4HadronicException(__FILE__, __LINE__, "G4ParticleTypeConverter: unknown particle type!");
}