Import Geant4 9.1.0 source tree
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
|
||||
==========================================================
|
||||
Geant4 - an Object-Oriented Toolkit for Physics Simulation
|
||||
==========================================================
|
||||
|
||||
History file for hadronic/models/im_r_matrix
|
||||
--------------------------------------------
|
||||
|
||||
This file should be used to summarize modifications introduced in the
|
||||
code and to keep track of all tags.
|
||||
|
||||
---------------------------------------------------------------
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
15-Nov-2007 Gunter Folger hadr-im_r_V09-00-03
|
||||
----------------------------------------------------------------
|
||||
- In G4ParticleTypeConverter, remove warning on unknown particle;
|
||||
occurs for eta_prime, k_star+, anti_... etc. in BiC propagate interface
|
||||
|
||||
03-Oct-2007 Gunter Folger hadr-im_r_V09-00-02
|
||||
----------------------------------------------------------------
|
||||
- Incorporate change by Dennis for G4CollisionComposite.cc: SUN compiler
|
||||
warning of hiding variable components.
|
||||
hadr-im_r_V09-00-01 had many files from head.
|
||||
|
||||
5 Jul 2007 Dennis Wright (hadr-im_r_V09-00-01)
|
||||
-----------------------------------------------
|
||||
- G4CollisionComposite.cc : remove duplicate declaration of local variable
|
||||
"components" to avoid Sun compiler hiding warning
|
||||
|
||||
- use 2006 versions of G4Scatterer.cc and G4CollisionComposite.hh
|
||||
leave all files named G4CollisionN... at HEAD but not tagged
|
||||
|
||||
- create History file
|
||||
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4CollisionInitialState.hh,v 1.4.4.2 2006/06/29 20:31:14 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-00 $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
//
|
||||
// $Id: G4CollisionInitialState.hh,v 1.0 1998/06/30
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4ListOfCollisions.hh,v 1.1.4.2 2006/06/29 20:35:35 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-00 $
|
||||
// GEANT4 tag $Name: geant4-09-01 $
|
||||
//
|
||||
// $Id: G4ListOfCollisions.hh,v 1.0 1998/06/30
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user