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

Import Geant4 9.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:15:05 +02:00
parent b79225fb37
commit 74cad5e589
3877 changed files with 234205 additions and 167127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/qgsm/src/G4GammaParticipants.cc
+4 -3
View File
@@ -49,11 +49,12 @@ G4VSplitableHadron* G4GammaParticipants::SelectInteractions(const G4ReactionProd
G4double s = (aPrimaryMomentum + theTargetNuc[0]->Get4Momentum()).mag2();
G4double ThresholdMass = thePrimary.GetMass() + theTargetNuc[0]->GetDefinition()->GetPDGMass();
ModelMode = SOFT;
if (sqr(ThresholdMass + ThersholdParameter) > s)
if (sqr(ThresholdMass + ThresholdParameter) > s)
{
throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
ModelMode = DIFFRACTIVE;
//throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
}
if (sqr(ThresholdMass + QGSMThershold) > s) // thus only diffractive in cascade!
if (sqr(ThresholdMass + QGSMThreshold) > s) // thus only diffractive in cascade!
{
ModelMode = DIFFRACTIVE;
}
source/processes/hadronic/models/parton_string/qgsm/src/G4QGSParticipants.cc
+9 -7
View File
@@ -35,15 +35,16 @@
G4int G4QGSParticipants_NPart = 0;
G4QGSParticipants::G4QGSParticipants() : theDiffExcitaton(), //0.7*GeV, 250*MeV, 250*MeV),
nCutMax(7),ThersholdParameter(0.45*GeV),
QGSMThershold(3*GeV),theNucleonRadius(1.5*fermi)
//nCutMax(7),ThresholdParameter(0.45*GeV),
nCutMax(7),ThresholdParameter(0.000*GeV),
QGSMThreshold(3*GeV),theNucleonRadius(1.5*fermi)
{
}
G4QGSParticipants::G4QGSParticipants(const G4QGSParticipants &right)
: G4VParticipants(), nCutMax(right.nCutMax),ThersholdParameter(right.ThersholdParameter),
QGSMThershold(right.QGSMThershold),theNucleonRadius(right.theNucleonRadius)
: G4VParticipants(), nCutMax(right.nCutMax),ThresholdParameter(right.ThresholdParameter),
QGSMThreshold(right.QGSMThreshold),theNucleonRadius(right.theNucleonRadius)
{
}
@@ -90,11 +91,12 @@ G4VSplitableHadron* G4QGSParticipants::SelectInteractions(const G4ReactionProduc
G4double s = (aPrimaryMomentum + pNucleon->Get4Momentum()).mag2();
G4double ThresholdMass = thePrimary.GetMass() + pNucleon->GetDefinition()->GetPDGMass();
ModelMode = SOFT;
if (sqr(ThresholdMass + ThersholdParameter) > s)
if (sqr(ThresholdMass + ThresholdParameter) > s)
{
throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
ModelMode = DIFFRACTIVE;
//throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
}
if (sqr(ThresholdMass + QGSMThershold) > s) // thus only diffractive in cascade!
if (sqr(ThresholdMass + QGSMThreshold) > s) // thus only diffractive in cascade!
{
ModelMode = DIFFRACTIVE;
}
source/processes/hadronic/models/parton_string/qgsm/src/G4SPBaryon.cc
+2 -2
View File
@@ -103,8 +103,8 @@ SampleQuarkAndDiquark(G4int & quark, G4int & diQuark) const
{
if (theDefinition->GetPDGEncoding() < 0)
{
quark = -(*i)->GetDiQuark();
diQuark = -(*i)->GetQuark();
quark = (*i)->GetDiQuark();
diQuark = (*i)->GetQuark();
}
else
{