Commit 759636cf authored by Stefan Hoeche's avatar Stefan Hoeche
Browse files

svn merge -c22636 trunk/SHERPA

svn merge -c22638 trunk/SHERPA
parent a45da34b
......@@ -95,5 +95,6 @@ bool Single_Dipole_Term::Combinable(const size_t &idi,const size_t &idj)
const Flavour_Vector &Single_Dipole_Term::CombinedFlavour(const size_t &idij)
{
return Flavour_Vector();
THROW(fatal_error,"Invalid call");
return m_flavs;
}
......@@ -5,6 +5,10 @@ using namespace HADRONS;
using namespace ATOOLS;
using namespace std;
VA_0_PPP::FF_Base::~FF_Base()
{
}
VA_0_PPP::VA_0_PPP(const ATOOLS::Flavour_Vector& flavs,
const std::vector<int>& indices, const std::string& name) :
Current_Base(flavs, indices, name)
......
......@@ -23,7 +23,7 @@ namespace HADRONS {
public :
FF_Base(int mode, int kaon_mode, std::string path, GeneralModel _md, double * ms );
~FF_Base() {}
virtual ~FF_Base();
virtual Complex FormFactor( int, double, double, double ) = 0;
inline double Mass2(int i) { return m_ms[i]; }
};
......
......@@ -5,6 +5,10 @@ using namespace HADRONS;
using namespace ATOOLS;
using namespace std;
VA_0_PP_strange::FF_Base::~FF_Base()
{
}
void VA_0_PP_strange::SetModelParameters( struct GeneralModel _md )
{
m_chpionmode = (m_flavs[p_i[0]].Kfcode() == kf_pi_plus) ? 1 : 0;
......
......@@ -16,6 +16,7 @@ namespace HADRONS {
double m_Sigma_KP, m_Delta_KP; // sum, difference of masses^2
public :
FF_Base(GeneralModel _md);
virtual ~FF_Base();
virtual Complex VectorFormFactor( double ) = 0;
virtual Complex ScalarFormFactor( double ) = 0;
void SetMasses2( double, double, double );
......
......@@ -11,6 +11,10 @@ using namespace std;
#include "HADRONS++/Current_Library/VA_B_B_HO.C"
#include "HADRONS++/Current_Library/VA_B_B_ST.C"
VA_B_B_FFs::FormFactor_Base::~FormFactor_Base()
{
}
void VA_B_B::SetModelParameters( struct GeneralModel model )
{
m_V_CKM = model("V_CKM",1.0);
......
......@@ -16,6 +16,7 @@ namespace VA_B_B_FFs
public:
FormFactor_Base(struct GeneralModel model, double* masses) :
m0(masses[0]), m1(masses[1]), m_calced(false) {}
virtual ~FormFactor_Base();
virtual void CalcFFs( ATOOLS::Vec4D p0, ATOOLS::Vec4D p1 ) = 0;
double V1() { if(!m_calced) abort(); return m_V1; }
double V2() { if(!m_calced) abort(); return m_V2; }
......
......@@ -11,6 +11,10 @@ using namespace std;
#include "HADRONS++/Current_Library/VA_B_B3_HO.C"
#include "HADRONS++/Current_Library/VA_B_B3_ST.C"
VA_B_B3_FFs::FormFactor_Base::~FormFactor_Base()
{
}
void VA_B_B3::SetModelParameters( struct GeneralModel model )
{
m_V_CKM = model("V_CKM",1.0);
......
......@@ -16,6 +16,7 @@ namespace VA_B_B3_FFs
public:
FormFactor_Base(struct GeneralModel model, double* masses) :
m0(masses[0]), m1(masses[1]), m_calced(false) {}
virtual ~FormFactor_Base();
virtual void CalcFFs( ATOOLS::Vec4D p0, ATOOLS::Vec4D p1 ) = 0;
double V1() { if(!m_calced) abort(); return m_V1; }
double V2() { if(!m_calced) abort(); return m_V2; }
......
......@@ -6,6 +6,10 @@ using namespace HADRONS;
using namespace ATOOLS;
using namespace METOOLS;
VA_F_F::FF_Base::~FF_Base()
{
}
void VA_F_F::SetModelParameters( struct GeneralModel _md )
{
m_cR = Complex(0.,_md("v",1.)+_md("a",-1.));
......
......@@ -9,6 +9,7 @@ namespace HADRONS {
class FF_Base {
public:
FF_Base( struct GeneralModel _md ) {}
virtual ~FF_Base();
virtual double ff( double q2 ) = 0;
};
......
......@@ -9,6 +9,9 @@ using namespace METOOLS;
#include "HADRONS++/Current_Library/VA_P_T_ISGW2.C"
namespace HADRONS { namespace VA_P_T_FFs {
FormFactor_Base::~FormFactor_Base()
{
}
class NoFF : public FormFactor_Base {
public:
NoFF(GeneralModel model, double* masses, const Flavour_Vector& flavs,
......
......@@ -24,6 +24,7 @@ namespace VA_P_T_FFs
m_m1=masses[1];
m_calced=false;
}
virtual ~FormFactor_Base();
virtual void CalcFFs( ATOOLS::Vec4D p0, ATOOLS::Vec4D p1 ) = 0;
double h() { if(!m_calced) abort(); return m_h; }
double k() { if(!m_calced) abort(); return m_k; }
......
......@@ -14,6 +14,9 @@ using namespace METOOLS;
#include "HADRONS++/Current_Library/VA_P_V_hepph0007169.C"
namespace HADRONS { namespace VA_P_V_FFs {
FormFactor_Base::~FormFactor_Base()
{
}
class NoFF : public FormFactor_Base {
public:
NoFF(GeneralModel model, double* masses, const Flavour_Vector& flavs,
......
......@@ -25,6 +25,7 @@ namespace VA_P_V_FFs
m_A0=m_A1=m_A2=m_A3=m_V=0.0;
m_calced=false;
}
virtual ~FormFactor_Base();
virtual void CalcFFs( ATOOLS::Vec4D p0, ATOOLS::Vec4D p1 ) = 0;
double A0() { if(!m_calced) abort(); return m_A0; }
double A1() { if(!m_calced) abort(); return m_A1; }
......
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