Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion config/BYStrucFunc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ WeinbergAngle double No

<alg_conf>

<param_set name="Default">
<param_set name="Default">
<param type="string" name="CommonParam"> CKM,Masses,WeakInt </param>

<param type="alg" name="PDF-Set"> genie::BYPDF/Default </param>
Expand All @@ -63,7 +63,21 @@ WeinbergAngle double No
<param type="bool" name="Use2016Corrections"> false </param>
<param type="double" name="LowQ2CutoffF1F2"> 0.8 </param>

</param_set>

<param_set name="GRV982010">

<param type="double" name="BY-A"> 0.621 </param>
<param type="double" name="BY-B"> 0.380 </param>
<param type="double" name="BY-CsU"> 0.369 </param>
<param type="double" name="BY-CsD"> 0.561 </param>
<param type="double" name="BY-Cv1U"> 0.417 </param>
<param type="double" name="BY-Cv2U"> 0.264 </param>
<param type="double" name="BY-Cv1D"> 0.341 </param>
<param type="double" name="BY-Cv2D"> 0.323 </param>

</param_set>


</alg_conf>

89 changes: 89 additions & 0 deletions config/BYStrucFunc2021.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--
Configuration for the BYStrucFunc DISStructureFuncModelI

Algorithm Configurable Parameters:
....................................................................................................
Name Type Opt Comment Default
....................................................................................................
BY-A double No Bodek-Yang scaling var param A
By-B double No Bodek-Yang scaling var param B
BY-CsU double No Bodek-Yang u sea K factor param
BY-CsD double No Bodek-Yang d sea K factor param
BY-Cv1U double No Bodek-Yang u val K factor param
BY-Cv2U double No Bodek-Yang u val K factor param
BY-Cv1D double No Bodek-Yang d val K factor param
BY-Cv2D double No Bodek-Yang d val K factor param
BY-PsA double No Bodek-Yang P sea axial param
BY-PvA double No Bodek-Yang P sea valance param
BY-PsC double No Bodek-Yang C sea axial param
BY-CaLW-nu double No Low-q0 axial neutrino parameter
BY-CaLW-nubar double No Low-q0 axial anti-neutrino parameter
BY-H0 double No Bodek-Yang high order QCD parameter
BY-H1 double No Bodek-Yang high order QCD parameter
BY-H2 double No Bodek-Yang high order QCD parameter
BY-H3 double No Bodek-Yang high order QCD parameter

+++ This model inherits from QPMDISStrucFunc and calls its configure
+++ The following parameters have to be the same as in QPMDISStrucFunc.xml

PDF-Set alg No PDF model
Charm-Mass double No charm mass CommonParam[Masses]
Charm-Prod-Off bool Yes charm production is turned off false
PDF-Q2min double No min Q2 for PDF evaluation From "PDF-Set"
IncludeR bool No include R factor?
IncludeNuclMod bool No include nuclear factor?
CKM-Vcd double No CommonParam[CKM]
CKM-Vcs double No CommonParam[CKM]
CKM-Vud double No CommonParam[CKM]
CKM-Vus double No CommonParam[CKM]
Use2016Corrections bool No Use SF corrections?
LowQ2CutoffF1F2 double No min for F1/F2 SF relation
WeinbergAngle double No CommonParam[WeakInt]
-->

<alg_conf>

<param_set name="Default">
<param type="string" name="CommonParam"> CKM,Masses,WeakInt </param>

<param type="alg" name="PDF-Set"> genie::BYPDF/Default </param>

<param type="double" name="BY-A"> 0.621 </param>
<param type="double" name="BY-B"> 0.380 </param>
<param type="double" name="BY-CvLW"> 0.218 </param>
<param type="double" name="BY-CsU"> 0.369 </param>
<param type="double" name="BY-CsD"> 0.561 </param>
<param type="double" name="BY-Cv1U"> 0.417 </param>
<param type="double" name="BY-Cv2U"> 0.264 </param>
<param type="double" name="BY-Cv1D"> 0.341 </param>
<param type="double" name="BY-Cv2D"> 0.323 </param>
<param type="double" name="BY-CsS"> 0.561 </param>
<param type="double" name="BY-PsA"> 0.55 </param>
<param type="double" name="BY-PvA"> 0.30 </param>
<param type="double" name="BY-CsA"> 0.75 </param>
<param type="double" name="BY-CaLW-nu"> 0.436 </param>
<param type="double" name="BY-CaLW-nubar"> 0.654 </param>
<param type="double" name="BY-H0"> 0.914 </param>
<param type="double" name="BY-H1"> 0.296 </param>
<param type="double" name="BY-H2"> -0.374 </param>
<param type="double" name="BY-H3"> 0.165 </param>
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Switches controlling the DIS structure function calculation. Those switches specify whether to:
- include an R (~FL) factor into the calculation
- include a nuclear factor (accounting for shadowing/anti-shadowing)
- include corrections for calculating relation between 2xF1 and F2
- Select value for Q2 cutoff in relation between 2xF1 and F2
-->
<param type="bool" name="IncludeR"> true </param>
<param type="bool" name="IncludeH"> true </param>
<param type="bool" name="IncludeNuclMod"> true </param>
<param type="bool" name="Use2016Corrections"> false </param>
<param type="double" name="LowQ2CutoffF1F2"> 0.8 </param>

</param_set>

</alg_conf>

5 changes: 4 additions & 1 deletion config/KNOTunedQPMDISPXSec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ Wcut double no Co
<param_set name="Default">

<param type="string" name="CommonParam"> NonResBackground </param>

<param type="alg" name="DISModel"> genie::QPMDISPXSec/Default </param>
<param type="alg" name="Hadronizer"> genie::AGKYLowW2019/Default </param>
<param type="double" name="NRB-EM-XSecScale"> 1. </param>
</param_set>

<param_set name="GRV982010">
<param type="alg" name="DISModel"> genie::QPMDISPXSec/GRV982010 </param>
</param_set>

</alg_conf>
5 changes: 5 additions & 0 deletions config/QPMDISPXSec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ WeinbergAngle double No
<param type="double" name="DIS-EM-XSecScale"> 1. </param>
</param_set>

<param_set name="GRV982010">
<param type="string" name="CommonParam"> WeakInt </param>
<param type="double" name="DIS-EM-XSecScale"> 1. </param>
<param type="alg" name="SFAlg"> genie::BYStrucFunc2021/Default </param>
</param_set>
</alg_conf>
1 change: 1 addition & 0 deletions config/master_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<config alg="genie::GalsterELFormFactorsModel"> GalsterELFormFactorsModel.xml </config>
<config alg="genie::QPMDISStrucFunc"> QPMDISStrucFunc.xml </config>
<config alg="genie::BYStrucFunc"> BYStrucFunc.xml </config>
<config alg="genie::BYStrucFunc2021"> BYStrucFunc2021.xml </config>
<config alg="genie::RSHelicityAmplModelCC"> RSHelicityAmplModelCC.xml </config>
<config alg="genie::RSHelicityAmplModelNCp"> RSHelicityAmplModelNCp.xml </config>
<config alg="genie::RSHelicityAmplModelNCn"> RSHelicityAmplModelNCn.xml </config>
Expand Down
2 changes: 1 addition & 1 deletion src/Physics/BoostedDarkMatter/XSection/DMBYStrucFunc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void DMBYStrucFunc::Init(void)
fCv2D = 0;
}
//____________________________________________________________________________
double DMBYStrucFunc::ScalingVar(const Interaction * interaction) const
double DMBYStrucFunc::ScalingVar(const Interaction * interaction, double Mf ) const
{
// Overrides QPMDMDISStrucFuncBase::ScalingVar() to compute the BY scaling var

Expand Down
2 changes: 1 addition & 1 deletion src/Physics/BoostedDarkMatter/XSection/DMBYStrucFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class DMBYStrucFunc : public QPMDMDISStrucFuncBase {

// override part of the DISStructureFuncModel implementation
// to compute all the corrections applied by the Bodek-Yang model.
double ScalingVar (const Interaction * i) const;
double ScalingVar (const Interaction * i, double Mf = 0) const;
void KFactors (const Interaction * i, double & kuv,
double & kdv, double & kus, double & kds) const;

Expand Down
4 changes: 2 additions & 2 deletions src/Physics/DeepInelastic/XSection/BYStrucFunc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void BYStrucFunc::Init(void)
fCv2D = 0;
}
//____________________________________________________________________________
double BYStrucFunc::ScalingVar(const Interaction * interaction) const
double BYStrucFunc::ScalingVar(const Interaction * interaction, double Mf ) const
{
// Overrides QPMDISStrucFuncBase::ScalingVar() to compute the BY scaling var

Expand All @@ -100,7 +100,7 @@ double BYStrucFunc::ScalingVar(const Interaction * interaction) const
}
//____________________________________________________________________________
void BYStrucFunc::KFactors(const Interaction * interaction,
double & kuv, double & kdv, double & kus, double & kds) const
double & kuv, double & kdv, double & kus, double & kds, double & kss ) const
{
// Overrides QPMDISStrucFuncBase::KFactors() to compute the BY K factors for
// u(valence), d(valence), u(sea), d(sea);
Expand Down
4 changes: 2 additions & 2 deletions src/Physics/DeepInelastic/XSection/BYStrucFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class BYStrucFunc : public QPMDISStrucFuncBase {

// override part of the DISStructureFuncModel implementation
// to compute all the corrections applied by the Bodek-Yang model.
double ScalingVar (const Interaction * i) const;
double ScalingVar (const Interaction * i, double Mf = 0 ) const;
void KFactors (const Interaction * i, double & kuv,
double & kdv, double & kus, double & kds) const;
double & kdv, double & kus, double & kds, double & kss ) const;

// Bodek-Yang model-specific parameters

Expand Down
Loading