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

Jump to bottom

Don't merge-branch for review!!! MK model with event generation used FOAM algorithm #130

Closed
wants to merge 14 commits into from
Closed

Don't merge-branch for review!!! MK model with event generation used FOAM algorithm #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a86db6b
Beginning of work on MK single pion production model
Aug 13, 2019
e04700c
merge with the latest code
Dec 19, 2019
d64acdf
fix issue with electron (anti)neutrino scattering on helium
Jun 5, 2020
4215f25
implement the latest version of MK-model
Dec 30, 2019
dd4d5c4
get last updates from main branch
Jun 5, 2020
b804e88
implement the latest version of MK-model with adaptive MC-generation …
Jun 6, 2020
04c5fd4
fix transition rules from neutrino to antineutrino
Sep 5, 2020
9dc13c6
add configuration files for MKSPP
Sep 5, 2020
4a195f2
change model parameters according to last fit
Sep 23, 2020
3ebafd8
fix bugs: reading config-parameter and minus operator
Oct 1, 2020
d77faf7
change to new(still incorrect) transition rules from Minoo
Dec 2, 2020
d4fcadb
add some optimizations to speed up the total cross sections calculations
Jan 7, 2021
7f55db0
add folder doxygen in .gitignore
Jan 7, 2021
02e4d85
fix bug in pdg table
Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
@@ -1,5 +1,6 @@
bin/
lib/
doxygen/
build-env.log
src/make/Make.config
src/make/Make.config_no_paths
Expand All @@ -12,4 +13,4 @@ src/Framework/Conventions/GVersion.h
*~
*.rootmap
*_ROOT_DICT_*
*.swp
*.swp
112 changes: 59 additions & 53 deletions config/CommonDecay.xml
View file
Open in desktop
Expand Up @@ -55,59 +55,65 @@ University of Liverpool
<!--
Standard particles that get decayed by GENIE
-->
<param type="bool" name="DecayParticleWithCode=221"> true </param> <!-- eta -->
<param type="bool" name="DecayParticleWithCode=331"> true </param> <!-- eta^{prime} -->
<param type="bool" name="DecayParticleWithCode=113"> true </param> <!-- rho^{0} -->
<param type="bool" name="DecayParticleWithCode=213"> true </param> <!-- rho^{+} -->
<param type="bool" name="DecayParticleWithCode=-213"> true </param> <!-- rho^{-} -->
<param type="bool" name="DecayParticleWithCode=223"> true </param> <!-- omega -->
<param type="bool" name="DecayParticleWithCode=333"> true </param> <!-- phi -->
<param type="bool" name="DecayParticleWithCode=1114"> true </param> <!-- P33(1232) Delta- -->
<param type="bool" name="DecayParticleWithCode=2114"> true </param> <!-- P33(1232) Delta0 -->
<param type="bool" name="DecayParticleWithCode=2214"> true </param> <!-- P33(1232) Delta+ -->
<param type="bool" name="DecayParticleWithCode=2224"> true </param> <!-- P33(1232) Delta++ -->
<param type="bool" name="DecayParticleWithCode=22112"> true </param> <!-- S11(1535) N0 -->
<param type="bool" name="DecayParticleWithCode=22212"> true </param> <!-- S11(1535) N+ -->
<param type="bool" name="DecayParticleWithCode=1214"> true </param> <!-- D13(1520) N0 -->
<param type="bool" name="DecayParticleWithCode=2124"> true </param> <!-- D13(1520) N+ -->
<param type="bool" name="DecayParticleWithCode=32112"> true </param> <!-- S11(1650) N0 -->
<param type="bool" name="DecayParticleWithCode=32212"> true </param> <!-- S11(1650) N+ -->
<param type="bool" name="DecayParticleWithCode=21214"> true </param> <!-- D13(1700) N0 -->
<param type="bool" name="DecayParticleWithCode=22124"> true </param> <!-- D13(1700) N+ -->
<param type="bool" name="DecayParticleWithCode=2116"> true </param> <!-- D15(1675) N0 -->
<param type="bool" name="DecayParticleWithCode=2216"> true </param> <!-- D15(1675) N+ -->
<param type="bool" name="DecayParticleWithCode=1112"> true </param> <!-- S31(1620) Delta- -->
<param type="bool" name="DecayParticleWithCode=1212"> true </param> <!-- S31(1620) Delta0 -->
<param type="bool" name="DecayParticleWithCode=2122"> true </param> <!-- S31(1620) Delta+ -->
<param type="bool" name="DecayParticleWithCode=2222"> true </param> <!-- S31(1620) Delta++ -->
<param type="bool" name="DecayParticleWithCode=11114"> true </param> <!-- D33(1700) Delta- -->
<param type="bool" name="DecayParticleWithCode=12114"> true </param> <!-- D33(1700) Delta0 -->
<param type="bool" name="DecayParticleWithCode=12214"> true </param> <!-- D33(1700) Delta+ -->
<param type="bool" name="DecayParticleWithCode=12224"> true </param> <!-- D33(1700) Delta++ -->
<param type="bool" name="DecayParticleWithCode=12112"> true </param> <!-- P11(1440) N0 -->
<param type="bool" name="DecayParticleWithCode=12212"> true </param> <!-- P11(1440) N+ -->
<param type="bool" name="DecayParticleWithCode=31214"> true </param> <!-- P13(1720) N0 -->
<param type="bool" name="DecayParticleWithCode=32124"> true </param> <!-- P13(1720) N+ -->
<param type="bool" name="DecayParticleWithCode=12116"> true </param> <!-- F15(1680) N0 -->
<param type="bool" name="DecayParticleWithCode=12216"> true </param> <!-- F15(1680) N+ -->
<param type="bool" name="DecayParticleWithCode=21112"> true </param> <!-- P31(1910) Delta- -->
<param type="bool" name="DecayParticleWithCode=21212"> true </param> <!-- P31(1910) Delta0 -->
<param type="bool" name="DecayParticleWithCode=22122"> true </param> <!-- P31(1910) Delta+ -->
<param type="bool" name="DecayParticleWithCode=22222"> true </param> <!-- P31(1910) Delta++ -->
<param type="bool" name="DecayParticleWithCode=21114"> true </param> <!-- P33(1920) Delta- -->
<param type="bool" name="DecayParticleWithCode=22114"> true </param> <!-- P33(1920) Delta0 -->
<param type="bool" name="DecayParticleWithCode=22214"> true </param> <!-- P33(1920) Delta+ -->
<param type="bool" name="DecayParticleWithCode=22224"> true </param> <!-- P33(1920) Delta++ -->
<param type="bool" name="DecayParticleWithCode=1116"> true </param> <!-- F35(1905) Delta- -->
<param type="bool" name="DecayParticleWithCode=1216"> true </param> <!-- F35(1905) Delta0 -->
<param type="bool" name="DecayParticleWithCode=2126"> true </param> <!-- F35(1905) Delta+ -->
<param type="bool" name="DecayParticleWithCode=2226"> true </param> <!-- F35(1905) Delta++ -->
<param type="bool" name="DecayParticleWithCode=1118"> true </param> <!-- F37(1950) Delta- -->
<param type="bool" name="DecayParticleWithCode=2118"> true </param> <!-- F37(1950) Delta0 -->
<param type="bool" name="DecayParticleWithCode=2218"> true </param> <!-- F37(1950) Delta+ -->
<param type="bool" name="DecayParticleWithCode=2228"> true </param> <!-- F37(1950) Delta++ -->
<param type="bool" name="DecayParticleWithCode=42112"> true </param> <!-- P11(1710) N0 -->
<param type="bool" name="DecayParticleWithCode=42212"> true </param> <!-- P11(1710) N+ -->
<param type="bool" name="DecayParticleWithCode=221"> true </param> <!-- eta -->
<param type="bool" name="DecayParticleWithCode=331"> true </param> <!-- eta^{prime} -->
<param type="bool" name="DecayParticleWithCode=113"> true </param> <!-- rho^{0} -->
<param type="bool" name="DecayParticleWithCode=213"> true </param> <!-- rho^{+} -->
<param type="bool" name="DecayParticleWithCode=-213"> true </param> <!-- rho^{-} -->
<param type="bool" name="DecayParticleWithCode=223"> true </param> <!-- omega -->
<param type="bool" name="DecayParticleWithCode=333"> true </param> <!-- phi -->
<param type="bool" name="DecayParticleWithCode=1114"> true </param> <!-- P33(1232) Delta- -->
<param type="bool" name="DecayParticleWithCode=2114"> true </param> <!-- P33(1232) Delta0 -->
<param type="bool" name="DecayParticleWithCode=2214"> true </param> <!-- P33(1232) Delta+ -->
<param type="bool" name="DecayParticleWithCode=2224"> true </param> <!-- P33(1232) Delta++ -->
<param type="bool" name="DecayParticleWithCode=102112"> true </param> <!-- S11(1535) N0 -->
<param type="bool" name="DecayParticleWithCode=102212"> true </param> <!-- S11(1535) N+ -->
<param type="bool" name="DecayParticleWithCode=102114"> true </param> <!-- D13(1520) N0 -->
<param type="bool" name="DecayParticleWithCode=102214"> true </param> <!-- D13(1520) N+ -->
<param type="bool" name="DecayParticleWithCode=132112"> true </param> <!-- S11(1650) N0 -->
<param type="bool" name="DecayParticleWithCode=132212"> true </param> <!-- S11(1650) N+ -->
<param type="bool" name="DecayParticleWithCode=112114"> true </param> <!-- D13(1700) N0 -->
<param type="bool" name="DecayParticleWithCode=112214"> true </param> <!-- D13(1700) N+ -->
<param type="bool" name="DecayParticleWithCode=102116"> true </param> <!-- D15(1675) N0 -->
<param type="bool" name="DecayParticleWithCode=102216"> true </param> <!-- D15(1675) N+ -->
<param type="bool" name="DecayParticleWithCode=111112"> true </param> <!-- S31(1620) Delta- -->
<param type="bool" name="DecayParticleWithCode=112112"> true </param> <!-- S31(1620) Delta0 -->
<param type="bool" name="DecayParticleWithCode=112212"> true </param> <!-- S31(1620) Delta+ -->
<param type="bool" name="DecayParticleWithCode=112222"> true </param> <!-- S31(1620) Delta++ -->
<param type="bool" name="DecayParticleWithCode=121114"> true </param> <!-- D33(1700) Delta- -->
<param type="bool" name="DecayParticleWithCode=122114"> true </param> <!-- D33(1700) Delta0 -->
<param type="bool" name="DecayParticleWithCode=122214"> true </param> <!-- D33(1700) Delta+ -->
<param type="bool" name="DecayParticleWithCode=122224"> true </param> <!-- D33(1700) Delta++ -->
<param type="bool" name="DecayParticleWithCode=202112"> true </param> <!-- P11(1440) N0 -->
<param type="bool" name="DecayParticleWithCode=202212"> true </param> <!-- P11(1440) N+ -->
<param type="bool" name="DecayParticleWithCode=211114"> true </param> <!-- P33(1600) Delta- -->
<param type="bool" name="DecayParticleWithCode=212114"> true </param> <!-- P33(1600) Delta0 -->
<param type="bool" name="DecayParticleWithCode=212214"> true </param> <!-- P33(1600) Delta+ -->
<param type="bool" name="DecayParticleWithCode=212224"> true </param> <!-- P33(1600) Delta++ -->
<param type="bool" name="DecayParticleWithCode=202114"> true </param> <!-- P13(1720) N0 -->
<param type="bool" name="DecayParticleWithCode=202214"> true </param> <!-- P13(1720) N+ -->
<param type="bool" name="DecayParticleWithCode=202116"> true </param> <!-- F15(1680) N0 -->
<param type="bool" name="DecayParticleWithCode=202216"> true </param> <!-- F15(1680) N+ -->
<param type="bool" name="DecayParticleWithCode=221112"> true </param> <!-- P31(1910) Delta- -->
<param type="bool" name="DecayParticleWithCode=222112"> true </param> <!-- P31(1910) Delta0 -->
<param type="bool" name="DecayParticleWithCode=222212"> true </param> <!-- P31(1910) Delta+ -->
<param type="bool" name="DecayParticleWithCode=222222"> true </param> <!-- P31(1910) Delta++ -->
<param type="bool" name="DecayParticleWithCode=221114"> true </param> <!-- P33(1920) Delta- -->
<param type="bool" name="DecayParticleWithCode=222114"> true </param> <!-- P33(1920) Delta0 -->
<param type="bool" name="DecayParticleWithCode=222214"> true </param> <!-- P33(1920) Delta+ -->
<param type="bool" name="DecayParticleWithCode=222224"> true </param> <!-- P33(1920) Delta++ -->
<param type="bool" name="DecayParticleWithCode=211116"> true </param> <!-- F35(1905) Delta- -->
<param type="bool" name="DecayParticleWithCode=212116"> true </param> <!-- F35(1905) Delta0 -->
<param type="bool" name="DecayParticleWithCode=212216"> true </param> <!-- F35(1905) Delta+ -->
<param type="bool" name="DecayParticleWithCode=212226"> true </param> <!-- F35(1905) Delta++ -->
<param type="bool" name="DecayParticleWithCode=201118"> true </param> <!-- F37(1950) Delta- -->
<param type="bool" name="DecayParticleWithCode=202118"> true </param> <!-- F37(1950) Delta0 -->
<param type="bool" name="DecayParticleWithCode=202218"> true </param> <!-- F37(1950) Delta+ -->
<param type="bool" name="DecayParticleWithCode=202228"> true </param> <!-- F37(1950) Delta++ -->
<param type="bool" name="DecayParticleWithCode=212112"> true </param> <!-- P11(1710) N0 -->
<param type="bool" name="DecayParticleWithCode=212212"> true </param> <!-- P11(1710) N+ -->
<param type="bool" name="DecayParticleWithCode=212118"> true </param> <!-- F17(1970) N0 -->
<param type="bool" name="DecayParticleWithCode=212218"> true </param> <!-- F17(1970) N+ -->
<param type="bool" name="DecayParticleWithCode=-24"> false </param> <!-- W- from Glashow Resonance reactions -->

<!--
Expand Down
13 changes: 8 additions & 5 deletions config/CommonParam.xml
View file
Open in desktop
Expand Up @@ -246,9 +246,10 @@ Or changing the name of this parameter set
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Proton and neutron anomalous magnetic moments
-->
<param type="double" name="AnomMagnMoment-P"> 2.7930 </param> <!-- 2.7928473 -->
<param type="double" name="AnomMagnMoment-N"> -1.913042 </param>
-->
<param type="double" name="AnomMagnMoment-P"> 2.7928473446 </param>
<param type="double" name="AnomMagnMoment-N"> -1.9130427 </param>


</param_set>

Expand All @@ -266,8 +267,10 @@ Or changing the name of this parameter set
- genie::BBA03ELFormFactorsModel, H.Budd, NuINT-02 proceedings
- genie::BBA05ELFormFactorsModel, R.Bradford, A.Bodek, H.Budd and J.Arrington, hep-ex/0602017
- genie::BBA07ELFormFactorsModel, R.Bradford, A.Bodek, H.Budd and S.Avvakumov, Euro.Phys.J.C53 (2008);[arXiv:0708.1946 [hep-ex]]
-->
<param type="alg" name="ElasticFormFactorsModel"> genie::BBA07ELFormFactorsModel/Default </param>
- genie::GalsterELFormFactorsModel, S.Galster et al., Nuclear Physics B32 (1971) 221-237
-->
<param type="alg" name="ElasticFormFactorsModel"> genie::BBA07ELFormFactorsModel/Default </param>


<!-- Option for turning on Transverse Enhancement by Elastic Form Factor adjustment.
See http://arxiv.org/abs/1405.0583 and http://arxiv.org/abs/1106.0340
Expand Down
5 changes: 5 additions & 0 deletions config/DipoleAxialFormFactorModel.xml
View file
Open in desktop
Expand Up @@ -23,6 +23,11 @@ QEL-FA0 double No FA(q2 = 0) CommonParam[QuasiElast
<param type="double" name="QEL-Ma"> 0.990 </param>
<param type="double" name="QEL-FA0"> -1.2670 </param>
</param_set>

<param_set name="MK">
<param type="double" name="QEL-Ma"> 1.03 </param>
<param type="double" name="QEL-FA0"> -1.26 </param>
</param_set>

</alg_conf>

36 changes: 35 additions & 1 deletion config/EventGenerator.xml
View file
Open in desktop
Expand Up @@ -549,6 +549,40 @@ XSecModel alg Yes Cross section model used at the thread
<param type="alg" name="Module-5"> genie::UnstableParticleDecayer/AfterHadronTransport </param>
<param type="alg" name="ILstGen"> genie::COHInteractionListGenerator/CC-PION </param>
</param_set>

<!-- MK single pion production model -->

<param_set name="MKSPP-CC">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 10 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::FermiMover/Default </param>
<param type="alg" name="Module-3"> genie::RSPPEventGenerator/Default </param>
<param type="alg" name="Module-4"> genie::PauliBlocker/Default </param>
<param type="alg" name="Module-5"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="Module-6"> genie::NucDeExcitationSim/Default </param>
<param type="alg" name="Module-7"> genie::HadronTransporter/Default </param>
<param type="alg" name="Module-8"> genie::NucBindEnergyAggregator/Default </param>
<param type="alg" name="Module-9"> genie::UnstableParticleDecayer/AfterHadronTransport </param>
<param type="alg" name="ILstGen"> genie::RSPPInteractionListGenerator/CC-Default </param>
</param_set>

<param_set name="MKSPP-NC">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 10 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::FermiMover/Default </param>
<param type="alg" name="Module-3"> genie::RSPPEventGenerator/Default </param>
<param type="alg" name="Module-4"> genie::PauliBlocker/Default </param>
<param type="alg" name="Module-5"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="Module-6"> genie::NucDeExcitationSim/Default </param>
<param type="alg" name="Module-7"> genie::HadronTransporter/Default </param>
<param type="alg" name="Module-8"> genie::NucBindEnergyAggregator/Default </param>
<param type="alg" name="Module-9"> genie::UnstableParticleDecayer/AfterHadronTransport </param>
<param type="alg" name="ILstGen"> genie::RSPPInteractionListGenerator/NC-Default </param>
</param_set>

<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -589,7 +623,7 @@ XSecModel alg Yes Cross section model used at the thread
<param type="alg" name="ILstGen"> genie::RSPPInteractionListGenerator/NC-Default </param>
<param type="alg" name="XSecModel"> genie::ReinSehgalSPPPXSec/Default </param>
</param_set>

<!-- Boosted Dark Matter Event Generation -->
<param_set name="DMEL">
<param type="string" name="VldContext"> </param>
Expand Down
39 changes: 39 additions & 0 deletions config/GalsterELFormFactorsModel.xml
View file
Open in desktop
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<alg_conf>

<!--
Configuration for the Galster elastic form factors model

Configurable Parameters:
.........................................................................................
Name Type Optional Comment Default
.........................................................................................
EL-Mv double No Vector Mass
AnomMagnMoment-P double No p Anomalous Magn Moment CommonParam[MagnMoments]
AnomMagnMoment-N double No n Anomalous Magn Moment CommonParam[MagnMoments]
Galster-Gen-p double No parameter for Gen
isIsoscalarNucleon bool Yes Is nucleon isoscalar? false
-->

<param_set name="Default">

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

<param type="double" name="EL-Mv"> 0.71 </param>

<!-- parameter for Galster model,
see ref. S.Galster et al., Nuclear Physics B32 (1971) 221-237
-->

<param type="double" name="Galster-Gen-p"> 5.6 </param>

</param_set>

<param_set name="MK">
<param type="double" name="EL-Mv"> 0.84 </param>
<param type="bool" name="isIsoscalarNucleon"> true </param>
</param_set>

</alg_conf>

2 changes: 2 additions & 0 deletions config/LwlynSmithFFCC.xml
View file
Open in desktop
Expand Up @@ -48,5 +48,7 @@ SU3-F double No Co
<param type="alg" name="AxialFormFactorModel"> genie::KuzminNaumov2016AxialFormFactorModel/Default </param>

</param_set>


</alg_conf>