Commit dab51811 authored by Holger Schulz's avatar Holger Schulz

Removing AHADIC messages

parent ec115868
......@@ -26,7 +26,7 @@ int Cluster_Decay_Handler::DecayClusters(Blob * blob)
{
Cluster * cluster;
Cluster_Iterator cit(p_clulist->begin());
msg_Out()<<METHOD<<" with "<<p_clulist->size()<<" clusters.\n";
//msg_Out()<<METHOD<<" with "<<p_clulist->size()<<" clusters.\n";
while (!p_clulist->empty()) {
cluster = p_clulist->front();
if (!cluster->Active()) return -1;
......@@ -45,12 +45,12 @@ int Cluster_Decay_Handler::DecayClusters(Blob * blob)
}
}
else {
msg_Out()<<METHOD<<" --> EnforcedDecay of\n"<<(*cluster)<<"\n";
//msg_Out()<<METHOD<<" --> EnforcedDecay of\n"<<(*cluster)<<"\n";
if (!p_softclusters->EnforcedDecay(cluster,blob,true,NULL,true))
return -1;
msg_Out()<<"Found "<<cluster->size()<<" hadrons: "
<<(*cluster)[0]<<" + "<<(*cluster)[1]<<".\n";
msg_Out()<<"Success:\n"<<(*blob)<<"\n\n\n";
//msg_Out()<<"Found "<<cluster->size()<<" hadrons: "
//<<(*cluster)[0]<<" + "<<(*cluster)[1]<<".\n";
//msg_Out()<<"Success:\n"<<(*blob)<<"\n\n\n";
}
delete (p_clulist->front()->GetTrip());
delete (p_clulist->front()->GetAnti());
......
......@@ -23,7 +23,7 @@ bool Cluster_Part::TestDecay(Cluster * const cluster)
m_att++;
if (p_csplitter && !(*p_csplitter)(cluster)) {
m_fails++;
msg_Out()<<METHOD<<" fails for\n"<<(*cluster)<<"\n";
//msg_Out()<<METHOD<<" fails for\n"<<(*cluster)<<"\n";
return false;
}
return true;
......
......@@ -107,7 +107,7 @@ int Cluster_Formation_Handler::FormClusters(Blob * blob) {
//if (blob->NOutP()>0) msg_Out()<<(*blob);
//msg_Out()<<"##################################################\n";
msg_Out()<<METHOD<<":"<<(*blob)<<"\n";
//msg_Out()<<METHOD<<":"<<(*blob)<<"\n";
return 1;
}
......@@ -188,8 +188,8 @@ bool Cluster_Formation_Handler::ExtractSinglets(Blob * blob)
construct = true;
}
}
for (LPPL_Iterator pli=m_partlists.begin();pli!=m_partlists.end();pli++)
msg_Out()<<(**pli)<<"\n";
//for (LPPL_Iterator pli=m_partlists.begin();pli!=m_partlists.end();pli++)
// msg_Out()<<(**pli)<<"\n";
// if (ana) {
// if (over) {
// msg_Out()<<"\n\n"<<Nover<<" interesting particles: "<<id<<"\n"
......@@ -355,13 +355,13 @@ bool Cluster_Formation_Handler::FormOriginalClusters()
while (!m_partlists.empty()) {
pplit=m_partlists.begin();
msg_Tracking()<<"======= "<<METHOD<<" for :\n"<<(**pplit)<<"\n";
msg_Out()<<"========== before gluon splitting:\n"<<(**pplit)<<"\n";
// msg_Tracking()<<"======= "<<METHOD<<" for :\n"<<(**pplit)<<"\n";
// msg_Out()<<"========== before gluon splitting:\n"<<(**pplit)<<"\n";
if(p_gludecayer->DecayList(*pplit)) {
msg_Out()<<"========== after gluon splitting:\n"<<(**pplit)<<"\n";
//msg_Out()<<"========== after gluon splitting:\n"<<(**pplit)<<"\n";
clist = new Cluster_List;
p_cformer->ConstructClusters(*pplit,clist);
msg_Out()<<"========== cluster list :\n"<<(*clist)<<"\n";
// msg_Out()<<"========== cluster list :\n"<<(*clist)<<"\n";
m_clulists.push_back(clist);
pplit=m_partlists.erase(pplit);
}
......@@ -434,7 +434,7 @@ bool Cluster_Formation_Handler::MergeClusterListsIntoOne() {
bool Cluster_Formation_Handler::ClustersToHadrons(Blob * blob)
{
msg_Out()<<METHOD<<" for: \n"<<(*p_clulist)<<"\n";
// msg_Out()<<METHOD<<" for: \n"<<(*p_clulist)<<"\n";
if (!p_softclusters->TreatClusterList(p_clulist,blob)) return false;
if (m_analyse) {
......
......@@ -171,7 +171,7 @@ Return_Value::code Ahadic::Hadronize(Blob * blob,int retry) {
break;
}
msg_Out()<<METHOD<<" formed clusters:\n"<<(*blob)<<".\n";
//msg_Out()<<METHOD<<" formed clusters:\n"<<(*blob)<<".\n";
switch (p_cdechandler->DecayClusters(blob)) {
case -1 :
msg_Tracking()<<"ERROR in "<<METHOD<<" :"<<std::endl
......
......@@ -61,21 +61,21 @@ Soft_Cluster_Handler::~Soft_Cluster_Handler()
bool Soft_Cluster_Handler::TreatClusterList(Cluster_List * clin, Blob * blob)
{
if (clin->size()==1) {
msg_Out()<<METHOD<<" for cluster list with one cluster only!\n";
//msg_Out()<<METHOD<<" for cluster list with one cluster only!\n";
if (TreatSingleCluster(*clin->begin(),true))
return AttachHadronsToBlob(clin,blob);
if (EnforcedDecay(*clin->begin(),blob,true,clin,false)) {
AttachHadronsToBlob(clin,blob);
msg_Out()<<METHOD<<" enforces decay of cluster:\n"<<(*blob)<<",\n"
<<" cluster list has "<<clin->size()<<" elements left.\n";
//msg_Out()<<METHOD<<" enforces decay of cluster:\n"<<(*blob)<<",\n"
// <<" cluster list has "<<clin->size()<<" elements left.\n";
return true;
}
}
msg_Out()<<METHOD<<" for "<<clin->size()<<" clusters.\n";
//msg_Out()<<METHOD<<" for "<<clin->size()<<" clusters.\n";
if (!CheckListForTreatment(clin)) return true;
m_lists++;
double E(-1.);
msg_Out()<<METHOD<<" checking if all decays/transitions are allowed.\n";
//msg_Out()<<METHOD<<" checking if all decays/transitions are allowed.\n";
if (!CheckIfAllowed(clin,E)) {
do {
if (!UpdateTransitions(clin)) {
......@@ -106,7 +106,7 @@ bool Soft_Cluster_Handler::TreatSingleCluster(Cluster * cluster,bool mustdecay)
case -1: return false;
default: break;
}
msg_Out()<<METHOD<<";\n"<<(*cluster)<<"\n";
//msg_Out()<<METHOD<<";\n"<<(*cluster)<<"\n";
return true;
}
......@@ -133,7 +133,7 @@ bool Soft_Cluster_Handler::TreatClusterDecay(Cluster_List * clin, Blob * blob)
return false;
}
clin->clear();
msg_Out()<<METHOD<<" --> EnforcedDecay for \n"<<(*cluster)<<"\n";
//msg_Out()<<METHOD<<" --> EnforcedDecay for \n"<<(*cluster)<<"\n";
return EnforcedDecay(cluster,blob,true,clin,false);
// probably better:
// if (!EnforcedDecay(cluster,blob,true,clin) return false;
......@@ -150,7 +150,7 @@ AttachHadronsToBlob(Cluster_List * clin,Blob * blob)
Cluster * cluster;
while (cit!=clin->end()) {
cluster = (*cit);
msg_Out()<<METHOD<<" for "<<cluster->size()<<".\n";
//msg_Out()<<METHOD<<" for "<<cluster->size()<<".\n";
switch (cluster->size()) {
case 1:
part = cluster->GetSelf();
......@@ -245,10 +245,10 @@ int Soft_Cluster_Handler::CheckCluster(Cluster * cluster,bool lighter,
Flavour hadtrans(Flavour(kf_none));
double decayweight(DecayWeight(cluster,haddec1,haddec2,mustdecay));
double transformweight(TransformWeight(cluster,hadtrans,lighter,mustdecay));
msg_Out()<<METHOD<<"("<<mustdecay<<lighter<<") yields "
<<"dec = "<<decayweight<<"("<<haddec1<<" "<<haddec2<<"), "
<<"trans = "<<transformweight<<"("<<hadtrans<<").\n"
<<(*cluster)<<"\n";
//msg_Out()<<METHOD<<"("<<mustdecay<<lighter<<") yields "
// <<"dec = "<<decayweight<<"("<<haddec1<<" "<<haddec2<<"), "
// <<"trans = "<<transformweight<<"("<<hadtrans<<").\n"
// <<(*cluster)<<"\n";
if (mustdecay) {
if (decayweight>0.) {
......@@ -273,21 +273,21 @@ int Soft_Cluster_Handler::CheckCluster(Cluster * cluster,bool lighter,
m_decays += 1;
cluster->push_back(haddec1);
cluster->push_back(haddec2);
msg_Out()<<METHOD<<" yields decay to "<<haddec1<<" + "<<haddec2<<".\n";
//msg_Out()<<METHOD<<" yields decay to "<<haddec1<<" + "<<haddec2<<".\n";
return 2;
}
if (transformweight>0.) {
m_transitions += 1;
cluster->push_back(hadtrans);
msg_Out()<<METHOD<<" yields transition to "<<hadtrans<<".\n";
//msg_Out()<<METHOD<<" yields transition to "<<hadtrans<<".\n";
return 1;
}
}
else {
if (transformweight<=0. && hadtrans!=Flavour(kf_none)) {
transformweight = TransformWeight(cluster,hadtrans,false,true);
msg_Out()<<METHOD<<" tries to force it for\n"<<(*cluster)<<"\n";
msg_Out()<<"Gotcha: "<<transformweight<<", "<<hadtrans<<"!\n";
//msg_Out()<<METHOD<<" tries to force it for\n"<<(*cluster)<<"\n";
//msg_Out()<<"Gotcha: "<<transformweight<<", "<<hadtrans<<"!\n";
m_transitions += 1;
cluster->push_back(hadtrans);
return 1;
......@@ -382,7 +382,7 @@ ClusterAnnihilation(Cluster * cluster,Flavour & had1,Flavour & had2) {
kf_code kfc11(kfc1/1000),kfc12((kfc1-kfc11*1000)/100);
kf_code kfc21(kfc2/1000),kfc22((kfc2-kfc21*1000)/100);
Flavour fl1(kfc11), fl2(kfc12), fl3(kfc21), fl4(kfc22);
msg_Out()<<METHOD<<"("<<fl1<<", "<<fl2<<") & ("<<fl3<<", "<<fl4<<").\n";
//msg_Out()<<METHOD<<"("<<fl1<<", "<<fl2<<") & ("<<fl3<<", "<<fl4<<").\n";
fl1 = fl1.Bar();
fl2 = fl2.Bar();
Proto_Particle *pp1(new Proto_Particle(fl1,cluster->GetTrip()->m_mom/2.,'l'));
......@@ -426,7 +426,7 @@ EnforcedDecay(Cluster * cluster, Blob * blob,const bool & constrained,
if (weight<=0.) {
if (cluster->GetTrip()->m_flav.IsDiQuark() &&
cluster->GetAnti()->m_flav.IsDiQuark()) {
msg_Out()<<METHOD<<": must annihilate cluster.\n";
//msg_Out()<<METHOD<<": must annihilate cluster.\n";
if (!ClusterAnnihilation(cluster,had1,had2)) return false;
}
else {
......@@ -442,7 +442,7 @@ EnforcedDecay(Cluster * cluster, Blob * blob,const bool & constrained,
m_forceddecays++;m_decays--;
}
msg_Out()<<METHOD<<" --> "<<had1<<" + "<<had2<<"\n";
//msg_Out()<<METHOD<<" --> "<<had1<<" + "<<had2<<"\n";
cluster->push_back(had1);
cluster->push_back(had2);
if (attach) {
......@@ -553,7 +553,7 @@ TransformWeight(Cluster * cluster,Flavour & hadron,
double MC(cluster->Mass());
double critM(p_singletransitions->GetLightestMass(fpair)*(1.-m_transoffset)+
p_singletransitions->GetHeaviestMass(fpair)*m_transoffset);
msg_Out()<<METHOD<<" for M = "<<MC<<" (crit = "<<critM<<")\n";
//msg_Out()<<METHOD<<" for M = "<<MC<<" (crit = "<<critM<<")\n";
if (!enforce && MC>critM) {
hadron = Flavour(kf_none);
return 0.;
......@@ -596,11 +596,11 @@ TransformWeight(Cluster * cluster,Flavour & hadron,
}
totweight += wt;
}
msg_Out()<<METHOD<<" with totweight = "<<totweight<<".\n";
for (siter=start;siter!=stl->end();siter++) {
msg_Out()<<siter->first<<" yields "<<siter->second<<" --> "
<<TransformKin(MC,siter->first,enforce)<<".\n";
}
//msg_Out()<<METHOD<<" with totweight = "<<totweight<<".\n";
// for (siter=start;siter!=stl->end();siter++) {
// msg_Out()<<siter->first<<" yields "<<siter->second<<" --> "
// <<TransformKin(MC,siter->first,enforce)<<".\n";
//}
double disc(totweight * 0.9999999999*ran->Get());
for (siter=start;siter!=stl->end();siter++) {
......
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