Commit 434e4339 authored by Stefan Hoeche's avatar Stefan Hoeche
Browse files

make cluster mode switchable for lo

use non-forced partially ordered by default
parent ca433442
......@@ -202,7 +202,7 @@ void Cluster_Algorithm::CreateTables
m_decids=p_proc->DecayInfos();
p_combi = new Combine_Table(p_proc,p_ms,p_clus,amoms,0,&m_decids);
p_combi->FillTable(legs,nlegs,nampl);
p_ct = p_combi->CalcJet(nlegs,NULL,mode,1);
p_ct = p_combi->CalcJet(nlegs,NULL,mode,(mode&512)?1:((mode&16384)?1:0));
if (p_ct==NULL && !(mode&512)) {
msg_Debugging()<<"trying unordered configuration (top level)\n";
p_ct = p_combi->CalcJet(nlegs,NULL,mode,0);
......@@ -210,7 +210,7 @@ void Cluster_Algorithm::CreateTables
}
else {
// use the existing combination table and determine best combination sheme
p_ct = p_combi->CalcJet(nlegs,amoms,mode,1);
p_ct = p_combi->CalcJet(nlegs,amoms,mode,(mode&512)?1:((mode&16384)?1:0));
if (p_ct==NULL && !(mode&512)) {
msg_Debugging()<<"trying unordered configuration (top level)\n";
p_ct = p_combi->CalcJet(nlegs,NULL,mode,0);
......
......@@ -501,7 +501,8 @@ bool Cluster_Algorithm::Cluster
const DecayInfo_Vector &decids(p_bg->DecayInfos());
for (size_t i(0);i<decids.size();++i)
kt2ord.push_back(std::make_pair(decids[i]->m_id,0.0));
if (!Cluster(2,Vertex_Set(),ccurs,fcur,cinfo,kt2ord,1)) {
if (!Cluster(2,Vertex_Set(),ccurs,fcur,cinfo,kt2ord,
(m_wmode&512)?1:((m_wmode&16384)?1:0))) {
if (!(m_wmode&512)) {
KT2Info_Vector kt2ord
(1,KT2_Info((1<<p_ampl->Legs().size())-1,0.0));
......
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