Commit 1cc75d96 authored by Enrico Bothmann's avatar Enrico Bothmann

Fix compiler warnings

parent 5e2d21a7
#include "AMEGIC++/Amplitude/Amplitude_Base.H"
#include "ATOOLS/Org/My_MPI.H"
#include "ATOOLS/Org/Exception.H"
using namespace AMEGIC;
using namespace ATOOLS;
......@@ -49,5 +50,5 @@ void Amplitude_Base::DefineOrder(const std::vector<int> &o)
const std::vector<int> &Amplitude_Base::GetOrder()
{
Abort();
THROW(fatal_error, "Error: Amplitude_Base::GetOrder() is not implemented.");
}
......@@ -6,6 +6,8 @@
#include "AMEGIC++/String/String_Handler.H"
#include "ATOOLS/Org/Message.H"
#include "ATOOLS/Org/My_MPI.H"
#include "ATOOLS/Org/Exception.H"
#include "ATOOLS/Org/MyStrStream.H"
#include <cassert>
using namespace ATOOLS;
......@@ -403,9 +405,11 @@ Flavour* Single_Amplitude_Base::GetPflav(int pn)
Pfunc* p = *pit;
if(pn==p->arg[0])return &(p->fl);
}
msg_Error()<<"ERROR in Single_Amplitude_Base::GetPflav: "<<std::endl
<<" Propagator "<<pn<<" not found. Abort the run."<<endl;
Abort();
MyStrStream stream;
stream << "ERROR in Single_Amplitude_Base::GetPflav:\n";
stream << " Propagator " << pn << " not found. Abort the run.";
THROW(fatal_error, stream.str());
}
Kabbala Single_Amplitude_Base::GetProp(Zfunc* z)
......
......@@ -83,7 +83,7 @@ std::ostream& AMEGIC::operator<<(std::ostream &s,const Combine_Data &cd)
std::string graphs;
for (size_t k=0;k<cd.m_graphs.size();++k) graphs+=","+ToString(cd.m_graphs[k]);
s<<graphs.substr(1);
if (cd.p_down) s<<" -> "<<cd.p_down->m_no;
if (cd.p_down) s<<" -> "<<cd.p_down->Number();
return s;
}
......@@ -107,61 +107,57 @@ Combine_Data::~Combine_Data()
std::ostream& AMEGIC::operator<<(std::ostream& s ,const Combine_Table & ct)
{
if (&ct) {
s<<std::endl<<" Combine_Table ("<<&ct<<") "<<ct.m_no
<<" [OQCD="<<ct.m_nstrong<<"] (up=";
if (ct.p_up) s<<ct.p_up->m_no<<")"<<std::endl; else s<<"#)"<<std::endl;
if (ct.m_decids.size()) {
std::string ds;
for (DecayInfo_Vector::const_iterator cit(ct.m_decids.begin());
cit!=ct.m_decids.end();++cit) {
ds+=ToString(**cit)+" ";
}
s<<" decs = { "<<ds<<"}\n";
s<<std::endl<<" Combine_Table ("<<&ct<<") "<<ct.m_no
<<" [OQCD="<<ct.m_nstrong<<"] (up=";
if (ct.p_up) s<<ct.p_up->m_no<<")"<<std::endl; else s<<"#)"<<std::endl;
if (ct.m_decids.size()) {
std::string ds;
for (DecayInfo_Vector::const_iterator cit(ct.m_decids.begin());
cit!=ct.m_decids.end();++cit) {
ds+=ToString(**cit)+" ";
}
s<<" id"<<std::setw(12)<<"content"<<std::setw(8)
<<"flav"<<std::setw(5)<<"cut qcd qed"<<std::setw(12)
<<" mom"<<std::endl;
for (int l=0; l<ct.m_nlegs; ++l) {
s<<std::setw(3)<<l<<std::setw(12)<<ToString(ID(ct.GetLeg(l).ID()))
<<std::setw(8)<<ct.p_legs[0][l].Flav()<<std::setw(4)
<<ct.p_legs[0][l].Point()->t<<" "<<ct.GetLeg(l).OrderQCD()
<<"/"<<ct.GetLeg(l).NQCD()<<" "<<ct.GetLeg(l).OrderQED()
<<"/"<<ct.GetLeg(l).NQED()<<" "<<ct.p_moms[l]<<std::endl;
s<<" decs = { "<<ds<<"}\n";
}
s<<" id"<<std::setw(12)<<"content"<<std::setw(8)
<<"flav"<<std::setw(5)<<"cut qcd qed"<<std::setw(12)
<<" mom"<<std::endl;
for (int l=0; l<ct.m_nlegs; ++l) {
s<<std::setw(3)<<l<<std::setw(12)<<ToString(ID(ct.GetLeg(l).ID()))
<<std::setw(8)<<ct.p_legs[0][l].Flav()<<std::setw(4)
<<ct.p_legs[0][l].Point()->t<<" "<<ct.GetLeg(l).OrderQCD()
<<"/"<<ct.GetLeg(l).NQCD()<<" "<<ct.GetLeg(l).OrderQED()
<<"/"<<ct.GetLeg(l).NQED()<<" "<<ct.p_moms[l]<<std::endl;
}
s<<" ---------------"<<std::endl;
const CD_List & cl=ct.m_combinations;
if (cl.size()>0) {
for (CD_List::const_iterator cit=cl.begin(); cit!=cl.end(); ++cit) {
s<<cit->first<<std::setw(8)<<cit->second
<<(cit==ct.m_cdata_winner?" <-":"")<<std::endl;
}
s<<" ---------------"<<std::endl;
const CD_List & cl=ct.m_combinations;
if (cl.size()>0) {
for (CD_List::const_iterator cit=cl.begin(); cit!=cl.end(); ++cit) {
s<<cit->first<<std::setw(8)<<cit->second
<<(cit==ct.m_cdata_winner?" <-":"")<<std::endl;
}
for (CD_List::const_iterator cit=cl.begin(); cit!=cl.end(); ++cit) {
if (cit->second.p_down) {
s<<*cit->second.p_down<<std::endl;
}
for (CD_List::const_iterator cit=cl.begin(); cit!=cl.end(); ++cit) {
if (cit->second.p_down) {
s<<*cit->second.p_down<<std::endl;
}
}
else if (ct.p_hard) {
s<<" graph"<<std::setw(8)
<<"flav"<<std::setw(5)<<" cut qcd qed"<<std::setw(12)
<<"q_{min qcd}"<<std::setw(12)<<"q_{min qed}"<<std::setw(12)<<std::endl;
for (int k=0;k<ct.m_nampl;++k) {
for (int l=0;l<2;++l) {
s<<std::setw(3)<<k<<"("<<l<<")"<<std::setw(8)
<<ct.p_hard[k][l].Flav()<<std::setw(4)
<<ct.p_hard[k][l].Point()->t<<" "<<ct.p_hard[k][l].OrderQCD()
<<"/"<<ct.p_hard[k][l].NQCD()<<" "<<ct.p_hard[k][l].OrderQED()
<<"/"<<ct.p_hard[k][l].NQED()<<std::setw(12)<<std::endl;
}
}
else if (ct.p_hard) {
s<<" graph"<<std::setw(8)
<<"flav"<<std::setw(5)<<" cut qcd qed"<<std::setw(12)
<<"q_{min qcd}"<<std::setw(12)<<"q_{min qed}"<<std::setw(12)<<std::endl;
for (int k=0;k<ct.m_nampl;++k) {
for (int l=0;l<2;++l) {
s<<std::setw(3)<<k<<"("<<l<<")"<<std::setw(8)
<<ct.p_hard[k][l].Flav()<<std::setw(4)
<<ct.p_hard[k][l].Point()->t<<" "<<ct.p_hard[k][l].OrderQCD()
<<"/"<<ct.p_hard[k][l].NQCD()<<" "<<ct.p_hard[k][l].OrderQED()
<<"/"<<ct.p_hard[k][l].NQED()<<std::setw(12)<<std::endl;
}
}
s<<" k_{T,min}\n";
for (size_t i(0);i<ct.m_kt2ord.size();++i)
s<<ID(ct.m_kt2ord[i].first)<<" -> "<<sqrt(ct.m_kt2ord[i].second)<<"\n";
}
else
s<<"***empty Combine_Table***"<<std::endl;
}
s<<" k_{T,min}\n";
for (size_t i(0);i<ct.m_kt2ord.size();++i)
s<<ID(ct.m_kt2ord[i].first)<<" -> "<<sqrt(ct.m_kt2ord[i].second)<<"\n";
return s;
}
......
......@@ -93,7 +93,6 @@ namespace AMEGIC {
Combine_Table *p_down;
ATOOLS::Flavour m_mo;
std::vector<int> m_graphs;
friend std::ostream &operator<< (std::ostream&,const Combine_Table &);
public:
// constructors
Combine_Data();
......@@ -158,8 +157,7 @@ namespace AMEGIC {
double Sprime() const;
ATOOLS::Flavour MatchFlavour(const Leg &a,const Leg &b,const Leg &c,int mode) const;
friend std::ostream& operator<< (std::ostream&,const Combine_Table &);
friend std::ostream &operator<<(std::ostream&,const Combine_Data &);
friend std::ostream& operator<<(std::ostream&,const Combine_Table &);
public:
// constructors
Combine_Table(AMEGIC::Process_Base *const proc,
......
......@@ -155,6 +155,7 @@ size_t GGH_Decay_KFactor_Setter::GetHiggsIndex() const {
if (p_ampl->Leg(i)->Flav().Kfcode() == kf_h0)
return i;
}
THROW(fatal_error, "Internal error");
}
std::vector<Size_t_Vec > GGH_Decay_KFactor_Setter::GetIndexVec() const {
......
......@@ -23,7 +23,7 @@ namespace DIRE {
double z(s.m_z), y(s.m_y);
double A=2.0*(1.0-z)/(sqr(1.0-z)+s.m_t/s.m_Q2);
double B=-(1.0+z);
if (s.m_kfac&2)
if (s.m_kfac&2) {
if (m_swap) {
B+=A;
A=0.0;
......@@ -44,6 +44,7 @@ namespace DIRE {
B2+=(x-1.)*40*TF/(1.0+x*x/(s.m_t/s.m_Q2));
B+=p_sk->GF()->Coupling(s)/(2.0*M_PI)*B2/(18.*x*(x-1.0));
}
}
if (s.m_mij2==0.0 && s.m_mi2==0.0 && s.m_mk2==0.0)
return (m_swap?1.0-z:z)*(A*(1.0+p_sk->GF()->K(s))+B);
double Q2(s.m_Q2+s.m_mi2+s.m_mj2+s.m_mk2);
......
......@@ -24,7 +24,7 @@ namespace DIRE {
double z(s.m_z);
double A=2.0*(1.0-z)/(sqr(1.0-z)+s.m_t/s.m_Q2);
double B=-(1.0+z);
if (s.m_kfac&2)
if (s.m_kfac&2) {
if (m_swap) {
B+=A;
A=0.0;
......@@ -45,6 +45,7 @@ namespace DIRE {
B2+=(x-1.)*40*TF/(1.0+x*x/(s.m_t/s.m_Q2));
B+=p_sk->GF()->Coupling(s)/(2.0*M_PI)*B2/(18.*x*(x-1.0));
}
}
if (s.m_mij2==0.0 && s.m_mi2==0.0)
return (m_swap?1.0-z:z)*(A*(1.0+p_sk->GF()->K(s))+B);
double pipj=s.m_Q2*(1.0-s.m_y)/s.m_y/2.0;
......
......@@ -21,7 +21,7 @@ namespace DIRE {
Gauge(const Kernel_Key &k);
~Gauge();
virtual ~Gauge();
double Value(const Splitting &s) const;
double Estimate(const Splitting &s) const;
......
......@@ -35,7 +35,7 @@ namespace DIRE {
Lorentz(const Kernel_Key &k,const int type);
~Lorentz();
virtual ~Lorentz();
virtual double Value(const Splitting &s) const = 0;
virtual double Jacobian(const Splitting &s) const = 0;
......
......@@ -20,7 +20,7 @@ PoleFit::PoleFit(GeneralModel model, double* masses, const Flavour_Vector& flavs
{
kf_code kf0=m_flavs[p_i[0]].Kfcode();
kf_code kf1=m_flavs[p_i[1]].Kfcode();
if (kf0==kf_B_c)
if (kf0==kf_B_c) {
if (kf1==10533){
F_0_A=0.19,m_fit_A=1.71,delta_A=0.45;
F_0_V_0=0.10,m_fit_V_0=-0.75,delta_V_0=0.95;
......@@ -34,9 +34,7 @@ PoleFit::PoleFit(GeneralModel model, double* masses, const Flavour_Vector& flavs
F_0_V_2=0.09,m_fit_V_2=1.64,delta_V_2=0.38;
}
}
}
void PoleFit::CalcFFs( Vec4D p0, Vec4D p1 )
......
......@@ -66,7 +66,7 @@ PDF::CParam SingleTop_Core_Scale::Calculate(Cluster_Amplitude *const ampl)
}
// top in initial state
else if ((f[0].Kfcode()==6 && f[1].Strong() && f[1].Kfcode()!=6) ||
f[0].Strong() && f[0].Kfcode()!=6 && f[1].Kfcode()==6) {
(f[0].Strong() && f[0].Kfcode()!=6 && f[1].Kfcode()==6)) {
unsigned short int nottop=1;
if (f[1].Kfcode()==6){
if (f[0].Kfcode()==6) std::cout<<"tt initial state\n";
......
......@@ -61,7 +61,7 @@ PDF::CParam TZj_Core_Scale::Calculate(Cluster_Amplitude *const ampl)
}
// top in initial state
else if ((f[0].Kfcode()==6 && f[1].Strong() && f[1].Kfcode()!=6) ||
f[0].Strong() && f[0].Kfcode()!=6 && f[1].Kfcode()==6) {
(f[0].Strong() && f[0].Kfcode()!=6 && f[1].Kfcode()==6)) {
unsigned short int nottop=1;
if (f[1].Kfcode()==6) nottop=0;
muf2 = muq2 = mur2 = (f[nottop].Kfcode()==5?shat:dabs(that));
......
......@@ -90,7 +90,7 @@ namespace PHASIC {
double yboost((psum/(double)(p.size()-p_setter->NIn())).Y());
double hty(0.0);
for (size_t i(p_setter->NIn());i<p.size();++i)
hty+=p[i].PPerp()*exp(htyfac*pow(abs(p[i].Y()-yboost),htyexp));
hty+=p[i].PPerp()*exp(htyfac*pow(std::abs(p[i].Y()-yboost),htyexp));
Term *res(Term::New(sqr(hty)));
p_interpreter->AddTerm(res);
return res;
......
......@@ -653,7 +653,7 @@ bool HepMC2_Interface::Sherpa2HepMC(ATOOLS::Particle * parton,
return true;
}
bool HepMC2_Interface::AddCrossSection(HepMC::GenEvent& event,
void HepMC2_Interface::AddCrossSection(HepMC::GenEvent& event,
const double &xs, const double &err)
{
#ifdef HEPMC_HAS_CROSS_SECTION
......
......@@ -94,7 +94,7 @@ namespace SHERPA {
bool Sherpa2ShortHepMC(ATOOLS::Blob_List *const blobs, double weight=1.0);
bool SubEvtList2ShortHepMC(EventInfo &evtinfo);
bool AddCrossSection(HepMC::GenEvent& event,
void AddCrossSection(HepMC::GenEvent& event,
const double& xs, const double& err);
// inline functions
......
......@@ -27,7 +27,7 @@ Beam_Remnant_Handler::~Beam_Remnant_Handler() {
m_hadrons.clear();
}
bool Beam_Remnant_Handler::InitialiseCollision() {
void Beam_Remnant_Handler::InitialiseCollision() {
Reset();
}
......
......@@ -26,7 +26,7 @@ namespace SHRIMPS {
~Beam_Remnant_Handler();
void Reset();
bool InitialiseCollision();
void InitialiseCollision();
void SetEikonal(Omega_ik * eikonal);
ATOOLS::Return_Value::code FillBeamBlobs(ATOOLS::Blob_List * blobs);
......
......@@ -87,6 +87,7 @@ double Sigma_Elastic::FillIntQGridAndNormalize() {
double Sigma_Elastic::SelectPT2() const {
THROW(not_implemented, "Missing implementation for Sigma_Elastic::SelectPT2().");
double random(ran->Get());
// unsigned int i(0);
// while (random-m_intgrid[i]>=0) i++;
......
......@@ -108,6 +108,7 @@ void Omega_ik::PrepareQT(const double & b1,const double & b2) {
double Omega_ik::
EffectiveIntercept(double b1,double b2,const double & y) {
THROW(not_implemented, "Missing implementation for Omega_ik::EffectiveIntercept().");
//return m_weights.EffectiveIntercept(b1,b2,y);
}
......
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