Merge pull request #150 from GambitBSM/FlavBit_development_cleanup

Flav bit development cleanup

Author: patscott

Backends/include/gambit/Backends/backend_info.hpp

@@ -200,6 +200,9 @@ namespace Gambit
         /// Load a backend library written in C, C++ or Fortran
         void loadLibrary_C_CXX_Fortran(const str&, const str&, const str&, bool with_BOSS);
 
+        /// Load a backend data library
+        void loadLibrary_data(const str&, const str&, const str&);
+
         #ifdef HAVE_MATHEMATICA
           /// Load WSTP for Mathematica backends
           void loadLibrary_Mathematica(const str&, const str&, const str&);

Backends/include/gambit/Backends/backend_macros.hpp

@@ -165,6 +165,9 @@ namespace Gambit                                                            \
 /* Register the factory functions for all classes loaded by this backend. */\
 BOOST_PP_IIF(DO_CLASSLOADING, LOAD_ALL_FACTORIES, )                         \
                                                                             \
+/* Only do the rest if this is not a data-only backend */                   \
+BOOST_PP_IF(DATA_ONLY, ,                                                    \
+                                                                            \
 /* Register the initialisation function for this backend */                 \
 CORE_START_CAPABILITY(BackendIniBit,                                        \
  CAT_4(BACKENDNAME,_,SAFE_VERSION,_init), NOT_MODEL)                        \
@@ -186,6 +189,7 @@ namespace Gambit                                                            \
     }                                                                       \
   }                                                                         \
 }                                                                           \
+)
 
 
 /// Register this backend with the Core if not running in standalone mode.

Backends/include/gambit/Backends/backend_types/FeynHiggs.hpp

@@ -24,134 +24,134 @@
 
 #define ncouplings 681
 #define Roffset 472
-// #define Coupling(c)		couplingS(c)
-// #define LCoupling(c)		couplingS(c)
-// #define RCoupling(c)		couplingS(c+Roffset)
+// #define Coupling(c)    couplingS(c)
+// #define LCoupling(c)   couplingS(c)
+// #define RCoupling(c)   couplingS(c+Roffset)
 
 #define ncouplingsms 231
 #define RSMoffset 108
-// #define CouplingSM(c)		couplingsmS(c)
-// #define LCouplingSM(c)		couplingsmS(c)
-// #define RCouplingSM(c)		couplingsmS(c+RSMoffset)
+// #define CouplingSM(c)    couplingsmS(c)
+// #define LCouplingSM(c)   couplingsmS(c)
+// #define RCouplingSM(c)   couplingsmS(c+RSMoffset)
 
 #define ngammas 978
 #define BRoffset 491
-// #define GammaTot(h)		gammaS(h)
-// #define Gamma(c)		gammaS(c+4)
-// #define BR(c)			gammaS(c+BRoffset)
+// #define GammaTot(h)    gammaS(h)
+// #define Gamma(c)   gammaS(c+4)
+// #define BR(c)      gammaS(c+BRoffset)
 
 #define ngammasms 250
 #define BRSMoffset 127
-// #define GammaSMTot(h)		gammasmS(h)
-// #define GammaSM(c)		gammasmS(c+4)
-// #define BRSM(c)			gammasmS(c+BRSMoffset)
+// #define GammaSMTot(h)    gammasmS(h)
+// #define GammaSM(c)   gammasmS(c+4)
+// #define BRSM(c)      gammasmS(c+BRSMoffset)
 
 
 #define H0VV(h,vv) (h)+3*(vv)-3
 #if 0
-h  = 1..3	Higgs: h0, HH, A0
-  vv = 1..5	vector-boson pair: gamma gamma, gamma Z, ZZ, WW, gg
+h  = 1..3 Higgs: h0, HH, A0
+  vv = 1..5 vector-boson pair: gamma gamma, gamma Z, ZZ, WW, gg
 #endif
 
 #define H0FF(h,t,g1,g2) (h)+3*(t)+12*(g1)+36*(g2)-36
 #if 0
-  h  = 1..3	Higgs: h0, HH, A0
-  t  = 1..4	fermion type: nu, e, u, d
-  g1 = 1..3	fermion 1 generation
-  g2 = 1..3	fermion 2 generation
+  h  = 1..3 Higgs: h0, HH, A0
+  t  = 1..4 fermion type: nu, e, u, d
+  g1 = 1..3 fermion 1 generation
+  g2 = 1..3 fermion 2 generation
 #endif
 
 #define HpFF(p,g1,g2) (p)+2*(g1)+6*(g2)+115
 #if 0
-  p  = 1..2	decay products: leptons, quarks
-  g1 = 1..3	up-type fermion 1 generation
-  g2 = 1..3	down-type fermion 2 generation
+  p  = 1..2 decay products: leptons, quarks
+  g1 = 1..3 up-type fermion 1 generation
+  g2 = 1..3 down-type fermion 2 generation
 #endif
 
 #define H0ChaCha(h,c1,c2) (h)+3*(c1)+6*(c2)+132
 #if 0
-  h  = 1..3	Higgs: h0, HH, A0
-  c1 = 1..2	chargino 1
-  c2 = 1..2	chargino 2
+  h  = 1..3 Higgs: h0, HH, A0
+  c1 = 1..2 chargino 1
+  c2 = 1..2 chargino 2
 #endif
 
 #define H0NeuNeu(h,n1,n2) (h)+3*(n1)+12*(n2)+138
 #if 0
-  h  = 1..3	Higgs: h0, HH, A0
-  n1 = 1..4	neutralino 1
-  n2 = 1..4	neutralino 2
+  h  = 1..3 Higgs: h0, HH, A0
+  n1 = 1..4 neutralino 1
+  n2 = 1..4 neutralino 2
 #endif
 
 #define HpNeuCha(n1,c2) (n1)+4*(c2)+197
 #if 0
-  n1 = 1..4	neutralino
-  c2 = 1..2	chargino
+  n1 = 1..4 neutralino
+  c2 = 1..2 chargino
 #endif
 
 #define H0HV(h,hv) (h)+3*(hv)+206
 #if 0
-  h  = 1..3	decaying Higgs: h0, HH, A0
-  hv = 1..3	produced pair: h0-Z, HH-Z, A0-Z
+  h  = 1..3 decaying Higgs: h0, HH, A0
+  hv = 1..3 produced pair: h0-Z, HH-Z, A0-Z
 #endif
 
 #define HpHV(hv) (hv)+218
 #if 0
-  hv = 1..3	produced pair: h0-W, HH-W, A0-W
+  hv = 1..3 produced pair: h0-W, HH-W, A0-W
 #endif
 
 #define H0HH(h,h1,h2) (h)+3*(h1)+12*(h2)+206
 #if 0
-  h  = 1..3	decaying Higgs: h0, HH, A0
-  h1 = 1..4	produced Higgs 1: h0, HH, A0, Hp
-  h2 = 1..4	produced Higgs 2: h0, HH, A0, Hp
+  h  = 1..3 decaying Higgs: h0, HH, A0
+  h1 = 1..4 produced Higgs 1: h0, HH, A0, Hp
+  h2 = 1..4 produced Higgs 2: h0, HH, A0, Hp
 #endif
 
 #define H0SfSf(h,s1,s2,t,g) (h)+3*(s1)+6*(s2)+12*(t)+48*(g)+200
 #if 0
-  h  = 1..3	Higgs: h0, HH, A0
-  s1 = 1..2	sfermion 1
-  s2 = 1..2	sfermion 2
-  t  = 1..4	sfermion type: nu, e, u, d
-  g = 1..3	common sfermion generation
+  h  = 1..3 Higgs: h0, HH, A0
+  s1 = 1..2 sfermion 1
+  s2 = 1..2 sfermion 2
+  t  = 1..4 sfermion type: nu, e, u, d
+  g = 1..3  common sfermion generation
 #endif
 
 #define HpSfSf(s1,s2,p,g1,g2) (s1)+2*(s2)+4*(p)+8*(g1)+24*(g2)+375
 #if 0
-  s1 = 1..2	sfermion 1
-  s2 = 1..2	sfermion 2
-  p  = 1..2	decay products: sleptons, squarks
-  g1 = 1..3	up-type sfermion 1 generation
-  g2 = 1..3	down-type sfermion 2 generation
+  s1 = 1..2 sfermion 1
+  s2 = 1..2 sfermion 2
+  p  = 1..2 decay products: sleptons, squarks
+  g1 = 1..3 up-type sfermion 1 generation
+  g2 = 1..3 down-type sfermion 2 generation
 #endif
 
 #define tBF(bf) (bf)+485
 #if 0
-  bf = 1..2	W-b, H-b
+  bf = 1..2 W-b, H-b
 #endif
 
 
 #define nprodxs 52
 
-#define bbh(h)		prodXS(h)
-#define bbhSM(h)	prodXS((h)+3)
-#define btagbh(h)	prodXS((h)+6)
-#define btagbhSM(h)	prodXS((h)+9)
-#define ggh(h)		prodXS((h)+12)
-#define ggh2(h)		prodXS((h)+15)
-#define gghSM(h)	prodXS((h)+18)
-#define qqh(h)		prodXS((h)+21)
-#define qqhSM(h)	prodXS((h)+24)
-#define tth(h)		prodXS((h)+27)
-#define tthSM(h)	prodXS((h)+30)
-#define Wh(h)		prodXS((h)+33)
-#define WhSM(h)		prodXS((h)+36)
-#define Zh(h)		prodXS((h)+39)
-#define ZhSM(h)		prodXS((h)+42)
-#define StSth(h)	prodXS((h)+45)
-#define tHm		prodXS(49)
-#define tHm2		prodXS(50)
-#define tHm2lo		prodXS(51)
-#define tHm2hi		prodXS(52)
+#define bbh(h)    prodXS(h)
+#define bbhSM(h)  prodXS((h)+3)
+#define btagbh(h) prodXS((h)+6)
+#define btagbhSM(h) prodXS((h)+9)
+#define ggh(h)    prodXS((h)+12)
+#define ggh2(h)   prodXS((h)+15)
+#define gghSM(h)  prodXS((h)+18)
+#define qqh(h)    prodXS((h)+21)
+#define qqhSM(h)  prodXS((h)+24)
+#define tth(h)    prodXS((h)+27)
+#define tthSM(h)  prodXS((h)+30)
+#define Wh(h)   prodXS((h)+33)
+#define WhSM(h)   prodXS((h)+36)
+#define Zh(h)   prodXS((h)+39)
+#define ZhSM(h)   prodXS((h)+42)
+#define StSth(h)  prodXS((h)+45)
+#define tHm   prodXS(49)
+#define tHm2    prodXS(50)
+#define tHm2lo    prodXS(51)
+#define tHm2hi    prodXS(52)
 
 
 namespace Gambit
@@ -164,7 +164,7 @@ namespace Gambit
   typedef const fh_complex fh_ccomplex;
 
   // Container for FeynHiggs Higgs mass/mixings information (from FHHiggsCorr and FHUncertainties backend functions)
-  struct fh_HiggsMassObs
+  struct fh_HiggsMassObs_container
   {
     // Higgs mass with
     // 0 - m1 (Mh in rMSSM)
@@ -190,7 +190,7 @@ namespace Gambit
   };
 
   // Container for FeynHiggs Flavour observable information (from FHFlavour backend function)
-  struct fh_FlavourObs
+  struct fh_FlavourObs_container
   {
     fh_real Bsg_MSSM;     // B -> Xs gamma in MSSM
     fh_real Bsg_SM;       // B -> Xs gamma in SM
@@ -201,7 +201,7 @@ namespace Gambit
   };
 
   // Container for FeynHiggs precision constraints observables (from FHConstraints backend function)
-  struct fh_PrecisionObs
+  struct fh_PrecisionObs_container
   {
     fh_real gmu2;        // g_{mu}-2
     fh_real deltaRho;    // deltaRho
@@ -216,7 +216,7 @@ namespace Gambit
   };
 
   // Container for FeynHiggs MSSM masses (from FHGetPara backend function)
-  struct fh_MSSMMassObs
+  struct fh_MSSMMassObs_container
   {
     // zero if minimal, non-zero if non-minimal flavour violation
     int nmfv;
@@ -272,7 +272,7 @@ namespace Gambit
   };
 
   // Container for FeynHiggs couplings (from FHCouplings backend function)
-  struct fh_Couplings
+  struct fh_Couplings_container
   {
     fh_complex couplings[ncouplings];
     fh_complex couplings_sm[ncouplingsms];
@@ -283,7 +283,7 @@ namespace Gambit
   };
 
   // Container for FeynHiggs Higgs prod xsecs (from FHHiggsProd backend function)
-  struct fh_HiggsProd
+  struct fh_HiggsProd_container
   {
     fh_real prodxs_Tev[nprodxs];
     fh_real prodxs_LHC7[nprodxs];
@@ -292,4 +292,4 @@ namespace Gambit
 
 }
 
-#endif /* defined __FeynHiggs_types_hpp__ */
+#endif /* defined __FeynHiggs_types_hpp__ */

Backends/include/gambit/Backends/backend_types/HepLike_1_1/abstract_HL_BifurGaussian.h

@@ -0,0 +1,89 @@
+#ifndef __abstract_HL_BifurGaussian_HepLike_1_1_h__
+#define __abstract_HL_BifurGaussian_HepLike_1_1_h__
+
+#include <cstddef>
+#include <iostream>
+#include <string>
+#include "gambit/Backends/abstractbase.hpp"
+#include "forward_decls_abstract_classes.h"
+#include "forward_decls_wrapper_classes.h"
+#include "wrapper_HL_Gaussian_decl.h"
+
+#include "identification.hpp"
+
+namespace CAT_3(BACKENDNAME,_,SAFE_VERSION)
+{
+   
+   
+   class Abstract_HL_BifurGaussian : virtual public Abstract_HL_Gaussian
+   {
+      public:
+   
+         virtual void Read() =0;
+   
+         virtual double GetChi2(double, double) =0;
+   
+         virtual double GetChi2__BOSS(double) =0;
+   
+         virtual double GetLikelihood(double, double) =0;
+   
+         virtual double GetLikelihood__BOSS(double) =0;
+   
+         virtual double GetLogLikelihood(double, double) =0;
+   
+         virtual double GetLogLikelihood__BOSS(double) =0;
+   
+      public:
+         using Abstract_HL_Gaussian::pointer_assign__BOSS;
+         virtual void pointer_assign__BOSS(Abstract_HL_BifurGaussian*) =0;
+         virtual Abstract_HL_BifurGaussian* pointer_copy__BOSS() =0;
+   
+      private:
+         HL_BifurGaussian* wptr;
+         bool delete_wrapper;
+      public:
+         HL_BifurGaussian* get_wptr() { return wptr; }
+         void set_wptr(HL_BifurGaussian* wptr_in) { wptr = wptr_in; }
+         bool get_delete_wrapper() { return delete_wrapper; }
+         void set_delete_wrapper(bool del_wrp_in) { delete_wrapper = del_wrp_in; }
+   
+      public:
+         Abstract_HL_BifurGaussian()
+         {
+            wptr = 0;
+            delete_wrapper = false;
+         }
+   
+         Abstract_HL_BifurGaussian(const Abstract_HL_BifurGaussian& in) : 
+            Abstract_HL_Data(in), Abstract_HL_Gaussian(in)
+         {
+            wptr = 0;
+            delete_wrapper = false;
+         }
+   
+         Abstract_HL_BifurGaussian& operator=(const Abstract_HL_BifurGaussian&) { return *this; }
+   
+         virtual void init_wrapper() =0;
+   
+         HL_BifurGaussian* get_init_wptr()
+         {
+            init_wrapper();
+            return wptr;
+         }
+   
+         HL_BifurGaussian& get_init_wref()
+         {
+            init_wrapper();
+            return *wptr;
+         }
+   
+         virtual ~Abstract_HL_BifurGaussian() =0;
+   };
+   
+}
+
+
+#include "gambit/Backends/backend_undefs.hpp"
+
+
+#endif /* __abstract_HL_BifurGaussian_HepLike_1_1_h__ */