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

Import Geant4 9.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:58:43 +02:00
parent 96c8bcd0af
commit b79225fb37
7544 changed files with 245407 additions and 91099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/qgsm/src/G4QGSMSplitableHadron.cc
+3 -3
View File
@@ -287,10 +287,10 @@ void G4QGSMSplitableHadron::SoftSplitUp()
nAttempt++;
G4int NumberOfUnsampledSeaQuarks = 2*nSeaPair;
G4double beta1 = beta;
if (std::abs(ColorEncoding) <= 1000 && std::abs(AntiColorEncoding) <= 1000) beta1 = 1.; //... in a meson
if (std::abs(ColorEncoding) <= 1000 && std::abs(AntiColorEncoding) <= 1000) beta1 = 1.; //... in a meson
ColorX = SampleX(Xmin, NumberOfUnsampledSeaQuarks, 2*nSeaPair, aBeta);
HPWtest = ColorX;
while (ColorX < Xmin || ColorX > 1.|| 1. - ColorX <= Xmin);
while (ColorX < Xmin || ColorX > 1.|| 1. - ColorX <= Xmin) {;}
Color.back()->SetX(SumX = ColorX);// this is the valenz quark.
for(G4int aPair = 0; aPair < nSeaPair; aPair++)
{
@@ -392,7 +392,7 @@ void G4QGSMSplitableHadron::GetValenceQuarkFlavors(const G4ParticleDefinition *
G4ThreeVector G4QGSMSplitableHadron::GaussianPt(G4double widthSquare, G4double maxPtSquare)
{
G4double R;
while((R = -widthSquare*std::log(G4UniformRand())) > maxPtSquare);
while((R = -widthSquare*std::log(G4UniformRand())) > maxPtSquare) {;}
R = std::sqrt(R);
G4double phi = twopi*G4UniformRand();
return G4ThreeVector (R*std::cos(phi), R*std::sin(phi), 0.);
source/processes/hadronic/models/parton_string/qgsm/src/G4QGSParticipants.cc
+6 -4
View File
@@ -261,7 +261,8 @@ void G4QGSParticipants::PerformSoftCollisions()
{
std::vector<G4InteractionContent*>::iterator i;
G4LorentzVector str4Mom;
for(i = theInteractions.begin(); i != theInteractions.end(); i++)
i = theInteractions.begin();
while ( i != theInteractions.end() )
{
G4InteractionContent* anIniteraction = *i;
G4PartonPair * aPair = NULL;
@@ -303,9 +304,10 @@ void G4QGSParticipants::PerformSoftCollisions()
thePartonPairs.push_back(aPair);
}
delete *i;
i=theInteractions.erase(i);
i--;
}
i=theInteractions.erase(i); // i now points to the next interaction
} else {
i++;
}
}
#ifdef debug_G4QGSPart_PSoftColl
G4cout << " string 4 mom " << str4Mom << G4endl;