Import Geant4 11.0.0 source tree
This commit is contained in:
committed by
Ben Morgan
parent
6399a014b6
commit
80e2389dd8
+2
-2
@@ -79,10 +79,10 @@ namespace G4INCL {
|
||||
|
||||
static G4double getCutNNSquared() { return cutNNSquared; }
|
||||
|
||||
/// \brief Get the bias
|
||||
/// \brief Get the global bias factor
|
||||
static G4double getBias() { return bias; }
|
||||
|
||||
/// \brief Set the bias
|
||||
/// \brief Set the global bias factor
|
||||
static void setBias(const G4double b) { bias=b; }
|
||||
|
||||
private:
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace G4INCL {
|
||||
theS = S;
|
||||
setINCLMass();
|
||||
if(createParticleSampler)
|
||||
theParticleSampler = new ParticleSampler(A,Z);
|
||||
theParticleSampler = new ParticleSampler(A,Z,S);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -105,7 +105,7 @@ namespace G4INCL {
|
||||
particles.push_back(new Particle(**p));
|
||||
}
|
||||
if(rhs.theParticleSampler)
|
||||
theParticleSampler = new ParticleSampler(rhs.theA,rhs.theZ);
|
||||
theParticleSampler = new ParticleSampler(rhs.theA,rhs.theZ,rhs.theS);
|
||||
else
|
||||
theParticleSampler = NULL;
|
||||
}
|
||||
|
||||
+4
-1
@@ -59,7 +59,7 @@ namespace G4INCL {
|
||||
* \param A the mass number
|
||||
* \param Z the charge number
|
||||
*/
|
||||
ParticleSampler(const G4int A, const G4int Z);
|
||||
ParticleSampler(const G4int A, const G4int Z, const G4int S);
|
||||
|
||||
/// \brief Destructor
|
||||
~ParticleSampler();
|
||||
@@ -124,6 +124,9 @@ namespace G4INCL {
|
||||
/// \brief Charge number
|
||||
const G4int theZ;
|
||||
|
||||
/// \brief Strangeness number
|
||||
const G4int theS;
|
||||
|
||||
/// \brief Array of pointers to the r-space CDF table
|
||||
InterpolationTable const *theRCDFTable[UnknownParticle];
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ namespace G4INCL {
|
||||
ParticleList spectators;
|
||||
for(ParticleIter p=outgoing.begin(), e=outgoing.end(); p!=e; ++p) {
|
||||
if((*p)->isProjectileSpectator()) {
|
||||
// assert((*p)->isNucleon());
|
||||
// assert((*p)->isNucleon() || (*p)->isLambda());
|
||||
spectators.push_back(*p); // add them to the list we will return
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user