Commit 5731d044 authored by Sebastian Liebschner's avatar Sebastian Liebschner

small fixes in EXTAMP due to YAML

parent 58d2b1df
......@@ -13,7 +13,7 @@
#include "PHASIC++/Process/Process_Group.H"
#include "PHASIC++/Process/Subprocess_Info.H"
#include "ATOOLS/Org/Run_Parameter.H"
#include "ATOOLS/Org/Scoped_Settings.H"
#include <assert.h>
......@@ -117,13 +117,14 @@ namespace EXTAMP{
return new Born_Process(pi);
if ( nlotype&ATOOLS::nlo_type::vsub )
{
int subtractiontype = ATOOLS::ToType<int>(ATOOLS::rpa->gen.Variable("NLO_SUBTRACTION_SCHEME"));
double virtfrac = ATOOLS::ToType<double>(ATOOLS::rpa->gen.Variable("VIRTUAL_EVALUATION_FRACTION"));
if (virtfrac!=1.0)
msg_Info()<<METHOD<<"(): Setting fraction of virtual ME evaluations to " << virtfrac << std::endl;
return new BVI_Process(pi, virtfrac, subtractiontype);
}
{
ATOOLS::Settings& s = ATOOLS::Settings::GetMainSettings();
int subtractiontype = s["NLO_SUBTRACTION_SCHEME"].Get<int>();
double virtfrac = s["VIRTUAL_EVALUATION_FRACTION"].Get<double>();
if (virtfrac!=1.0)
msg_Info()<<METHOD<<"(): Setting fraction of virtual ME evaluations to " << virtfrac << std::endl;
return new BVI_Process(pi, virtfrac, subtractiontype);
}
if ( nlotype&ATOOLS::nlo_type::rsub )
return new RS_Process(pi);
......
......@@ -170,8 +170,8 @@ namespace EXTAMP {
RS_Process::Dipole_Vector RS_Process::ConstructDipoles()
{
/* Get subtraction parameters */
int subtraction_type = ATOOLS::ToType<int>(ATOOLS::rpa->gen.Variable("NLO_SUBTRACTION_SCHEME"));
auto& s = ATOOLS::Settings::GetMainSettings();
int subtraction_type = s["NLO_SUBTRACTION_SCHEME"].Get<int>();
double alphamin = s["DIPOLES"]["AMIN"].Get<double>();
double alphamax = s["DIPOLES"]["ALPHA"].Get<double>();
......
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