Skip to content

Move printable types out of printers #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisJChang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move printable types out of printers #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CosmoBit/include/gambit/CosmoBit/CosmoBit_rollcall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,14 @@ START_MODULE
#undef FUNCTION
#undef CAPABILITY

// Printable forms of BBN_container capabilities: convert to map_str_dbl
QUICK_FUNCTION(CosmoBit, printable_primordial_abundances_BBN, NEW_CAPABILITY,
printable_primordial_abundances_BBN_impl, map_str_dbl, (),
(primordial_abundances_BBN, BBN_container))
QUICK_FUNCTION(CosmoBit, printable_primordial_abundances, NEW_CAPABILITY,
printable_primordial_abundances_impl, map_str_dbl, (),
(primordial_abundances, BBN_container))

/// compute primordial helium abundance
#define CAPABILITY helium_abundance
START_CAPABILITY
Expand Down
28 changes: 28 additions & 0 deletions CosmoBit/src/BBN.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,34 @@ namespace Gambit
gsl_permutation_free(p);
}

namespace
{
// Shared conversion logic for BBN_container -> map_str_dbl
map_str_dbl bbn_container_to_map(const BBN_container& bbn)
{
map_str_dbl m;
for (const str& i : bbn.get_active_isotopes())
{
int idx = bbn.get_abund_map().at(i);
m[i] = bbn.get_BBN_abund(idx);
m[i + "::1sigma_err"] = sqrt(bbn.get_BBN_covmat(idx, idx));
}
return m;
}
}

void printable_primordial_abundances_BBN_impl(map_str_dbl& result)
{
using namespace Pipes::printable_primordial_abundances_BBN_impl;
result = bbn_container_to_map(*Dep::primordial_abundances_BBN);
}

void printable_primordial_abundances_impl(map_str_dbl& result)
{
using namespace Pipes::printable_primordial_abundances_impl;
result = bbn_container_to_map(*Dep::primordial_abundances);
}

} // namespace CosmoBit

} // namespace Gambit
4 changes: 4 additions & 0 deletions DarkBit/include/gambit/DarkBit/DarkBit_rollcall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,10 @@ START_MODULE

#undef CAPABILITY

// Printable form of DD_couplings: converts DM_nucleon_couplings to map_str_dbl
QUICK_FUNCTION(DarkBit, printable_DD_couplings, NEW_CAPABILITY, printable_DD_couplings_impl, map_str_dbl, (),
(DD_couplings, DM_nucleon_couplings))


// Relativistic Wilson coefficients defined in the 5(or 4 or 3) flavscheme
#define CAPABILITY DD_rel_WCs_flavscheme
Expand Down
11 changes: 11 additions & 0 deletions DarkBit/src/DirectDetection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,5 +821,16 @@ namespace Gambit
}
*/

void printable_DD_couplings_impl(map_str_dbl& result)
{
using namespace Pipes::printable_DD_couplings_impl;
result.clear();
result["Gp_SI"] = Dep::DD_couplings->gps;
result["Gn_SI"] = Dep::DD_couplings->gns;
result["Gp_SD"] = Dep::DD_couplings->gpa;
result["Gn_SD"] = Dep::DD_couplings->gna;
}

}

}
6 changes: 1 addition & 5 deletions Elements/include/gambit/Elements/printable_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#ifndef __printable_types_hpp__
#define __printable_types_hpp__

#include "gambit/Elements/types_rollcall.hpp"
#include "gambit/ScannerBit/printable_types.hpp"

// Types that Gambit printers can output (if printer plugin is properly equipped)
Expand All @@ -29,10 +28,7 @@
(map_str_map_str_dbl) \
(map_const_str_map_const_str_dbl) \
(map_intpair_dbl) \
(triplet<double>) \
(flav_prediction) \
(DM_nucleon_couplings) \
(BBN_container)
(triplet<double>)

// Types that can be retrieved from Gambit printer output (if printer plugin is properly equipped)
// Generally needs to be the same as the printable types, i.e. should be able to retrieve everything.
Expand Down
49 changes: 49 additions & 0 deletions FlavBit/include/gambit/FlavBit/FlavBit_rollcall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,6 +1544,55 @@ START_MODULE
#undef CAPABILITY


// Printable forms of flav_prediction capabilities: central values as map_const_str_dbl
QUICK_FUNCTION(FlavBit, printable_prediction_B2mumu, NEW_CAPABILITY, printable_prediction_B2mumu_impl, map_str_dbl, (), (prediction_B2mumu, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2taunu, NEW_CAPABILITY, printable_prediction_B2taunu_impl, map_str_dbl, (), (prediction_B2taunu, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_RDRDstar, NEW_CAPABILITY, printable_prediction_RDRDstar_impl, map_str_dbl, (), (prediction_RDRDstar, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_b2sgamma, NEW_CAPABILITY, printable_prediction_b2sgamma_impl, map_str_dbl, (), (prediction_b2sgamma, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2Kstargamma, NEW_CAPABILITY, printable_prediction_B2Kstargamma_impl, map_str_dbl, (), (prediction_B2Kstargamma, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_BRBXsmumu_lowq2, NEW_CAPABILITY, printable_prediction_BRBXsmumu_lowq2_impl, map_str_dbl, (), (prediction_BRBXsmumu_lowq2, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_BRBXsmumu_highq2, NEW_CAPABILITY, printable_prediction_BRBXsmumu_highq2_impl, map_str_dbl, (), (prediction_BRBXsmumu_highq2, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_AFBBXsmumu_lowq2, NEW_CAPABILITY, printable_prediction_AFBBXsmumu_lowq2_impl, map_str_dbl, (), (prediction_AFBBXsmumu_lowq2, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_AFBBXsmumu_highq2, NEW_CAPABILITY, printable_prediction_AFBBXsmumu_highq2_impl, map_str_dbl, (), (prediction_AFBBXsmumu_highq2, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_0p1_0p98, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_0p1_0p98_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_0p1_0p98, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_1p1_2p5, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_1p1_2p5_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_1p1_2p5, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_2p5_4, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_2p5_4_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_2p5_4, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_4_6, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_4_6_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_4_6, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_6_8, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_6_8_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_6_8, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuBr_15_19, NEW_CAPABILITY, printable_prediction_B2KstarmumuBr_15_19_impl, map_str_dbl, (), (prediction_B2KstarmumuBr_15_19, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_0p05_2, NEW_CAPABILITY, printable_prediction_B2KmumuBr_0p05_2_impl, map_str_dbl, (), (prediction_B2KmumuBr_0p05_2, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_2_4p3, NEW_CAPABILITY, printable_prediction_B2KmumuBr_2_4p3_impl, map_str_dbl, (), (prediction_B2KmumuBr_2_4p3, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_4p3_8p68, NEW_CAPABILITY, printable_prediction_B2KmumuBr_4p3_8p68_impl, map_str_dbl, (), (prediction_B2KmumuBr_4p3_8p68, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_14p18_16, NEW_CAPABILITY, printable_prediction_B2KmumuBr_14p18_16_impl, map_str_dbl, (), (prediction_B2KmumuBr_14p18_16, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_16_18, NEW_CAPABILITY, printable_prediction_B2KmumuBr_16_18_impl, map_str_dbl, (), (prediction_B2KmumuBr_16_18, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KmumuBr_18_22, NEW_CAPABILITY, printable_prediction_B2KmumuBr_18_22_impl, map_str_dbl, (), (prediction_B2KmumuBr_18_22, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_Bs2phimumuBr_1_6, NEW_CAPABILITY, printable_prediction_Bs2phimumuBr_1_6_impl, map_str_dbl, (), (prediction_Bs2phimumuBr_1_6, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_Bs2phimumuBr_15_19, NEW_CAPABILITY, printable_prediction_Bs2phimumuBr_15_19_impl, map_str_dbl, (), (prediction_Bs2phimumuBr_15_19, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_0p1_2_Atlas, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_0p1_2_Atlas_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_0p1_2_Atlas, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_2_4_Atlas, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_2_4_Atlas_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_2_4_Atlas, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_4_8_Atlas, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_4_8_Atlas_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_4_8_Atlas, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_1_2_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_1_2_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_1_2_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_2_4p3_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_2_4p3_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_2_4p3_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_4p3_6_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_4p3_6_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_4p3_6_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_6_8p68_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_6_8p68_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_6_8p68_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_10p09_12p86_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_10p09_12p86_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_10p09_12p86_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_14p18_16_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_14p18_16_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_14p18_16_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_16_19_CMS, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_16_19_CMS_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_16_19_CMS, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_0p1_4_Belle, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_0p1_4_Belle_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_0p1_4_Belle, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_4_8_Belle, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_4_8_Belle_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_4_8_Belle, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_10p9_12p9_Belle, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_10p9_12p9_Belle_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_10p9_12p9_Belle, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_14p18_19_Belle, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_14p18_19_Belle_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_14p18_19_Belle, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_0p1_0p98_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_0p1_0p98_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_0p1_0p98_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_1p1_2p5_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_1p1_2p5_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_1p1_2p5_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_2p5_4_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_2p5_4_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_2p5_4_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_4_6_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_4_6_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_4_6_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_6_8_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_6_8_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_6_8_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstarmumuAng_15_19_LHCb, NEW_CAPABILITY, printable_prediction_B2KstarmumuAng_15_19_LHCb_impl, map_str_dbl, (), (prediction_B2KstarmumuAng_15_19_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_B2KstareeAng_0p0008_0p257_LHCb, NEW_CAPABILITY, printable_prediction_B2KstareeAng_0p0008_0p257_LHCb_impl, map_str_dbl, (), (prediction_B2KstareeAng_0p0008_0p257_LHCb, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_RK_LHCb_1p1_6, NEW_CAPABILITY, printable_prediction_RK_LHCb_1p1_6_impl, map_str_dbl, (), (prediction_RK_LHCb_1p1_6, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_RKstar_LHCb_0p045_1p1, NEW_CAPABILITY, printable_prediction_RKstar_LHCb_0p045_1p1_impl, map_str_dbl, (), (prediction_RKstar_LHCb_0p045_1p1, flav_prediction))
QUICK_FUNCTION(FlavBit, printable_prediction_RKstar_LHCb_1p1_6, NEW_CAPABILITY, printable_prediction_RKstar_LHCb_1p1_6_impl, map_str_dbl, (), (prediction_RKstar_LHCb_1p1_6, flav_prediction))

#undef REFERENCE
#undef MODULE

Expand Down
60 changes: 60 additions & 0 deletions FlavBit/src/FlavBit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3093,5 +3093,65 @@ namespace Gambit

}

// Shared conversion logic: flav_prediction central values -> map_str_dbl
#define FLAV_PRINTABLE_IMPL(cap) \
void printable_##cap##_impl(map_str_dbl& result) \
{ \
using namespace Pipes::printable_##cap##_impl; \
result.clear(); \
for (const auto& kv : Dep::cap->central_values) result[kv.first] = kv.second; \
}

FLAV_PRINTABLE_IMPL(prediction_B2mumu)
FLAV_PRINTABLE_IMPL(prediction_B2taunu)
FLAV_PRINTABLE_IMPL(prediction_RDRDstar)
FLAV_PRINTABLE_IMPL(prediction_b2sgamma)
FLAV_PRINTABLE_IMPL(prediction_B2Kstargamma)
FLAV_PRINTABLE_IMPL(prediction_BRBXsmumu_lowq2)
FLAV_PRINTABLE_IMPL(prediction_BRBXsmumu_highq2)
FLAV_PRINTABLE_IMPL(prediction_AFBBXsmumu_lowq2)
FLAV_PRINTABLE_IMPL(prediction_AFBBXsmumu_highq2)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_0p1_0p98)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_1p1_2p5)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_2p5_4)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_4_6)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_6_8)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuBr_15_19)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_0p05_2)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_2_4p3)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_4p3_8p68)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_14p18_16)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_16_18)
FLAV_PRINTABLE_IMPL(prediction_B2KmumuBr_18_22)
FLAV_PRINTABLE_IMPL(prediction_Bs2phimumuBr_1_6)
FLAV_PRINTABLE_IMPL(prediction_Bs2phimumuBr_15_19)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_0p1_2_Atlas)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_2_4_Atlas)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_4_8_Atlas)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_1_2_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_2_4p3_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_4p3_6_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_6_8p68_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_10p09_12p86_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_14p18_16_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_16_19_CMS)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_0p1_4_Belle)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_4_8_Belle)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_10p9_12p9_Belle)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_14p18_19_Belle)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_0p1_0p98_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_1p1_2p5_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_2p5_4_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_4_6_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_6_8_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstarmumuAng_15_19_LHCb)
FLAV_PRINTABLE_IMPL(prediction_B2KstareeAng_0p0008_0p257_LHCb)
FLAV_PRINTABLE_IMPL(prediction_RK_LHCb_1p1_6)
FLAV_PRINTABLE_IMPL(prediction_RKstar_LHCb_0p045_1p1)
FLAV_PRINTABLE_IMPL(prediction_RKstar_LHCb_1p1_6)

#undef FLAV_PRINTABLE_IMPL

}

}
5 changes: 5 additions & 0 deletions Printers/include/gambit/Printers/baseprinter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
// Boost
#include <boost/preprocessor/seq/for_each_i.hpp>

// MSSM_SLHAstruct and SMslha_SLHAstruct are in RETRIEVABLE_TYPES and need their definitions here
#ifndef SCANNER_STANDALONE
#include "gambit/Utils/slhaea_helpers.hpp"
#endif

// Printable types
#ifndef SCANNER_STANDALONE
// If we are in a main gambit executable, we need to know all the GAMBIT printable types
Expand Down
3 changes: 0 additions & 3 deletions Printers/include/gambit/Printers/printers/asciiprinter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ namespace Gambit
using BasePrinter::_print; // Tell compiler we are using some of the base class overloads of this on purpose.
#define DECLARE_PRINT(r,data,i,elem) void _print(elem const&, const std::string&, const int, const uint, const ulong);
BOOST_PP_SEQ_FOR_EACH_I(DECLARE_PRINT, , ASCII_TYPES)
#ifndef SCANNER_STANDALONE
BOOST_PP_SEQ_FOR_EACH_I(DECLARE_PRINT, , ASCII_BACKEND_TYPES)
#endif
#undef DECLARE_PRINT

// Print metadata info to file
Expand Down
3 changes: 0 additions & 3 deletions Printers/include/gambit/Printers/printers/asciireader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ namespace Gambit
using BaseReader::_retrieve; // Tell compiler we are using some of the base class overloads of this on purpose.
#define DECLARE_RETRIEVE(r,data,i,elem) bool _retrieve(elem&, const std::string&, const uint, const ulong);
BOOST_PP_SEQ_FOR_EACH_I(DECLARE_RETRIEVE, , ASCII_TYPES)
#ifndef SCANNER_STANDALONE
BOOST_PP_SEQ_FOR_EACH_I(DECLARE_RETRIEVE, , ASCII_BACKEND_TYPES)
#endif
#undef DECLARE_RETRIEVE
///@}

Expand Down
5 changes: 0 additions & 5 deletions Printers/include/gambit/Printers/printers/asciitypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@
(map_intpair_dbl) \
(map_const_str_dbl) \
(map_const_str_map_const_str_dbl) \
(flav_prediction) \

#define ASCII_BACKEND_TYPES \
(DM_nucleon_couplings) \
(BBN_container) \

#else

#define ASCII_TYPES \
Expand Down
Loading