Skip to content
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

bring back the "correlated nucleon tail" #421

Merged
merged 9 commits into from
Dec 20, 2024
Merged

bring back the "correlated nucleon tail" #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ffe5e5
bring back the "correlated nucleon tail"
chenel Sep 21, 2024
84fb043
remove accidentally-committed debugging infrastructure
chenel Nov 12, 2024
74f31f2
sample "correlated tail" removal energies from Maxwell-Boltzmann dist…
chenel Dec 4, 2024
98201fb
be more honest about what's actually in AR23
chenel Dec 4, 2024
c458314
preserve old AR23 behavior given that LocalFGM is changing
chenel Dec 4, 2024
17fd14b
Introduce N24_20i_02_11b CMC to turn on LFG "correlated tail" and put…
chenel Dec 4, 2024
c64826a
remove inadvertently retained cout
chenel Dec 5, 2024
1a00efd
Add XML configuration parameter LFG-UseMBDistForNegativeErmv to allow…
sjgardiner Dec 19, 2024
fdd5ef2
Restore old LocalFGM configuration for AR23_20i
sjgardiner Dec 19, 2024
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
5 changes: 3 additions & 2 deletions config/AR23_20i/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ It is designed to serve as baseline model for SBN analyses.
The physics content is the following
- Valencia model for 1p1h, using z-expansion
- SuSAv2 model for 2p2h
- Spectral function like approach for the Local Fermi gas
- Including correlated tail
- Spectral function like approach for the Local Fermi Gas
- Includes events with SRC-like missing momentum within the bulk of the $p_{miss}$ distribution,
but not extending pass the LFG cutoff in $p_{miss}$.
- The parameters related to pion production are taken from the G18_10a_02_11b tune in order to ensure a better starting point.
- De-exitation photons are enabled for Argon
63 changes: 63 additions & 0 deletions config/N24_20i/LocalFGM.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!--
Configuration for the local Fermi gas model in the N24 tune

Configurable Parameters:
...................................................................................................................
Name Type Optional Comment Default
...................................................................................................................
FermiMomentumTable string No Table of Fermi momentum (kF) constants CommonParam[FermiGas]
LFG-MomentumMax double Yes max p in prob distribution 1 GeV
LFG-MomentumCutOff double No momentum cut off value
LFG-MomentumDependentErmv bool No whether to calculate removal energy = f(momentum) false
LFG-ForcePositiveErmv bool No Whether to rethrow events with negative Ermv false
SRC-Fraction double Yes Fraction of high energy tail distribution 0. (Local Fermi Gas)
dominated by Short Range Correlated Pairs
NucRemovalE@Pdg=? int Yes nuclear removal energy for specfic nuclei from FermiGas CommonParam
-->

<param_set name="Default">
<param type="string" name="CommonParam"> FermiGas </param>
<!-- CutOff known from electron scattering experiments
Short range correlations and the isospin dependence of nuclear correlation functions (arXiv:1710.07966)-->
<param type="double" name = "LFG-MomentumCutOff"> 0.7 </param>
<param type="bool" name = "LFG-MomentumDependentErmv"> false </param>
<param type="bool" name = "LFG-ForcePositiveErmv"> false </param>
</param_set>

<param_set name="SpectralFunctionLikeWithCorrelation">

<param type="double" name = "SRC-Fraction"> 0.2 </param>

<param type="bool" name = "LFG-MomentumDependentErmv"> true </param>
<param type="bool" name = "LFG-ForcePositiveErmv"> false </param>
<param type="bool" name = "LFG-UseMBDistForNegativeErmv"> true </param>

<!-- When using a momentum dependent removal energy, the meaning of the removal energy changes.
Specifically, that becomes a Q2 shift which is "tuned" so that the lowest removal energy of the spectrum correspnds
to the binding energy of the p-shell of the nucleus.
For this reason, the removal energy are overriden here, in order to pick up the correct values, while allowing the rest of the code
to function properly using the values from CommonParam.xml
Of the current values, only Argon has been carefully selected. The carbon one is also similar, so for the first implementation,
all the values are set to the Argon one. -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000020040"> 0.0100 </param> <!-- He4 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000030060"> 0.0100 </param> <!-- Li6 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000060120"> 0.0100 </param> <!-- C12 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000080160"> 0.0100 </param> <!-- O16 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000120240"> 0.0100 </param> <!-- Mg24 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000180400"> 0.0100 </param> <!-- Ar40 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000200400"> 0.0100 </param> <!-- Ca40 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000260560"> 0.0100 </param> <!-- Fe56 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000280580"> 0.0100 </param> <!-- Ni58 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000501190"> 0.0100 </param> <!-- Sn119 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000791970"> 0.0100 </param> <!-- Au197 -->
<param type="double" name="RFG-NucRemovalE@Pdg=1000822080"> 0.0100 </param> <!-- Pb208 -->
<param type="bool" name="RFG-UseParametrization"> false </param>
</param_set>


</alg_conf>

47 changes: 47 additions & 0 deletions config/N24_20i/MECInteractionListGenerator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!--
Configuration for the MECInteractionListGenerator InteractionListGeneratorI

Configurable Parameters:
.......................................................................................................
Name Type Optional Comment Default
.......................................................................................................
-->

<param_set name="Default">

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SetDiNucleonCode: Include the dinucleon code in the interaction list generator.
Want `true` for EmpiricalMEC, `false` for NSV
-->
<param type="bool" name="SetDiNucleonCode"> false </param>
<param type="bool" name="SetDiNucleonCodeEM"> true </param>

</param_set>



<param_set name="CC-Default">
<param type="bool" name="is-CC"> true </param>
<param type="bool" name="is-NC"> false </param>
<param type="bool" name="is-EM"> false </param>
</param_set>

<param_set name="NC-Default">
<param type="bool" name="is-CC"> false </param>
<param type="bool" name="is-NC"> true </param>
<param type="bool" name="is-EM"> false </param>
</param_set>

<param_set name="EM-Default">
<param type="bool" name="is-CC"> false </param>
<param type="bool" name="is-NC"> false </param>
<param type="bool" name="is-EM"> true </param>
</param_set>

</alg_conf>

145 changes: 145 additions & 0 deletions config/N24_20i/ModelConfiguration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<global_param_list>

<!--
***************************************************************************************************
This file defines defaults for the most important GENIE physics user configuration parameters.
Multilple named lists of user physics options can be defined.
Use the "Default" one to get the standard/default GENIE physics & tuning.

Author:
Costas Andreopoulos <c.andreopoulos \at cern.ch>
University of Liverpool
***************************************************************************************************
-->

<param_set name="Default">


<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Nuclear model selection.
Options:
- genie::FGMBodekRitchie/Default
- genie::LocalFGM/Default
- genie::LocalFGM/Correlated
- genie::SpectralFunc1d/Default
- genie::EffectiveSF/Default <- See http://arxiv.org/abs/1405.0583
The 'NuclearModel' option defines the default basic model which should work for _any_ nuclei
(typically a Fermi Gas model with the Bodek-Ritchie NN corellatin tail). Refinements for specific
nuclei are possible, by specifying the 'NuclearModel@Pdg=10LZZZAAAI' option.
Currently the same nuclear model is forced for all isotopes.
-->

<!-- <param type="alg" name="NuclearModel"> genie::EffectiveSF/Default </param> -->
<!-- <param type="alg" name="NuclearModel"> genie::FGMBodekRitchie/Default </param> -->
<param type="alg" name="NuclearModel"> genie::LocalFGM/SpectralFunctionLikeWithCorrelation </param>
<!-- <param type="alg" name="NuclearModel"> genie::LocalFGM/Correlated </param>-->


<!--
Example of specific model for specific nuclei
<param type="alg" name="NuclearModel@Pdg=1000060120"> genie::SpectralFunc1d/Default </param>
<param type="alg" name="NuclearModel@Pdg=1000260560"> genie::SpectralFunc1d/Default </param>
-->


<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Intranuclear rescattering
Use the HadronTransportEnable option to toggle intranuclear rescattering on/off.
Also, set the preferred hadron transport model.
Options include:
- genie::HAIntranuke/Default
- genie::HAIntranuke2018/Default
- genie::HNIntranuke2018/Default
- genie::HNIntranuke2018/OsetOff
-->
<param type="bool" name="HadronTransp-Enable"> true </param>
<param type="alg" name="HadronTransp-Model"> genie::HAIntranuke2018/Default </param>


<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Specify which cross section model is to be used by each GENIE event generation thread.
The parameter name is build as: "XSecModel@[name of thread]"
-->
<!-- New Nieves QE model -->


<param type="alg" name="XSecModel@genie::EventGenerator/QEL-CC"> genie::NievesQELCCPXSec/ZExp </param>

<!-- <param type="alg" name="XSecModel@genie::EventGenerator/QEL-CC"> genie::LwlynSmithQELCCPXSec/Dipole </param> -->
<param type="alg" name="XSecModel@genie::EventGenerator/QEL-NC"> genie::AhrensNCELPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/QEL-EM"> genie::RosenbluthPXSec/Default </param>

<!-- New Berger-Sehgal resonance model w/MiniBooNE tune... -->
<param type="alg" name="XSecModel@genie::EventGenerator/RES-CC"> genie::BergerSehgalRESPXSec2014/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-NC"> genie::BergerSehgalRESPXSec2014/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-EM"> genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock </param>


<!-- New Kuzmin-Lyubushkin-Naumov resonance model w/MiniBooNE tune... -->
<!--
<param type="alg" name="XSecModel@genie::EventGenerator/RES-CC"> genie::KuzminLyubushkinNaumovRESPXSec2014/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-NC"> genie::KuzminLyubushkinNaumovRESPXSec2014/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-EM"> genie::KuzminLyubushkinNaumovRESPXSec2014/NoPauliBlock </param>
-->

<!-- Historical Rein-Sehgal model -->
<!--
<param type="alg" name="XSecModel@genie::EventGenerator/RES-CC"> genie::ReinSehgalRESPXSec/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-NC"> genie::ReinSehgalRESPXSec/NoPauliBlock </param>
<param type="alg" name="XSecModel@genie::EventGenerator/RES-EM"> genie::ReinSehgalRESPXSec/NoPauliBlock </param>
-->

<param type="alg" name="XSecModel@genie::EventGenerator/DIS-CC"> genie::KNOTunedQPMDISPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DIS-NC"> genie::KNOTunedQPMDISPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DIS-EM"> genie::KNOTunedQPMDISPXSec/Default </param>

<!-- Historical Rein-Sehegal model -->
<!--
<param type="alg" name="XSecModel@genie::EventGenerator/COH-CC-PION"> genie::ReinSehgalCOHPiPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/COH-NC-PION"> genie::ReinSehgalCOHPiPXSec/Default </param>
-->

<!-- BS "Finite-mass" (as opposed to infinite mass) nucleus, slow and not very different from the paper version -->
<!--
<param type="alg" name="XSecModel@genie::EventGenerator/COH-CC-PION"> genie::BergerSehgalFMCOHPiPXSec2015/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/COH-NC-PION"> genie::BergerSehgalFMCOHPiPXSec2015/Default </param>
-->

<!-- Berger-Sehgal "as in the paper" -->
<param type="alg" name="XSecModel@genie::EventGenerator/COH-CC-PION"> genie::BergerSehgalCOHPiPXSec2015/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/COH-NC-PION"> genie::BergerSehgalCOHPiPXSec2015/Default </param>


<!-- Alvarez-Ruso et al COH pion
<param type="alg" name="XSecModel@genie::EventGenerator/COH-CC-PION"> genie::AlvarezRusoCOHPiPXSec/Fast </param>
<param type="alg" name="XSecModel@genie::EventGenerator/COH-NC-PION"> genie::AlvarezRusoCOHPiPXSec/Fast </param>
-->

<param type="alg" name="XSecModel@genie::EventGenerator/IMD"> genie::BardinIMDRadCorPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/IMD-ANH"> genie::IMDAnnihilationPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/NUE-EL"> genie::NuElectronPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/QEL-CC-CHARM"> genie::KovalenkoQELCharmPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DIS-CC-CHARM"> genie::AivazisCharmPXSecLO/CC-Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DIS-CC-SINGLEK"> genie::AlamSimoAtharVacasSKPXSec2014/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/QEL-CC-LAMBDA"> genie::PaisQELLambdaPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/AM-NUGAMMA"> genie::H3AMNuGammaPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DFR-CC"> genie::ReinDFRPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/DFR-NC"> genie::ReinDFRPXSec/Default </param>


<param type="alg" name="XSecModel@genie::EventGenerator/MEC-CC"> genie::SuSAv2MECPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/MEC-NC"> genie::EmpiricalMECPXSec2015/Default </param>

<param type="alg" name="XSecModel@genie::EventGenerator/NucleonDecay"> genie::DummyPXSec/Default </param>
<param type="alg" name="XSecModel@genie::EventGenerator/NNBarOsc"> genie::NNBarOscDummyPXSec/Default </param>


</param_set>


</global_param_list>
Loading