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

Import Geant4 10.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 14:11:04 +02:00
parent c9b32a6c0a
commit d4af681f38
4886 changed files with 420149 additions and 1023309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/hadronization/src/G4ExcitedStringDecay.cc
+9 -6
View File
@@ -174,10 +174,12 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
generatedKineticTracks->push_back(aTrack);
}
if (generatedKineticTracks == NULL)
// if (generatedKineticTracks == NULL) // Uzhi 02.06.2015
if (generatedKineticTracks->size() == 0) // Uzhi 02.06.2015
{
G4cerr << "G4VPartonStringModel:No KineticTracks produced" << G4endl;
continue;
// G4cerr << "G4VPartonStringModel:No KineticTracks produced" << G4endl; // Uzhi 02.06.2015
// continue; // Uzhi 02.06.2015
success=false; NeedEnergyCorrector=false; break; // Uzhi 02.06.2015
}
G4LorentzVector KTsum1(0.,0.,0.,0.);
@@ -210,12 +212,13 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
// clean up
delete generatedKineticTracks;
success=true; // Uzhi 02.06.2015
}
success=true;
//NeedEnergyCorrector=false; // Vova
// success=true; // Uzhi 02.06.2015
if ( NeedEnergyCorrector ) success=EnergyAndMomentumCorrector(theResult, KTsum);
} while(!success && (attempts < 10)); // It was 100 !!! Uzhi
} while(!success && (attempts < 10)); /* Loop checking, 07.08.2015, A.Ribon */
for ( unsigned int aTrack=0; aTrack<theResult->size();aTrack++) // Uzhi 22 June 2014
{
source/processes/hadronic/models/parton_string/hadronization/src/G4FragmentingString.cc
-1
View File
@@ -250,7 +250,6 @@ G4double G4FragmentingString::LightConeDecay()
if (decaying == Left ) return Pplus;
else if (decaying == Right ) return Pminus;
else throw G4HadronicException(__FILE__, __LINE__, "G4FragmentingString::DecayPt: decay side UNdefined!");
return 0;
}
//---------------------------------------------------------------------------------
source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc
+100 -38
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LundStringFragmentation.cc 87361 2014-12-01 16:10:28Z gcosmo $
// $Id: G4LundStringFragmentation.cc 91857 2015-08-07 13:55:49Z gcosmo $
// GEANT4 tag $Name: $ 1.8
//
// -----------------------------------------------------------------------------
@@ -40,6 +40,9 @@
#include "G4DiQuarks.hh"
#include "G4Quarks.hh"
#include "G4Exp.hh"
#include "G4Pow.hh"
//#define debug_LUNDfragmentation // Uzhi 20.06.2014
// Class G4LundStringFragmentation
@@ -61,9 +64,9 @@ G4LundStringFragmentation::G4LundStringFragmentation()
SmoothParam = 0.2;
SetStringTensionParameter(1.);
SetDiquarkBreakProbability(0.05); // 0.05 Uzhi 27.09.2014
SetStrangenessSuppression(0.447); // 0.47 Uzhi 27.09.2014
SetDiquarkSuppression(0.05); // 0.087 Uzhi 27.09.2014
SetDiquarkBreakProbability(0.05);
SetStrangenessSuppression(0.46); //(0.447); Uzhi 25.05.2015
SetDiquarkSuppression(0.05);
// For treating of small string decays
for(G4int i=0; i<3; i++)
@@ -125,7 +128,8 @@ G4LundStringFragmentation::G4LundStringFragmentation()
MesonWeight[1][1][3]=pspin_meson*(1.-vectorMesonMix[0]);
Meson[1][1][4]=223; // ubar-u Omega
MesonWeight[1][1][4]=pspin_meson*(scalarMesonMix[0]);
//MesonWeight[1][1][4]=pspin_meson*(scalarMesonMix[0]);
MesonWeight[1][1][4]=pspin_meson*(vectorMesonMix[0]); // Uzhi 2015 scalar -> vector
//--------------------------
Meson[1][2][0]=321; // ubar-s K-
@@ -386,9 +390,11 @@ G4LundStringFragmentation::G4LundStringFragmentation()
G4cin>>Uzhi;
*/
SetStrangenessSuppression(0.375); // Uzhi May 2015
Prob_QQbar[0]=StrangeSuppress; // Probability of ddbar production
Prob_QQbar[1]=StrangeSuppress; // Probability of uubar production
Prob_QQbar[2]=1.0-2.*StrangeSuppress; // Probability of ssbar production Uzhi May 2014
Prob_QQbar[2]=1.0-2.*StrangeSuppress; // Probability of ssbar production
SetStrangenessSuppression(0.46); //(0.447); // Uzhi May 2014
//A.R. 25-Jul-2012 : Coverity fix.
for ( G4int i=0 ; i<35 ; i++ ) {
@@ -466,6 +472,7 @@ void G4LundStringFragmentation::SetMinimalStringMass(const G4FragmentingString
#ifdef debug_LUNDfragmentation // Uzhi 20.06.2014
// G4cout<<"Min mass with Qleft and Qright "<<Qright<<" "<<EstimatedMass<<G4endl;
// G4cout<<"Number_of_quarks "<<Number_of_quarks<<" Number_of_squarks "<<Number_of_squarks<<G4endl;
#endif
if(Number_of_quarks==2){EstimatedMass += 70.*MeV;} //100.*MeV;}
@@ -531,7 +538,8 @@ G4KineticTrackVector* G4LundStringFragmentation::FragmentString(const G4ExcitedS
G4KineticTrackVector * LeftVector(0);
if(!IsFragmentable(&aString)) // produce 1 hadron True ===============
//Uzhi 29.05.2015 if(!IsFragmentable(&aString)) // produce 1 hadron True ===============
if(!aString.FourQuarkString() && !IsFragmentable(&aString))
{
#ifdef debug_LUNDfragmentation // Uzhi 20.06.2014
G4cout<<"Non fragmentable - the string is converted to one hadron "<<G4endl;
@@ -591,7 +599,7 @@ G4KineticTrackVector* G4LundStringFragmentation::FragmentString(const G4ExcitedS
}
// Join Left- and RightVector into LeftVector in correct order.
while(!RightVector->empty())
while(!RightVector->empty()) /* Loop checking, 07.08.2015, A.Ribon */
{
LeftVector->push_back(RightVector->back());
RightVector->erase(RightVector->end()-1);
@@ -639,9 +647,10 @@ G4bool G4LundStringFragmentation::StopFragmenting(const G4FragmentingString * co
if (string->FourQuarkString())
{
return G4UniformRand() < std::exp(-0.0005*(string->Mass() - MinimalStringMass));
return G4UniformRand() < G4Exp(-0.0005*(string->Mass() - MinimalStringMass));
} else {
return G4UniformRand() < std::exp(-0.88e-6*(string->Mass()*string->Mass() -
// Uzhi 23 Jan. 2015 0.88 -> 0.66
return G4UniformRand() < G4Exp(-0.66e-6*(string->Mass()*string->Mass() -
MinimalStringMass*MinimalStringMass));
}
}
@@ -756,14 +765,14 @@ void G4LundStringFragmentation::Sample4Momentum(G4LorentzVector* Mom, G4doub
G4ThreeVector Pt;
G4double MassMt2, AntiMassMt2;
G4double AvailablePz, AvailablePz2;
#ifdef debug_LUNDfragmentation // Uzhi 20.06.2014
G4double ProbIsotropy = sqr(sqr(938.0/InitialMass)); // Uzhi May 2015
#ifdef debug_LUNDfragmentation
G4cout<<"Sampling of momenta of 2 last produced hadrons ----------------"<<G4endl;
G4cout<<"Masses "<<InitialMass<<" "<<Mass<<" "<<AntiMass<<G4endl;
#endif
if((Mass > 930. || AntiMass > 930.)) //If there is a baryon
{
if((Mass > 930. || AntiMass > 930.) && (G4UniformRand() < ProbIsotropy)) // Uzhi May 2015
{ //If there is a baryon
// ----------------- Isotropic decay ------------------------------------
G4double r_val = sqr(InitialMass*InitialMass - Mass*Mass - AntiMass*AntiMass) -
sqr(2.*Mass*AntiMass);
@@ -787,6 +796,8 @@ void G4LundStringFragmentation::Sample4Momentum(G4LorentzVector* Mom, G4doub
}
else
{
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do
{
// GF 22-May-09, limit sampled pt to allowed range
@@ -805,7 +816,12 @@ void G4LundStringFragmentation::Sample4Momentum(G4LorentzVector* Mom, G4doub
AvailablePz2= sqr(InitialMass*InitialMass - MassMt2 - AntiMassMt2) -
4.*MassMt2*AntiMassMt2;
}
while(AvailablePz2 < 0.); // GF will occur only for numerical precision problem with limit in sampled pt
while( (AvailablePz2 < 0.) && // GF will occur only for numerical precision problem with limit in sampled pt
++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
AvailablePz2 = 0.0;
}
AvailablePz2 /=(4.*InitialMass*InitialMass);
AvailablePz = std::sqrt(AvailablePz2);
@@ -870,7 +886,7 @@ G4LorentzVector * G4LundStringFragmentation::SplitEandP(G4ParticleDefinition * p
HadronMassT2 = sqr(HadronMass) + HadronPt.mag2();
ResidualMassT2=sqr(MinimalStringMass) + RemSysPt.mag2();
} while(std::sqrt(HadronMassT2) + std::sqrt(ResidualMassT2) > StringMT);
} while(std::sqrt(HadronMassT2) + std::sqrt(ResidualMassT2) > StringMT); /* Loop checking, 07.08.2015, A.Ribon */
//... sample z to define hadron longitudinal momentum and energy
//... but first check the available phase space
@@ -934,15 +950,20 @@ G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax,
// const G4double blund = 1;
zOfMaxyf=alund*Mt2/(alund*Mt2 + 1.);
maxYf=(1-zOfMaxyf)/zOfMaxyf * std::exp(-alund*Mt2/zOfMaxyf);
maxYf=(1-zOfMaxyf)/zOfMaxyf * G4Exp(-alund*Mt2/zOfMaxyf);
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do
{
z = zmin + G4UniformRand()*(zmax-zmin);
yf = (1-z)/z * std::exp(-alund*Mt2/z);
// yf = std::pow(1.0-z,blund)/z*std::exp(-alund*Mt2/z
yf = (1-z)/z * G4Exp(-alund*Mt2/z);
// yf = G4Pow::GetInstance()->powA(1.0-z,blund)/z*G4Exp(-alund*Mt2/z
}
while (G4UniformRand()*maxYf > yf);
while ( (G4UniformRand()*maxYf > yf) && ++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
z = 0.5*(zmin + zmax); // Just a value between zmin and zmax, no physics considerations at all!
}
return z;
}
@@ -955,7 +976,7 @@ G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax,
do
{
z = zmin + G4UniformRand()*(zmax-zmin);
//yf=std::exp(-sqr(z-Zc)/2/sqr(0.28)); // 0.42 0.632 0.28 a'la UrQMD
//yf=G4Exp(-sqr(z-Zc)/2/sqr(0.28)); // 0.42 0.632 0.28 a'la UrQMD
yf =(z-zmin);
}
while (G4UniformRand()*maxYf > yf);
@@ -999,7 +1020,7 @@ G4bool G4LundStringFragmentation::Loop_toFragmentString(G4ExcitedString * & theS
G4bool final_success=false;
G4bool inner_success=true;
G4int attempt=0;
while ( ! final_success && attempt++ < StringLoopInterrupt )
while ( ! final_success && attempt++ < StringLoopInterrupt ) /* Loop checking, 07.08.2015, A.Ribon */
{ // If the string fragmentation do not be happend, repeat the fragmentation.
G4FragmentingString *currentString=new G4FragmentingString(*theStringInCMS);
@@ -1012,7 +1033,9 @@ G4bool G4LundStringFragmentation::Loop_toFragmentString(G4ExcitedString * & theS
// Main fragmentation loop until the string will not be able to fragment
inner_success=true; // set false on failure.
while (! StopFragmenting(currentString) )
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = -1;
while ( (! StopFragmenting(currentString)) && ++loopCounter < maxNumberOfLoops ) /* Loop checking, 07.08.2015, A.Ribon */
{ // Split current string into hadron + new string
#ifdef debug_LUNDfragmentation // Uzhi 20.06.2014
G4cout<<"The string can fragment. "<<G4endl;;
@@ -1037,7 +1060,10 @@ G4bool G4LundStringFragmentation::Loop_toFragmentString(G4ExcitedString * & theS
delete currentString;
currentString=newString;
}
};
};
if ( loopCounter >= maxNumberOfLoops ) {
inner_success=false;
}
// Split remaining string into 2 final hadrons.
#ifdef debug_LUNDfragmentation // Uzhi 20.06.2014
G4cout<<"Split remaining string into 2 final hadrons."<<G4endl;
@@ -1093,7 +1119,7 @@ Diquark_AntiDiquark_belowThreshold_lastSplitting(G4FragmentingString * & string,
//... repeat procedure, if mass of cluster is too low to produce hadrons
//... ClusterMassCut = 0.15*GeV model parameter
}
while ((StringMass <= LeftHadron->GetPDGMass() + RightHadron->GetPDGMass()));
while ((StringMass <= LeftHadron->GetPDGMass() + RightHadron->GetPDGMass())); /* Loop checking, 07.08.2015, A.Ribon */
return true;
}
@@ -1136,6 +1162,8 @@ Diquark_AntiDiquark_aboveThreshold_lastSplitting(G4FragmentingString * & string,
for(G4int ProdQ=1; ProdQ < 4; ProdQ++)
{
G4int StateADiQ=0;
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do // while(Meson[AbsIDquark-1][ProdQ-1][StateQ]<>0);
{
LeftHadron=G4ParticleTable::GetParticleTable()->FindParticle(
@@ -1145,13 +1173,15 @@ Diquark_AntiDiquark_aboveThreshold_lastSplitting(G4FragmentingString * & string,
//G4cout<<"Anti Bar "<<LeftHadron->GetParticleName()<<G4endl;
G4int StateDiQ=0;
const G4int maxNumberOfInternalLoops = 1000;
G4int internalLoopCounter = 0;
do // while(Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]<>0);
{
RightHadron=G4ParticleTable::GetParticleTable()->FindParticle(
+Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]);
G4double RightHadronMass=RightHadron->GetPDGMass();
if(StringMass >= LeftHadronMass + RightHadronMass)
if(StringMass > LeftHadronMass + RightHadronMass)
{
if ( NumberOf_FS > 34 ) {
G4ExceptionDescription ed;
@@ -1173,14 +1203,22 @@ Diquark_AntiDiquark_aboveThreshold_lastSplitting(G4FragmentingString * & string,
FS_RightHadron[NumberOf_FS]= RightHadron;
NumberOf_FS++;
} // End of if(StringMass >= LeftHadronMass + RightHadronMass)
} // End of if(StringMass > LeftHadronMass + RightHadronMass)
StateDiQ++;
} while(Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]!=0);
} while( (Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]!=0) &&
++internalLoopCounter < maxNumberOfInternalLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( internalLoopCounter >= maxNumberOfInternalLoops ) {
return false;
}
StateADiQ++;
} while(Baryon[ADi_q1-1][ADi_q2-1][ProdQ-1][StateADiQ]!=0);
} while( (Baryon[ADi_q1-1][ADi_q2-1][ProdQ-1][StateADiQ]!=0) &&
++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
return false;
}
} // End of for(G4int ProdQ=1; ProdQ < 4; ProdQ++)
return true;
@@ -1241,6 +1279,8 @@ Quark_Diquark_lastSplitting(G4FragmentingString * & string,
//G4cout<<"Insert QQbar "<<ProdQ<<" Sign "<<SignQ<<G4endl;
G4int StateQ=0;
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do // while(Meson[AbsIDquark-1][ProdQ-1][StateQ]<>0);
{
LeftHadron=G4ParticleTable::GetParticleTable()->FindParticle(SignQ*
@@ -1248,13 +1288,15 @@ Quark_Diquark_lastSplitting(G4FragmentingString * & string,
G4double LeftHadronMass=LeftHadron->GetPDGMass();
G4int StateDiQ=0;
const G4int maxNumberOfInternalLoops = 1000;
G4int internalLoopCounter = 0;
do // while(Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]<>0);
{
RightHadron=G4ParticleTable::GetParticleTable()->FindParticle(SignDiQ*
Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]);
G4double RightHadronMass=RightHadron->GetPDGMass();
if(StringMass >= LeftHadronMass + RightHadronMass)
if(StringMass > LeftHadronMass + RightHadronMass)
{
if ( NumberOf_FS > 34 ) {
G4ExceptionDescription ed;
@@ -1275,14 +1317,22 @@ Quark_Diquark_lastSplitting(G4FragmentingString * & string,
FS_RightHadron[NumberOf_FS]= RightHadron;
NumberOf_FS++;
} // End of if(StringMass >= LeftHadronMass + RightHadronMass)
} // End of if(StringMass > LeftHadronMass + RightHadronMass)
StateDiQ++;
} while(Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]!=0);
} while( (Baryon[Di_q1-1][Di_q2-1][ProdQ-1][StateDiQ]!=0) &&
++internalLoopCounter < maxNumberOfInternalLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( internalLoopCounter >= maxNumberOfInternalLoops ) {
return false;
}
StateQ++;
} while(Meson[AbsIDquark-1][ProdQ-1][StateQ]!=0);
} while( (Meson[AbsIDquark-1][ProdQ-1][StateQ]!=0) &&
++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
return false;
}
} // End of for(G4int ProdQ=1; ProdQ < 4; ProdQ++)
return true;
@@ -1331,6 +1381,8 @@ Quark_AntiQuark_lastSplitting(G4FragmentingString * & string,
if(AbsIDanti_quark == ProdQ) SignAQ= 1;
G4int StateQ=0;
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do // while(Meson[AbsIDquark-1][ProdQ-1][StateQ]<>0);
{
LeftHadron=G4ParticleTable::GetParticleTable()->FindParticle(SignQ*
@@ -1338,13 +1390,15 @@ Quark_AntiQuark_lastSplitting(G4FragmentingString * & string,
G4double LeftHadronMass=LeftHadron->GetPDGMass();
G4int StateAQ=0;
const G4int maxNumberOfInternalLoops = 1000;
G4int internalLoopCounter = 0;
do // while(Meson[AbsIDanti_quark-1][ProdQ-1][StateAQ]<>0);
{
RightHadron=G4ParticleTable::GetParticleTable()->FindParticle(SignAQ*
Meson[AbsIDanti_quark-1][ProdQ-1][StateAQ]);
G4double RightHadronMass=RightHadron->GetPDGMass();
if(StringMass >= LeftHadronMass + RightHadronMass)
if(StringMass > LeftHadronMass + RightHadronMass)
{
if ( NumberOf_FS > 34 ) {
G4ExceptionDescription ed;
@@ -1373,13 +1427,21 @@ Quark_AntiQuark_lastSplitting(G4FragmentingString * & string,
}
NumberOf_FS++;
} // End of if(StringMass >= LeftHadronMass + RightHadronMass)
} // End of if(StringMass > LeftHadronMass + RightHadronMass)
StateAQ++;
} while(Meson[AbsIDanti_quark-1][ProdQ-1][StateAQ]!=0);
} while( (Meson[AbsIDanti_quark-1][ProdQ-1][StateAQ]!=0) &&
++internalLoopCounter < maxNumberOfInternalLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( internalLoopCounter >= maxNumberOfInternalLoops ) {
return false;
}
StateQ++;
} while(Meson[AbsIDquark-1][ProdQ-1][StateQ]!=0);
} while( (Meson[AbsIDquark-1][ProdQ-1][StateQ]!=0) &&
++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
return false;
}
} // End of for(G4int ProdQ=1; ProdQ < 4; ProdQ++)
return true;
source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc
+47 -19
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4QGSMFragmentation.cc 84707 2014-10-20 07:15:31Z gcosmo $
// $Id: G4QGSMFragmentation.cc 92025 2015-08-13 14:17:05Z gcosmo $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -39,6 +39,8 @@
#include "G4DiQuarks.hh"
#include "G4Quarks.hh"
#include "G4Pow.hh"
//#define debug_QGSMfragmentation // Uzhi Oct. 2014
// Class G4QGSMFragmentation
@@ -99,7 +101,7 @@ G4KineticTrackVector* G4QGSMFragmentation::FragmentString(const G4ExcitedString&
G4bool success=false, inner_sucess=true;
G4int attempt=0;
while ( !success && attempt++ < StringLoopInterrupt )
while ( !success && attempt++ < StringLoopInterrupt ) /* Loop checking, 07.08.2015, A.Ribon */
{
#ifdef debug_QGSMfragmentation // Uzhi Oct. 2014
G4cout<<"Loop_toFrag "<<theStringInCMS->GetLeftParton()->GetPDGcode()<<" "
@@ -115,8 +117,9 @@ G4KineticTrackVector* G4QGSMFragmentation::FragmentString(const G4ExcitedString&
RightVector->clear();
inner_sucess=true; // set false on failure..
while (! StopFragmenting(currentString) )
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = -1;
while (! StopFragmenting(currentString) && ++loopCounter < maxNumberOfLoops ) /* Loop checking, 07.08.2015, A.Ribon */
{ // Split current string into hadron + new string
#ifdef debug_QGSMfragmentation // Uzhi Oct. 2014
@@ -146,11 +149,14 @@ G4KineticTrackVector* G4QGSMFragmentation::FragmentString(const G4ExcitedString&
// abandon ... start from the beginning
if (newString) delete newString;
if (Hadron) delete Hadron;
inner_sucess=false;
break;
}
}
}
if ( loopCounter >= maxNumberOfLoops ) {
inner_sucess=false;
}
// Split current string into 2 final Hadrons
#ifdef debug_QGSMfragmentation // Uzhi Oct. 2014
G4cout<<"Split remaining string into 2 final hadrons."<<G4endl;
@@ -176,7 +182,7 @@ G4KineticTrackVector* G4QGSMFragmentation::FragmentString(const G4ExcitedString&
}
// Join Left- and RightVector into LeftVector in correct order.
while(!RightVector->empty())
while(!RightVector->empty()) /* Loop checking, 07.08.2015, A.Ribon */
{
LeftVector->push_back(RightVector->back());
RightVector->erase(RightVector->end()-1);
@@ -254,13 +260,18 @@ G4double G4QGSMFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int
invD1=1./d1; invD2=1./d2;
const G4int maxNumberOfLoops = 10000;
G4int loopCounter = 0;
do
{
r1=std::pow(G4UniformRand(),invD1);
r2=std::pow(G4UniformRand(),invD2);
r1=G4Pow::GetInstance()->powA(G4UniformRand(),invD1);
r2=G4Pow::GetInstance()->powA(G4UniformRand(),invD2);
r12=r1+r2;
z=r1/r12;
} while( (r12 > 1.0) || !((zmin <= z)&&(z <= zmax)));
} while( ( (r12 > 1.0) || !((zmin <= z)&&(z <= zmax))) && ++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
z = 0.5*(zmin + zmax); // Just a value between zmin and zmax, no physics considerations at all!
}
return z;
}
@@ -286,13 +297,18 @@ G4double G4QGSMFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int
d1+=1.0; d2+=1.0;
invD1=1./d1; invD2=1./d2;
const G4int maxNumberOfLoops = 10000;
G4int loopCounter = 0;
do
{
r1=std::pow(G4UniformRand(),invD1);
r2=std::pow(G4UniformRand(),invD2);
r1=G4Pow::GetInstance()->powA(G4UniformRand(),invD1);
r2=G4Pow::GetInstance()->powA(G4UniformRand(),invD2);
r12=r1+r2;
z=r1/r12;
} while( (r12 > 1.0) || !((zmin <= z)&&(z <= zmax)));
} while( ( (r12 > 1.0) || !((zmin <= z)&&(z <= zmax))) && ++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
z = 0.5*(zmin + zmax); // Just a value between zmin and zmax, no physics considerations at all!
}
return z;
}
@@ -307,13 +323,15 @@ G4double G4QGSMFragmentation::GetLightConeZ(G4double zmin, G4double zmax, G4int
d2 = (alft - (2.*aksi - arho));
}
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do
{
z = zmin + G4UniformRand() * (zmax - zmin);
d1 = (1. - z);
yf = std::pow(d1, d2);
yf = G4Pow::GetInstance()->powA(d1, d2);
}
while (G4UniformRand() > yf);
while( (G4UniformRand() > yf) && ++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
}
return z;
@@ -326,8 +344,11 @@ G4LorentzVector * G4QGSMFragmentation::SplitEandP(G4ParticleDefinition * pHadron
{
G4double HadronMass = pHadron->GetPDGMass();
G4double MinimalStringMass= FragmentationMass(NewString,&G4HadronBuilder::BuildHighSpin);
// G4double MinimalStringMass= FragmentationMass(NewString,&G4HadronBuilder::BuildHighSpin);
G4double MinimalStringMass=
FragmentationMass(NewString,&G4HadronBuilder::Build); // Uzhi 03.06.2015
// FragmentationMass(NewString,&G4HadronBuilder::BuildLowSpin); // Uzhi 03.06.2015
// Uzhi 03.06.2015 It would be well to sample randomly HighSpin
#ifdef debug_QGSMfragmentation // Uzhi Oct. 2014
G4cout<<"G4QGSMFragmentation::SplitEandP "<<pHadron->GetParticleName()<<G4endl;
G4cout<<"String 4 mom, String M "<<string->Get4Momentum()<<" "<<string->Mass()<<G4endl;
@@ -367,7 +388,7 @@ G4LorentzVector * G4QGSMFragmentation::SplitEandP(G4ParticleDefinition * pHadron
HadronMassT2 = sqr(HadronMass) + HadronPt.mag2();
ResidualMassT2=sqr(MinimalStringMass) + RemSysPt.mag2();
} while(std::sqrt(HadronMassT2) + std::sqrt(ResidualMassT2) > StringMT);
} while(std::sqrt(HadronMassT2) + std::sqrt(ResidualMassT2) > StringMT); /* Loop checking, 07.08.2015, A.Ribon */
//... sample z to define hadron longitudinal momentum and energy
//... but first check the available phase space
@@ -446,6 +467,8 @@ G4bool G4QGSMFragmentation::SplitLast(G4FragmentingString * string,
G4double ClusterMassCut = ClusterMass; // Taken from G4VLongitudinalStringDecay
G4int cClusterInterrupt = 0;
G4ParticleDefinition * LeftHadron, * RightHadron;
const G4int maxNumberOfLoops = 1000;
G4int loopCounter = 0;
do
{
if (cClusterInterrupt++ >= ClusterLoopInterrupt)
@@ -481,7 +504,12 @@ G4bool G4QGSMFragmentation::SplitLast(G4FragmentingString * string,
if ( quark->GetParticleSubType()== "quark" ) {ClusterMassCut = 0.;}
else {ClusterMassCut = ClusterMass;}
}
while (ResidualMass <= LeftHadron->GetPDGMass() + RightHadron->GetPDGMass() + ClusterMassCut);
while ( (ResidualMass <= LeftHadron->GetPDGMass() + RightHadron->GetPDGMass() + ClusterMassCut)
&& ++loopCounter < maxNumberOfLoops ); /* Loop checking, 07.08.2015, A.Ribon */
if ( loopCounter >= maxNumberOfLoops ) {
return false;
}
//... compute hadron momenta and energies
G4LorentzVector LeftMom, RightMom;
source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc
+3 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VKinkyStringDecay.cc 69569 2013-05-08 13:19:50Z gcosmo $
// $Id: G4VKinkyStringDecay.cc 91857 2015-08-07 13:55:49Z gcosmo $
// Maxim Komogorov
//
// -----------------------------------------------------------------------------
@@ -54,7 +54,7 @@ G4double G4VKinkyStringDecay::GetLightConeGluonZ(G4double zmin, G4double zmax)
z = zmin + G4UniformRand()*(zmax-zmin);
yf = z*z +sqr(1 - z);
}
while (G4UniformRand() > yf);
while (G4UniformRand() > yf); /* Loop checking, 07.08.2015, A.Ribon */
return z;
}
@@ -91,7 +91,7 @@ G4KineticTrackVector* G4VKinkyStringDecay::FragmentString(const G4ExcitedString&
G4KineticTrackVector* KTV2 = theLongitudinalStringDecay->FragmentString(Str2);
if (KTV1 && KTV2)
while(!KTV2->empty())
while(!KTV2->empty()) /* Loop checking, 07.08.2015, A.Ribon */
{
KTV1->push_back(KTV2->back());
KTV1->erase(KTV1->end()-1);
source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc
+6 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VLongitudinalStringDecay.cc 84826 2014-10-21 12:31:00Z gcosmo $
// $Id: G4VLongitudinalStringDecay.cc 91773 2015-08-05 13:59:07Z gcosmo $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -53,6 +53,9 @@
#include "G4Quarks.hh"
#include "G4Gluons.hh"
#include "G4Exp.hh"
#include "G4Log.hh"
//------------------------debug switches
//#define debug_VStringDecay // Uzhi 20.06.2014
@@ -498,10 +501,10 @@ G4ThreeVector G4VLongitudinalStringDecay::SampleQuarkPt(G4double ptMax)
G4double Pt;
if ( ptMax < 0 ) {
// sample full gaussian
Pt = -std::log(G4UniformRand());
Pt = -G4Log(G4UniformRand());
} else {
// sample in limited range
Pt = -std::log(G4RandFlat::shoot(std::exp(-sqr(ptMax)/sqr(SigmaQT)), 1.));
Pt = -G4Log(G4RandFlat::shoot(G4Exp(-sqr(ptMax)/sqr(SigmaQT)), 1.));
}
Pt = SigmaQT * std::sqrt(Pt);
G4double phi = 2.*pi*G4UniformRand();