Commit f492b40b authored by Frank Krauss's avatar Frank Krauss

minor bugifx and slightly retuned parameters.

parent 82ae67f6
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Decays","trunk/SHERPA","31416M","a996e1db8b65efc861a3d529d779a078");
......@@ -36,7 +36,7 @@ bool Gluon_Decayer::operator()(Singlet * singlet) {
if (p_singlet->size()==2) {
bool flag = Trivial(p_singlet->front(),p_singlet->back(),false);
if (!flag) {
msg_Out()<<" from singlet size==2\n";
msg_Error()<<"Couldn't deal with 2-parton singlet.\n"<<(*singlet)<<"\n";
exit(1);
}
return flag;
......@@ -130,23 +130,21 @@ bool Gluon_Decayer::LastStep() {
size_t gluon(1),split(0),spect(2);
for (list<Proto_Particle *>::iterator pliter=p_singlet->begin();
pliter!=p_singlet->end();pliter++) part[i++] = (*pliter);
if ((!part[0]->IsLeading() && part[2]->IsLeading()) ||
(!part[0]->IsLeading() && !part[2]->IsLeading() &&
(part[0]->Momentum()+part[1]->Momentum()).Abs2()>
(part[2]->Momentum()+part[1]->Momentum()).Abs2())) {
if ( (!part[0]->IsLeading() && part[2]->IsLeading()) ||
(!part[0]->IsLeading() && !part[2]->IsLeading() &&
(((part[0]->Momentum()+part[1]->Momentum()).Abs2()-
sqr(p_constituents->Mass(part[0]->Flavour()))) <
((part[2]->Momentum()+part[1]->Momentum()).Abs2()-
sqr(p_constituents->Mass(part[2]->Flavour())))))) {
split = 2; spect = 0;
}
int stepres(Step(part[split],part[gluon],part[spect]));
int stepres = Step(part[split],part[gluon],part[spect]);
if (stepres==0) {
bool flag = Trivial(p_singlet->front(),p_singlet->back());
if (!flag) msg_Out()<<" from stepres == 0\n";
return flag;
return Trivial(p_singlet->front(),p_singlet->back());
}
if (split==0) p_singlet->pop_front();
else p_singlet->pop_back();
bool flag = Trivial(p_singlet->front(),p_singlet->back());
if (!flag) msg_Out()<<" from the end == 0\n";
return flag;
return Trivial(p_singlet->front(),p_singlet->back(),false);
}
bool Gluon_Decayer::Trivial(Proto_Particle * part1,Proto_Particle * part2,
......
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Formation","trunk/SHERPA","31416M","ab96bb66a9ab2455d9e33233eeee4ab7");
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Main","trunk/SHERPA","31416M","6aec0d693c797d36f254e1137a42f6f9");
......@@ -94,9 +94,9 @@ ReadGluonSplittingParameters(Data_Reader & dataread) {
dataread.GetValue<double>( "BETA_G", 2.00 );
// light quark fragmentation function
m_parametermap[string("alphaL")] =
dataread.GetValue<double>( "ALPHA_L", 0.25 );
dataread.GetValue<double>( "ALPHA_L", 1.50 );
m_parametermap[string("betaL")] =
dataread.GetValue<double>( "BETA_L", 1.20 );
dataread.GetValue<double>( "BETA_L", 0.25 );
m_parametermap[string("gammaL")] =
dataread.GetValue<double>( "GAMMA_L", 0.50 );
// di-quark fragmentation function
......@@ -108,9 +108,9 @@ ReadGluonSplittingParameters(Data_Reader & dataread) {
dataread.GetValue<double>( "GAMMA_D", m_parametermap[string("gammaL")] );
// heavy quark fragmentation function
m_parametermap[string("alphaH")] =
dataread.GetValue<double>( "ALPHA_H", 0.50 );
dataread.GetValue<double>( "ALPHA_H", 0.25 );
m_parametermap[string("betaH")] =
dataread.GetValue<double>( "BETA_H", 1.00 );
dataread.GetValue<double>( "BETA_H", 1.20 );
m_parametermap[string("gammaH")] =
dataread.GetValue<double>( "GAMMA_H", 0.25 );
}
......@@ -162,7 +162,7 @@ void Hadronisation_Parameters::ReadMesonWeights(Data_Reader & dataread)
m_parametermap[string("Multiplet_Meson_R0L0S1")] =
dataread.GetValue<double>("MULTI_WEIGHT_R0L0_VECTORS", 1.00);
m_parametermap[string("Multiplet_Meson_R0L0S2")] =
dataread.GetValue<double>("MULTI_WEIGHT_R0L0_TENSORS2", 0.50);
dataread.GetValue<double>("MULTI_WEIGHT_R0L0_TENSORS2", 0.75);
m_parametermap[string("Multiplet_Meson_R0L1S0")] =
dataread.GetValue<double>("MULTI_WEIGHT_R0L1_SCALARS", 0.10);
m_parametermap[string("Multiplet_Meson_R0L1S1")] =
......@@ -182,7 +182,7 @@ void Hadronisation_Parameters::ReadMesonWeights(Data_Reader & dataread)
dataread.GetValue<double>("MULTI_WEIGHT_R0L0_DELTA_3/2", 0.25);
// Individual hadrons
m_parametermap[string("eta_modifier")] =
dataread.GetValue<double>("ETA_MODIFIER", 0.15);
dataread.GetValue<double>("ETA_MODIFIER", 0.12);
m_parametermap[string("eta_prime_modifier")] =
dataread.GetValue<double>("ETA_PRIME_MODIFIER", 1.00);
}
......@@ -193,7 +193,7 @@ void Hadronisation_Parameters::ReadPoppingParameters(Data_Reader & dataread)
m_parametermap[string("Strange_fraction")] = sfrac =
dataread.GetValue<double>("STRANGE_FRACTION", 0.42);
m_parametermap[string("Baryon_fraction")] =
dataread.GetValue<double>("BARYON_FRACTION", 0.80);
dataread.GetValue<double>("BARYON_FRACTION", 1.00);
m_parametermap[string("charm_baryon_modifier")] =
dataread.GetValue<double>("CHARM_BARYON_MODIFIER", 1.00);
m_parametermap[string("beauty_baryon_modifier")] =
......@@ -209,7 +209,7 @@ void Hadronisation_Parameters::ReadPoppingParameters(Data_Reader & dataread)
void Hadronisation_Parameters::ReadMassParameters(Data_Reader & dataread)
{
m_parametermap[string("minmass2")] =
dataread.GetValue<double>("MIN_MASS2", 0.25);
dataread.GetValue<double>("MIN_MASS2", 0.10);
m_parametermap[string("Mass_glue")] =
dataread.GetValue<double>("M_GLUE", 0.00);
Flavour(kf_gluon).SetHadMass(m_parametermap["Mass_glue"]);
......
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Tools","trunk/SHERPA","31416M","96fdcbe6b883bea5fee2f27a7ff54f2e");
......@@ -97,7 +97,6 @@ Singlet_Tools::Singlet_Tools() {}
void Singlet_Tools::Init() {
p_constituents = hadpars->GetConstituents();
m_minQmass = p_constituents->MinMass();
}
bool Singlet_Tools::CheckMass(Proto_Particle * part1,Proto_Particle * part2) {
......
......@@ -132,11 +132,13 @@ void Soft_Cluster_Handler::FillFlavours(Cluster * cluster) {
int Soft_Cluster_Handler::Decay() {
m_hads[0] = m_hads[1] = Flavour(kf_none);
double decweight(DecayWeight());
if (decweight>0. && m_mass>80.) {
msg_Out()<<"Gotcha! ["<<m_flavs.first<<", "<<m_flavs.second<<"] --> "
<<m_hads[0]<<" + "<<m_hads[1]<<" "
<<"(forced = "<<m_forceddecay<<")\n";
}
//if (decweight>0. &&
// (m_mass-m_flavs.first.HadMass()-m_flavs.second.HadMass())>10.) {
// msg_Out()<<"Gotcha! ["<<m_flavs.first<<", "<<m_flavs.second<<"] --> "
// <<"mass = "<<m_mass<<", "<<m_hads[0]<<" + "<<m_hads[1]<<" "
// <<"(forced = "<<m_forceddecay<<")\n";
// exit(1);
//}
if (decweight>0. && FixKinematics()) return 1;
m_hads[0] = Flavour(kf_none); m_hads[1] = Flavour(kf_photon);
double radweight = RadiationWeight();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment