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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/parton_string/hadronization/src/G4ExcitedStringDecay.cc
+17 -12
View File
@@ -84,17 +84,20 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
#endif
for ( unsigned int astring=0; astring < theStrings->size(); astring++)
// for ( unsigned int astring=0; astring < 1; astring++)
{
if ( theStrings->operator[](astring)->IsExcited() )
{KTsum+= theStrings->operator[](astring)->Get4Momentum();}
else {KTsum+=theStrings->operator[](astring)->GetKineticTrack()->Get4Momentum();}
}
G4LorentzRotation toCms( -1 * KTsum.boostVector() ); // Uzhi 22 June 2014
G4LorentzRotation toLab(toCms.inverse()); // Uzhi 22 June 2014
G4LorentzRotation toCms( -1 * KTsum.boostVector() );
G4LorentzRotation toLab(toCms.inverse());
G4LorentzVector Ptmp;
KTsum=G4LorentzVector(0.,0.,0.,0.);
for ( unsigned int astring=0; astring < theStrings->size(); astring++) // Uzhi 22 June 2014
for ( unsigned int astring=0; astring < theStrings->size(); astring++)
// for ( unsigned int astring=0; astring < 1; astring++)
{
if ( theStrings->operator[](astring)->IsExcited() )
{
@@ -112,7 +115,7 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
theStrings->operator[](astring)->GetKineticTrack()->Set4Momentum(Ptmp);
KTsum+= theStrings->operator[](astring)->GetKineticTrack()->Get4Momentum();
}
} // Uzhi 22 June 2014
}
G4KineticTrackVector * theResult = new G4KineticTrackVector;
G4int attempts(0);
@@ -132,7 +135,7 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
NeedEnergyCorrector=false;
for ( unsigned int astring=0; astring < theStrings->size(); astring++)
// for ( unsigned int astring=0; astring < 1; astring++)
// for ( unsigned int astring=0; astring < 1; astring++) // Vova
{
#ifdef debug_G4ExcitedStringDecay
G4cout<<"String No "<<astring+1<<" Excited? "<<theStrings->operator[](astring)->IsExcited()<<G4endl;
@@ -152,7 +155,8 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
#endif
generatedKineticTracks=FragmentString(*theStrings->operator[](astring));
#ifdef debug_G4ExcitedStringDecay
G4cout<<"(G4ExcitedStringDecay) Number of produced hadrons = "<<generatedKineticTracks->size()<<G4endl;
G4cout<<"(G4ExcitedStringDecay) Number of produced hadrons = "
<<generatedKineticTracks->size()<<G4endl;
#endif
} else {
#ifdef debug_G4ExcitedStringDecay
@@ -174,8 +178,7 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
generatedKineticTracks->push_back(aTrack);
}
// if (generatedKineticTracks == NULL) // Uzhi 02.06.2015
if (generatedKineticTracks->size() == 0) // Uzhi 02.06.2015
if (generatedKineticTracks->size() == 0) // Uzhi 02.06.2015
{
// G4cerr << "G4VPartonStringModel:No KineticTracks produced" << G4endl; // Uzhi 02.06.2015
// continue; // Uzhi 02.06.2015
@@ -220,12 +223,12 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
if ( NeedEnergyCorrector ) success=EnergyAndMomentumCorrector(theResult, KTsum);
} while(!success && (attempts < 10)); /* Loop checking, 07.08.2015, A.Ribon */
for ( unsigned int aTrack=0; aTrack<theResult->size();aTrack++) // Uzhi 22 June 2014
for ( unsigned int aTrack=0; aTrack<theResult->size();aTrack++)
{
Ptmp=(*theResult)[aTrack]->Get4Momentum();
Ptmp.transform( toLab);
(*theResult)[aTrack]->Set4Momentum(Ptmp);
} // Uzhi 22 June 2014
}
#ifdef debug_G4ExcitedStringDecay
G4cout<<"End of the strings fragmentation (G4ExcitedStringDecay)"<<G4endl;
@@ -240,13 +243,15 @@ G4KineticTrackVector *G4ExcitedStringDecay::FragmentStrings(const G4ExcitedStrin
KTsum1+= (*theResult)[aTrack]->Get4Momentum();
}
G4cout << "Needcorrector/success " << NeedEnergyCorrector << "/" << success << ", Corrected total 4 momentum " << KTsum1 << G4endl;
G4cout << "Needcorrector/success " << NeedEnergyCorrector << "/" << success
<< ", Corrected total 4 momentum " << KTsum1 << G4endl;
if ( ! success ) G4cout << "failed to correct E/p" << G4endl;
G4cout<<"End of the Hadronization (G4ExcitedStringDecay)"<<G4endl;
#endif
for ( unsigned int astring=0; astring < theStrings->size(); astring++) // Uzhi 24 Oct. 2014
// for ( unsigned int astring=0; astring < theStrings->size(); astring++) // Uzhi 24 Oct. 2014
for ( unsigned int astring=0; astring < 1; astring++) // Uzhi 24 Oct. 2014
{
if ( theStrings->operator[](astring)->IsExcited() )
{
source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc
+45 -35
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4LundStringFragmentation.cc 91857 2015-08-07 13:55:49Z gcosmo $
// $Id: G4LundStringFragmentation.cc 97675 2016-06-07 08:29:49Z gcosmo $
// GEANT4 tag $Name: $ 1.8
//
// -----------------------------------------------------------------------------
@@ -63,10 +63,12 @@ G4LundStringFragmentation::G4LundStringFragmentation()
// ------ smearing sharp mass cut-off ---------------------------
SmoothParam = 0.2;
SigmaQT = 0.435 * GeV; // 0.5 -> 0.471 <Pt^2> = 0.5 GeV^2 Uzhi 28 May
SetStringTensionParameter(1.);
SetDiquarkBreakProbability(0.05);
SetStrangenessSuppression(0.46); //(0.447); Uzhi 25.05.2015
SetDiquarkSuppression(0.05);
SetStrangenessSuppression(0.45); //(0.46); //(0.447); Uzhi 25.05.2015
SetDiquarkSuppression(0.06); // 0.05 -> 0.06 Uzhi 28 May 2016
// For treating of small string decays
for(G4int i=0; i<3; i++)
@@ -394,7 +396,7 @@ G4LundStringFragmentation::G4LundStringFragmentation()
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
SetStrangenessSuppression(0.46); //(0.447); // Uzhi May 2014
SetStrangenessSuppression(0.45); //(0.46); //(0.447); // Uzhi May 2014
//A.R. 25-Jul-2012 : Coverity fix.
for ( G4int i=0 ; i<35 ; i++ ) {
@@ -475,26 +477,40 @@ void G4LundStringFragmentation::SetMinimalStringMass(const G4FragmentingString
// 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;}
// if(Number_of_quarks==3){EstimatedMass += 20.*MeV;}
if(Number_of_quarks==2){
if(Number_of_squarks < 2) {EstimatedMass += 70.*MeV;}
else {EstimatedMass += 230.*MeV;}
}
if(Number_of_quarks==3)
{
if(Number_of_squarks==0) {EstimatedMass += 740.*MeV;} // 700 Uzhi July 2014
if(Number_of_squarks==1) {EstimatedMass += 740.*MeV;} // 740 Uzhi Nov 2014
if(Number_of_squarks==2) {EstimatedMass += 400.*MeV;}
if(Number_of_squarks==3) {EstimatedMass += 382.*MeV;}
if(Number_of_squarks==0) {EstimatedMass += 740.*MeV;}
else if(Number_of_squarks==1) {EstimatedMass += 600.*MeV;} // 740. Uzhi May 2016
else if(Number_of_squarks==2) {EstimatedMass += 400.*MeV;}
else {EstimatedMass += 400.*MeV;} // 382. Uzhi May 2016
}
if(Number_of_quarks==4)
{
if(StringM > 1880.) { // 382. Uzhi May 2016 // 2*Mn = 1880
if(Number_of_squarks==0) {EstimatedMass += 1320.*MeV;}//560+1320=1880=2*Mn
else if(Number_of_squarks==1) {EstimatedMass += 1150.*MeV;}//920+1150=2070=M(Lam+N)
else if(Number_of_squarks==2) {EstimatedMass += 960.*MeV;}//1280+960=2240= 2*M Lam
else if(Number_of_squarks==3) {EstimatedMass += 800.*MeV;}//1640+800=2440=Mxi+Mlam
else if(Number_of_squarks==4) {EstimatedMass += 640.*MeV;}//2000+640=2640=2*Mxi
else {}
}
/*
if((StringM > 1880.) && ( EstimatedMass < 2100)) {EstimatedMass = 2020.;}//1880.;}
// if((StringM > 1880.) && ( EstimatedMass < 2100)) {EstimatedMass = 2051.;}
else if((StringM > 2232.) && ( EstimatedMass < 2730)){EstimatedMass = 2570.;}
else if((StringM > 5130.) && ( EstimatedMass < 3450)){EstimatedMass = 5130.;}
*/
else
{
// VU 30 May 2014 EstimatedMass -=2.*Mass_of_string_junction;
if(EstimatedMass <= 1600.*MeV){EstimatedMass-=200.*MeV;}
else {EstimatedMass+=100.*MeV;}
if(Number_of_squarks < 3) {EstimatedMass -= 200.*MeV;}
else if(Number_of_squarks==3) {EstimatedMass -= 50.*MeV;}
else if(Number_of_squarks==4) {EstimatedMass -= 40.*MeV;}
else {}
}
}
@@ -847,6 +863,7 @@ G4LorentzVector * G4LundStringFragmentation::SplitEandP(G4ParticleDefinition * p
G4double StringMT =std::sqrt(StringMT2);
G4double HadronMass = pHadron->GetPDGMass();
// G4int AbsBaryonNumber =std::abs(pHadron->GetBaryonNumber()); // Uzhi 30 May
SetMinimalStringMass(newString);
@@ -874,10 +891,13 @@ G4LorentzVector * G4LundStringFragmentation::SplitEandP(G4ParticleDefinition * p
G4double HadronMassT2, ResidualMassT2;
//... sample Pt of the hadron
G4double InitSigmaQT=SigmaQT; // Uzhi 30 May 2016
// if(AbsBaryonNumber > 0) SigmaQT=0.7 * GeV; // Uzhi 30 May 2016 0.66
if(pHadron->GetPDGIsospin() >= 1.5 ) SigmaQT=0.9 * GeV; // Uzhi 30 May 2016 0.66 0.70
G4int attempt=0;
do
{
attempt++; if(attempt > StringLoopInterrupt) return 0;
attempt++; if(attempt > StringLoopInterrupt) {SigmaQT=InitSigmaQT; return 0;} // Uzhi 30 May 2016
HadronPt =SampleQuarkPt() + string->DecayPt();
HadronPt.setZ(0);
@@ -888,6 +908,8 @@ G4LorentzVector * G4LundStringFragmentation::SplitEandP(G4ParticleDefinition * p
} while(std::sqrt(HadronMassT2) + std::sqrt(ResidualMassT2) > StringMT); /* Loop checking, 07.08.2015, A.Ribon */
// if(AbsBaryonNumber > 0) SigmaQT=InitSigmaQT; // Uzhi 30 May 2016
if(pHadron->GetPDGIsospin() >= 1.5 ) SigmaQT=InitSigmaQT;
//... sample z to define hadron longitudinal momentum and energy
//... but first check the available phase space
@@ -905,7 +927,7 @@ G4LorentzVector * G4LundStringFragmentation::SplitEandP(G4ParticleDefinition * p
if (zMin >= zMax) return 0; // have to start all over!
G4double z = GetLightConeZ(zMin, zMax,
G4double z = GetLightConeZ(zMin, zMax,
string->GetDecayParton()->GetPDGEncoding(), pHadron,
HadronPt.x(), HadronPt.y());
@@ -937,13 +959,14 @@ G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax,
G4double Px, G4double Py)
{
G4double Mass = pHadron->GetPDGMass();
// G4int HadronEncoding=std::abs(pHadron->GetPDGEncoding());
G4int HadronEncoding=std::abs(pHadron->GetPDGEncoding());
G4double Mt2 = Px*Px + Py*Py + Mass*Mass;
G4double alund;
G4double zOfMaxyf(0.), maxYf(1.), z(0.), yf(1.);
if(std::abs(PDGEncodingOfDecayParton) < 1000)
if(!((std::abs(PDGEncodingOfDecayParton) > 1000) && (HadronEncoding > 1000)))
{ // ---------------- Quark fragmentation ----------------------
alund=0.7/GeV/GeV;
// If blund get restored, you MUST adapt the calculation of zOfMaxyf.
@@ -967,25 +990,12 @@ G4double G4LundStringFragmentation::GetLightConeZ(G4double zmin, G4double zmax,
return z;
}
if(std::abs(PDGEncodingOfDecayParton) > 1000) // Uzhi Sept. 2014
if(std::abs(PDGEncodingOfDecayParton) > 1000) // Uzhi May. 2016
{
/*
if(HadronEncoding < 3000)
{
maxYf=(zmax-zmin);
do
{
z = zmin + G4UniformRand()*(zmax-zmin);
//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);
}
else
{ // Strange baryons
*/
z = zmin + G4UniformRand()*(zmax-zmin);
// }
G4double an=2.5;
if(pHadron->GetPDGIsospin() > 0.5) an=0.75;
z=zmin + (zmax-zmin)*G4Pow::GetInstance()->powA(G4UniformRand(),1./an);
}
return z;
source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc
+6 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VLongitudinalStringDecay.cc 91773 2015-08-05 13:59:07Z gcosmo $
// $Id: G4VLongitudinalStringDecay.cc 97393 2016-06-02 10:12:05Z gcosmo $
//
// -----------------------------------------------------------------------------
// GEANT 4 class implementation file
@@ -72,7 +72,7 @@ G4VLongitudinalStringDecay::G4VLongitudinalStringDecay()
ClusterLoopInterrupt = 500;
// Changable Parameters below.
SigmaQT = 0.5 * GeV; // 0.5 0.1
SigmaQT = 0.5 * GeV;
StrangeSuppress = 0.44; // 27 % strange quarks produced, ie. u:d:s=1:1:0.27
DiquarkSuppress = 0.07;
@@ -86,9 +86,9 @@ G4VLongitudinalStringDecay::G4VLongitudinalStringDecay()
//... vectorMesonMix[] is quark mixing parameters for vector mesons (Variable spin = 3)
vectorMesonMix.resize(6);
vectorMesonMix[0] = 0.0; //AR-20Oct2014 : it was 0.5
vectorMesonMix[0] = 0.5; //AR-20Oct2014 : it was 0.5
vectorMesonMix[1] = 0.0;
vectorMesonMix[2] = 0.0; //AR-20Oct2014 : it was 0.5
vectorMesonMix[2] = 0.5; //AR-20Oct2014 : it was 0.5
vectorMesonMix[3] = 0.0;
vectorMesonMix[4] = 1.0;
vectorMesonMix[5] = 1.0;
@@ -489,7 +489,9 @@ G4VLongitudinalStringDecay::pDefPair G4VLongitudinalStringDecay::CreatePartonPai
} else {
// Create a Quark - AntiQuark pair, first in pair IsParticle
//G4double StrSup=StrangeSuppress; StrangeSuppress=0.5;
G4int PDGcode=SampleQuarkFlavor()*NeedParticle;
//StrangeSuppress=StrSup;
return pDefPair (FindParticle(PDGcode),FindParticle(-PDGcode));
}