diff --git a/VERSION b/VERSION
index a26fe4def9..da316c861b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-999.999.999
+3.06.02.sbn
diff --git a/config/AR23_20i/AR23_20i_01_000/CommonParam.xml b/config/AR23_20i/AR23_20i_01_000/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_000/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_01_000/ModelConfiguration.xml b/config/AR23_20i/AR23_20i_01_000/ModelConfiguration.xml
new file mode 100644
index 0000000000..3c6dac4363
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_000/ModelConfiguration.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExp_minervaFull
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_01_001/CommonParam.xml b/config/AR23_20i/AR23_20i_01_001/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_001/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_01_001/ModelConfiguration.xml b/config/AR23_20i/AR23_20i_01_001/ModelConfiguration.xml
new file mode 100644
index 0000000000..41c61cc409
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_001/ModelConfiguration.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExp_minerva
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_01_002/CommonParam.xml b/config/AR23_20i/AR23_20i_01_002/CommonParam.xml
new file mode 100644
index 0000000000..c6e60a9ace
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_002/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2723
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_01_002/ModelConfiguration.xml b/config/AR23_20i/AR23_20i_01_002/ModelConfiguration.xml
new file mode 100644
index 0000000000..1bb6f5928c
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_01_002/ModelConfiguration.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExp_minervaNature
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_02_000/CommonParam.xml b/config/AR23_20i/AR23_20i_02_000/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_02_000/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR23_20i/AR23_20i_02_000/ModelConfiguration.xml b/config/AR23_20i/AR23_20i_02_000/ModelConfiguration.xml
new file mode 100644
index 0000000000..2aa8f19489
--- /dev/null
+++ b/config/AR23_20i/AR23_20i_02_000/ModelConfiguration.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExp_lqcdFull
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR23_20i/README.md b/config/AR23_20i/README.md
index 4ed323ca46..2a1945ac27 100644
--- a/config/AR23_20i/README.md
+++ b/config/AR23_20i/README.md
@@ -10,4 +10,39 @@ The physics content is the following
- 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
\ No newline at end of file
+ - De-exitation photons are enabled for Argon
+
+## Modifications
+
+ Four new tunes have been added, taking different QEL z-expansion axial FF parameters following
+ https://arxiv.org/abs/2512.14097 and T. Cai et al (MINERvA), Nature 614 (2023) 48-53.
+ Note the arxiv paper uses the opposite sign convention to GENIE.
+
+ AR23_20i_01_000: uses `ZExp_minervaFull` parameters, with the full sum rules, Eq. (33)
+ AR23_20i_01_001: uses `ZExp_minerva` parameters, without the full sum rules, Eq. (31)
+ AR23_20i_01_002: uses `ZExp_minervaNature` parameters, from Nature paper Supp. Table 4
+ AR23_20i_02_000: uses `ZExp_lqcdFull` parameters, with the full sum rules, Eq. (41)
+
+ Note the `Q4limit` parameter, which applies the sum rules: 2512.14097 paper's kmax=6 is
+ equivalent to GENIE kmax=2 with Q4limit set to true, which adds four extra constraints.
+ This also means that Nature paper kmax=8 maps to kmax=4 in GENIE with Q4limit true
+
+ Note also the Tcut values: The arxiv paper uses Tcut = 9 (m_pi0)^2 not 9 (m_pi+)^2
+
+ Finally, note that AR23_20i_01_002 uses a different value for QEL-FA0 = -1.2723
+
+ A summary table of the parameters and tunes is below:
+
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Tune: AR23_20i_X0_000 | Kmax | Q4limit | T0 (GeV/c)^2 | Tcut (GeV/c)^2 | A1,A2... |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Def: AR23_20i_00_000 | 4 | true | -0.28 | 0.1764 | 2.30,-0.6,-3.8,2.4 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR23_20i_01_000 | 2 | true | -0.5 | 0.161604 | 1.64778080,-0.94181417 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR23_20i_01_001 | 2 | false | -0.5 | 0.161604 | 1.65,-0.94 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR23_20i_01_002 | 4 | true | -0.75 | 0.1764 | 1.50,-1.2,-0.1,0.2 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | LQCD: AR23_20i_02_000 | 2 | true | -0.5 | 0.161604 | 1.721,-0.31 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
\ No newline at end of file
diff --git a/config/AR23_22i/CommonParam.xml b/config/AR23_22i/CommonParam.xml
new file mode 100644
index 0000000000..2b53094c08
--- /dev/null
+++ b/config/AR23_22i/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2670
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR23_22i/MECInteractionListGenerator.xml b/config/AR23_22i/MECInteractionListGenerator.xml
new file mode 100644
index 0000000000..a6ea945a66
--- /dev/null
+++ b/config/AR23_22i/MECInteractionListGenerator.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+ false
+ true
+
+
+
+
+
+
+ true
+ false
+ false
+
+
+
+ false
+ true
+ false
+
+
+
+ false
+ false
+ true
+
+
+
+
diff --git a/config/AR23_22i/ModelConfiguration.xml b/config/AR23_22i/ModelConfiguration.xml
new file mode 100644
index 0000000000..67cdf13b9d
--- /dev/null
+++ b/config/AR23_22i/ModelConfiguration.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+ genie::HybridXSecAlgorithm/CRPA-QEL
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR23_22i/NucDeExcitationSim.xml b/config/AR23_22i/NucDeExcitationSim.xml
new file mode 100644
index 0000000000..d9029fd755
--- /dev/null
+++ b/config/AR23_22i/NucDeExcitationSim.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ true
+ true
+
+
+
diff --git a/config/AR23_22i/README.md b/config/AR23_22i/README.md
new file mode 100644
index 0000000000..512d48306c
--- /dev/null
+++ b/config/AR23_22i/README.md
@@ -0,0 +1,15 @@
+# SBN tune with CRPA 1p1h
+
+This configuration is based upon AR23_20i_00_000 but has modifications
+requested in summer 2025 by the Short Baseline Neutrino program experiments.
+
+Notable components of the physics model are the following:
+ - CRPA model for 1p1h
+ - For free nucleons, the LwlynSmith model with Dipole is used
+ - SuSAv2 model for 2p2h
+ - 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-exctitation photons are enabled for 40Ar
\ No newline at end of file
diff --git a/config/AR23_22i/TuneGeneratorList.xml b/config/AR23_22i/TuneGeneratorList.xml
new file mode 100644
index 0000000000..938e224062
--- /dev/null
+++ b/config/AR23_22i/TuneGeneratorList.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+ 18
+ genie::EventGenerator/QEL-CC
+ genie::EventGenerator/QEL-NC
+ genie::EventGenerator/RES-CC
+ genie::EventGenerator/RES-NC
+ genie::EventGenerator/DIS-CC
+ genie::EventGenerator/DIS-NC
+ genie::EventGenerator/COH-CC-PION
+ genie::EventGenerator/COH-NC-PION
+ genie::EventGenerator/DIS-CC-CHARM
+ genie::EventGenerator/QEL-CC-CHARM
+ genie::EventGenerator/NUE-EL
+ genie::EventGenerator/IMD
+ genie::EventGenerator/IMD-ANH
+ genie::EventGenerator/DFR-CC
+ genie::EventGenerator/DFR-NC
+ genie::EventGenerator/QEL-CC-LAMBDA
+ genie::EventGenerator/MEC-CC
+ genie::EventGenerator/MEC-NC
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_000/CommonParam.xml b/config/AR25_20i/AR25_20i_01_000/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_000/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_000/ModelConfiguration.xml b/config/AR25_20i/AR25_20i_01_000/ModelConfiguration.xml
new file mode 100644
index 0000000000..793422d0d2
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_000/ModelConfiguration.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+ genie::SpectralFunc/ApproxElements
+
+ genie::SpectralFunc/ApproxElements
+ genie::SpectralFunc/ApproxElements
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExpNoRPA_minervaFull
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_001/CommonParam.xml b/config/AR25_20i/AR25_20i_01_001/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_001/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_001/ModelConfiguration.xml b/config/AR25_20i/AR25_20i_01_001/ModelConfiguration.xml
new file mode 100644
index 0000000000..98b6dc17d7
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_001/ModelConfiguration.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+ genie::SpectralFunc/ApproxElements
+
+ genie::SpectralFunc/ApproxElements
+ genie::SpectralFunc/ApproxElements
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExpNoRPA_minerva
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_002/CommonParam.xml b/config/AR25_20i/AR25_20i_01_002/CommonParam.xml
new file mode 100644
index 0000000000..c6e60a9ace
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_002/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2723
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_01_002/ModelConfiguration.xml b/config/AR25_20i/AR25_20i_01_002/ModelConfiguration.xml
new file mode 100644
index 0000000000..32b0d90e8b
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_01_002/ModelConfiguration.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+ genie::SpectralFunc/ApproxElements
+
+ genie::SpectralFunc/ApproxElements
+ genie::SpectralFunc/ApproxElements
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExpNoRPA_minervaNature
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_02_000/CommonParam.xml b/config/AR25_20i/AR25_20i_02_000/CommonParam.xml
new file mode 100644
index 0000000000..3aa433ce27
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_02_000/CommonParam.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.088962
+ 1.062213
+ 0.838730
+
+
+
+
+
+ 0.501716712132
+ 1.16639E-5
+ 7.2973525332858855E-3
+
+
+
+
+ 0.804
+ 0.463
+
+
+
+
+
+
+ 0.97417
+ 0.2248
+ 0.220
+ 0.995
+
+ 0.227780466682
+
+
+
+
+
+
+ 1.4
+ 3.0
+
+
+
+
+ 1.430
+
+
+
+
+
+ true
+ 1.809000
+
+
+
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.030802
+ 2.338338
+ 0.300
+ 1.000
+ 0.300
+ 1.000
+ 0.008
+ 0.943153
+ 0.100
+ 1.000
+ 0.100
+ 1.000
+
+
+
+
+
+ 0.0001
+ 0.0150
+ 0.0150
+ 0.0200
+ 0.0160
+ 0.0250
+ 0.0280
+ 0.0280
+ 0.0230
+ 0.0300
+ 0.0280
+ 0.0310
+ 0.0310
+ false
+
+
+ SuSA
+
+
+
+
+
+
+ 1.000
+
+
+ 0.000
+ 1.000
+
+
+ 0.250
+
+
+
+
+
+
+
+ 7.0
+
+
+ 0.35
+
+
+
+
+
+ -1.2754
+
+
+ 0.994989
+ 0.840
+
+
+
+
+
+ 2.7930
+ -1.913042
+
+
+
+
+
+ 2.0
+
+
+
+
+ genie::BBA07ELFormFactorsModel/Default
+
+
+ false
+ genie::TransverseEnhancementFFModel/Default
+
+
+
+
+
+
+ P33(1232),S11(1535),D13(1520),S11(1650),D13(1700),D15(1675),
+ S31(1620),D33(1700),P11(1440),P33(1600),P13(1720),F15(1680),
+ P31(1910),P33(1920),F35(1905),F37(1950),P11(1710)
+
+
+
+
+
+ false
+
+
+
+
+
+
+ 0.1
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ 1.441
+ 0.1349766
+ 0.547862
+ 0.827
+ -0.38
+ -0.0427
+
+
+
+
+
+
+ 2.30
+ 3.00
+
+
+
+
+ genie_pdg_table.txt
+
+
+
+
+
+
+ 0.010
+ 1000.000
+
+
+
+
+
+
diff --git a/config/AR25_20i/AR25_20i_02_000/ModelConfiguration.xml b/config/AR25_20i/AR25_20i_02_000/ModelConfiguration.xml
new file mode 100644
index 0000000000..397b756fae
--- /dev/null
+++ b/config/AR25_20i/AR25_20i_02_000/ModelConfiguration.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ genie::LocalFGM/SpectralFunctionLikeWithCorrelation
+
+
+
+
+
+ genie::SpectralFunc/ApproxElements
+
+ genie::SpectralFunc/ApproxElements
+ genie::SpectralFunc/ApproxElements
+
+
+
+
+
+ true
+ genie::HAIntranuke2018/Default
+
+
+
+
+
+
+ genie::NievesQELCCPXSec/ZExpNoRPA_lqcdFull
+
+
+ genie::AhrensNCELPXSec/Default
+ genie::RosenbluthPXSec/Default
+
+
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/NoPauliBlock
+ genie::BergerSehgalRESPXSec2014/EM-NoPauliBlock
+
+
+
+
+
+
+
+
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+ genie::KNOTunedQPMDISPXSec/Default
+
+
+
+
+
+
+
+
+ genie::BergerSehgalCOHPiPXSec2015/Default
+ genie::BergerSehgalCOHPiPXSec2015/Default
+
+
+
+
+ genie::BardinIMDRadCorPXSec/Default
+ genie::IMDAnnihilationPXSec/Default
+ genie::NuElectronPXSec/Default
+ genie::KovalenkoQELCharmPXSec/Default
+ genie::AivazisCharmPXSecLO/CC-Default
+ genie::AlamSimoAtharVacasSKPXSec2014/Default
+ genie::PaisQELLambdaPXSec/Default
+ genie::H3AMNuGammaPXSec/Default
+ genie::ReinDFRPXSec/Default
+ genie::ReinDFRPXSec/Default
+
+
+ genie::SuSAv2MECPXSec/Default
+ genie::EmpiricalMECPXSec2015/Default
+
+ genie::DummyPXSec/Default
+ genie::NNBarOscDummyPXSec/Default
+
+
+
+
+
+
diff --git a/config/AR25_20i/README.md b/config/AR25_20i/README.md
index af018b1b3d..2196584ee1 100644
--- a/config/AR25_20i/README.md
+++ b/config/AR25_20i/README.md
@@ -6,10 +6,46 @@ requested in summer 2025 by the Short Baseline Neutrino program experiments.
Notable components of the physics model are the following:
- Valencia model for 1p1h, using z-expansion, with RPA turned off
- SuSAv2 model for 2p2h
- - Spectral function for select nuclei, including one for 40Ar based on JLab
+ - Spectral function for select elements (C, O, Ar), including one for 40Ar based on JLab
measurements (see https://doi.org/10.1103/PhysRevD.105.112002
and https://doi.org/10.1103/PhysRevD.107.012005)
+ - Isotopes of these elements use the SF of 12C, 16O, and 40 Ar, respectively.
- Other nuclei use the AR23_20i_00_000 "spectral-function-like approach" for LFG
- The parameters related to pion production are taken from the G18_10a_02_11b
tune in order to ensure a better starting point.
- De-exctitation photons are enabled for 40Ar
+
+## Modifications
+
+ Four new tunes have been added, taking different QEL z-expansion axial FF parameters following
+ https://arxiv.org/abs/2512.14097 and T. Cai et al (MINERvA), Nature 614 (2023) 48-53.
+ Note the arxiv paper uses the opposite sign convention to GENIE.
+
+ AR25_20i_01_000: uses `ZExp_minervaFull` parameters, with the full sum rules, Eq. (33)
+ AR25_20i_01_001: uses `ZExp_minerva` parameters, without the full sum rules, Eq. (31)
+ AR25_20i_01_002: uses `ZExp_minervaNature` parameters, from Nature paper Supp. Table 4
+ AR25_20i_02_000: uses `ZExp_lqcdFull` parameters, with the full sum rules, Eq. (41)
+
+ Note the `Q4limit` parameter, which applies the sum rules: 2512.14097 paper's kmax=6 is
+ equivalent to GENIE kmax=2 with Q4limit set to true, which adds four extra constraints.
+ This also means that Nature paper kmax=8 maps to kmax=4 in GENIE with Q4limit true
+
+ Note also the Tcut values: The arxiv paper uses Tcut = 9 (m_pi0)^2 not 9 (m_pi+)^2
+
+ Finally, note that AR25_20i_01_002 uses a different value for QEL-FA0 = -1.2723
+
+ A summary table of the parameters and tunes is below:
+
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Tune: AR25_20i_X0_000 | Kmax | Q4limit | T0 (GeV/c)^2 | Tcut (GeV/c)^2 | A1,A2... |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Def: AR25_20i_00_000 | 4 | true | -0.28 | 0.1764 | 2.30,-0.6,-3.8,2.4 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR25_20i_01_000 | 2 | true | -0.5 | 0.161604 | 1.64778080,-0.94181417 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR25_20i_01_001 | 2 | false | -0.5 | 0.161604 | 1.65,-0.94 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | Mnv: AR25_20i_01_002 | 4 | true | -0.75 | 0.1764 | 1.50,-1.2,-0.1,0.2 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
+ | LQCD: AR25_20i_02_000 | 2 | true | -0.5 | 0.161604 | 1.721,-0.31 |
+ |-----------------------|------|---------|--------------|----------------|--------------------------|
\ No newline at end of file
diff --git a/config/AR25_22i/README.md b/config/AR25_22i/README.md
index 3b24b80f46..00cb1fd57a 100644
--- a/config/AR25_22i/README.md
+++ b/config/AR25_22i/README.md
@@ -1,4 +1,17 @@
# SBN tune with CRPA 1p1h
-This configuration is the same as SBN25_20i_00_000 except that the CRPA model is
-used for charged-current 1p1h instead of the Valencia model
+This configuration is based upon AR23_20i_00_000 but has modifications
+requested in summer 2025 by the Short Baseline Neutrino program experiments.
+
+Notable components of the physics model are the following:
+ - CRPA model for 1p1h
+ - For free nucleons, the LwlynSmith model with Dipole is used
+ - SuSAv2 model for 2p2h
+ - Spectral function for select elements (C, O, Ar), including one for 40Ar based on JLab
+ measurements (see https://doi.org/10.1103/PhysRevD.105.112002
+ and https://doi.org/10.1103/PhysRevD.107.012005)
+ - Isotopes of these elements use the SF of 12C, 16O, and 40 Ar, respectively.
+ - Other nuclei use the AR23_20i_00_000 "spectral-function-like approach" for LFG
+ - The parameters related to pion production are taken from the G18_10a_02_11b
+ tune in order to ensure a better starting point.
+ - De-exctitation photons are enabled for 40Ar
\ No newline at end of file
diff --git a/config/LwlynSmithFFCC.xml b/config/LwlynSmithFFCC.xml
index 6d19b72d44..3208e5f00f 100644
--- a/config/LwlynSmithFFCC.xml
+++ b/config/LwlynSmithFFCC.xml
@@ -28,7 +28,10 @@ SU3-F double No Co
Axial form factors used for QEL CC cross section calculation.
Options are:
- genie::DipoleAxialFormFactorModel
- - genie::ZExpAxialFormFactorModel, Bhattacharya, Paz, and Hill, Phys.Rev. D84 (2011) 073006
+ - genie::ZExpAxialFormFactorModel, Bhattacharya, Paz, and Hill, Phys.Rev. D84 (2011) 073006
+ + Added additional configurations, `minerva`(+`Full`) and `lqcd`(+`Full`)
+ Meyer et al (MINERvA), arXiv: 2512.14097
+ + Added `minervaNature` configuration, Cai et al (MINERvA), Nature 614 (2023) 48-53
- genie::MArunAxialFormFactorModel, Kakorin,Kuzmin,Naumov, Eur.Phys.J.C 81 (2021) 1142
genie::ZExpAxialFormFactorModel/Default
-->
@@ -36,17 +39,34 @@ SU3-F double No Co
genie::DipoleAxialFormFactorModel/Default
-
genie::ZExpAxialFormFactorModel/Default
+
+
+
+ genie::ZExpAxialFormFactorModel/minerva
+
+
+
+ genie::ZExpAxialFormFactorModel/minervaFull
+
+
+ genie::ZExpAxialFormFactorModel/minervaNature
+
+
+
+ genie::ZExpAxialFormFactorModel/lqcd
+
+
+
+ genie::ZExpAxialFormFactorModel/lqcdFull
genie::MArunAxialFormFactorModel/Default
-
diff --git a/config/NewQELXSec.xml b/config/NewQELXSec.xml
index 957ba8565c..f4146d4440 100644
--- a/config/NewQELXSec.xml
+++ b/config/NewQELXSec.xml
@@ -19,10 +19,10 @@ AverageOverNucleons bool Yes whether to do an MC integration
adaptive
- 0.0001
- 100000
+ 0.001
+ 100
genie::VertexGenerator/Default
- 500
+ 40000
diff --git a/config/NievesQELCCPXSec.xml b/config/NievesQELCCPXSec.xml
index 87b49568a2..da004d7d80 100644
--- a/config/NievesQELCCPXSec.xml
+++ b/config/NievesQELCCPXSec.xml
@@ -87,4 +87,49 @@ RmaxMode string Yes Method to use to comput
false
+
+ genie::LwlynSmithFFCC/ZExp_minerva
+ false
+
+
+
+ genie::LwlynSmithFFCC/ZExp_minervaFull
+ false
+
+
+
+ genie::LwlynSmithFFCC/ZExp_minervaNature
+ false
+
+
+
+ genie::LwlynSmithFFCC/ZExp_minerva
+
+
+
+ genie::LwlynSmithFFCC/ZExp_minervaFull
+
+
+
+ genie::LwlynSmithFFCC/ZExp_minervaNature
+
+
+
+ genie::LwlynSmithFFCC/ZExp_lqcd
+ false
+
+
+
+ genie::LwlynSmithFFCC/ZExp_lqcdFull
+ false
+
+
+
+ genie::LwlynSmithFFCC/ZExp_lqcd
+
+
+
+ genie::LwlynSmithFFCC/ZExp_lqcdFull
+
+
diff --git a/config/ZExpAxialFormFactorModel.xml b/config/ZExpAxialFormFactorModel.xml
index b95d547539..d45040ee0c 100644
--- a/config/ZExpAxialFormFactorModel.xml
+++ b/config/ZExpAxialFormFactorModel.xml
@@ -27,6 +27,7 @@ QEL-Q4limit bool Yes 1/Q^4 limit conditions GPL value: QEL-Q4limit
-->
+
QuasiElastic
@@ -43,9 +44,83 @@ QEL-Q4limit bool Yes 1/Q^4 limit conditions GPL value: QEL-Q4limit
2.3
+
+
+
+
+ QuasiElastic
+ false
+ 2
+
+ -0.5
+ 0.161604
+
+ 1.65
+ -0.94
+
+
+ QuasiElastic
+
+ true
+ 2
+
+ -0.5
+ 0.161604
+
+ 1.64778080
+ -0.94181417
+
+
+
+
+
+ QuasiElastic
+
+ true
+ 4
+
+ -0.75
+ 0.1764
+
+ 1.50
+ -1.2
+ -0.1
+ 0.2
+
+
+
+
+
+ QuasiElastic
+
+ false
+ 2
+
+ -0.5
+ 0.161604
+
+ 1.721
+ -0.31
+
+
+
+
+
+ QuasiElastic
+
+ true
+ 2
+
+ -0.5
+ 0.161604
+
+ 1.72089706
+ -0.30982708
+
+
diff --git a/data/covariances/AxialZExpFF_LQCD.dat b/data/covariances/AxialZExpFF_LQCD.dat
new file mode 100644
index 0000000000..f1fe2e3295
--- /dev/null
+++ b/data/covariances/AxialZExpFF_LQCD.dat
@@ -0,0 +1,6 @@
+% error matrix for z expansion axial form factor
+% based on A. Meyer et al (MINERvA), arXiv 2512.14097 (LQCD kmax=6, the 2 free parameters)
+% See Eq. 40
+% | an | an is a 2x2 matrix
+0.00265598 -0.00562374
+-0.00562374 0.01596000
\ No newline at end of file
diff --git a/data/covariances/AxialZExpFF_minervaElementaryTarget.dat b/data/covariances/AxialZExpFF_minervaElementaryTarget.dat
new file mode 100644
index 0000000000..43cf8a2a64
--- /dev/null
+++ b/data/covariances/AxialZExpFF_minervaElementaryTarget.dat
@@ -0,0 +1,6 @@
+% error matrix for z expansion axial form factor
+% based on A. Meyer et al (MINERvA), arXiv 2512.14097 (kmax=6, the 2 free parameters)
+% See Eq. 32
+% | an | an is a 2x2 matrix
+0.05554150 -0.03262482
+-0.03262482 0.09151761
\ No newline at end of file
diff --git a/data/covariances/AxialZExpFF_minervaNature.dat b/data/covariances/AxialZExpFF_minervaNature.dat
new file mode 100644
index 0000000000..1e7431a031
--- /dev/null
+++ b/data/covariances/AxialZExpFF_minervaNature.dat
@@ -0,0 +1,8 @@
+% error matrix for z expansion axial form factor
+% based on T. Cai et al (MINERvA), Nature 614 (2023) 48-53 (kmax=8, the 4 free parameters)
+% See Supplementary Table 5
+% | an | an is a 4x4 matrix
+0.31 0.005589991 -0.713740919 0.541649333
+0.005589991 0.7 -0.369042003 -1.220893116
+-0.713740919 -0.369042003 1.9 -0.696265036
+0.541649333 -1.220893116 -0.696265036 3.5
\ No newline at end of file
diff --git a/data/logo/genie_banner_long.txt b/data/logo/genie_banner_long.txt
index 24da58f59d..edb2c7f7e6 100644
--- a/data/logo/genie_banner_long.txt
+++ b/data/logo/genie_banner_long.txt
@@ -10,7 +10,7 @@
* Nh+//om Nh+/yN o///s *
* d+//+d my+/smmyhN m///h NEUTRINO MONTE CARLO GENERATOR *
* Ns///yN NdyoshNNs///d h////yN *
-* mo//om ms///+m d///////oyhmN Version 999.999.999 *
+* mo//om ms///+m d///////oyhmN Version 3.06.02.sbn *
* N+//yN ms////+N h////////////oym *
* s//h ho/+///sN N///////////////od http://www.genie-mc.org *
* N+/h my++yh+//y s/////////////////oN *
diff --git a/data/logo/genie_banner_short.txt b/data/logo/genie_banner_short.txt
index 00addf278c..0b505d6c90 100644
--- a/data/logo/genie_banner_short.txt
+++ b/data/logo/genie_banner_short.txt
@@ -4,7 +4,7 @@
** .oooooo. oooooooooooo ooooo ooo ooooo oooooooooooo **
** d8P' `Y8b `888' `8 `888b. `8' `888' `888' `8 NEUTRINO MONTE CARLO GENERATOR **
** 888 888 8 `88b. 8 888 888 **
-** 888 888oooo8 8 `88b. 8 888 888oooo8 Version 999.999.999 **
+** 888 888oooo8 8 `88b. 8 888 888oooo8 Version 3.06.02.sbn **
** 888 ooooo 888 " 8 `88b.8 888 888 " **
** `88. .88' 888 o 8 `888 888 888 o http://www.genie-mc.org **
** `Y8bood8P' o888ooooood8 o8o `8 o888o o888ooooood8 **
diff --git a/data/logo/warning_development_version.txt b/data/logo/warning_development_version.txt
index 8e78e196f8..f2829d56c4 100644
--- a/data/logo/warning_development_version.txt
+++ b/data/logo/warning_development_version.txt
@@ -16,7 +16,7 @@ oooooo oooooo oooo .o. ooooooooo. ooooo ooo ooooo ooooo
USE THIS VERSION AT YOUR OWN RISK.
- If you prefer to use a version with validated physics content, please see http://releases.genie-mc.org
+ If you prefer to use a version with validated physics content, please see http://genie-mc.github.io/releases.html
Site managers, please don't remove this notice!
diff --git a/data/logo/warning_release_candidate.txt b/data/logo/warning_release_candidate.txt
index ecbe1b128c..521a486512 100644
--- a/data/logo/warning_release_candidate.txt
+++ b/data/logo/warning_release_candidate.txt
@@ -16,7 +16,7 @@ oooooo oooooo oooo .o. ooooooooo. ooooo ooo ooooo ooooo
USE THIS VERSION AT YOUR OWN RISK.
- If you prefer to use a version with validated physics content, please see http://releases.genie-mc.org
+ If you prefer to use a version with validated physics content, please see https://genie-mc.github.io/releases.html
Site managers, please don't remove this notice!
diff --git a/data/logo/warning_sbn_version.txt b/data/logo/warning_sbn_version.txt
new file mode 100644
index 0000000000..accc2dc0d2
--- /dev/null
+++ b/data/logo/warning_sbn_version.txt
@@ -0,0 +1,38 @@
+********************************************************************************************************
+
+oooooo oooooo oooo .o. ooooooooo. ooooo ooo ooooo ooooo ooo .oooooo.
+ `888. `888. .8' .888. `888 `Y88. `888b. `8' `888' `888b. `8' d8P' `Y8b
+ `888. .8888. .8' .8"888. 888 .d88' 8 `88b. 8 888 8 `88b. 8 888
+ `888 .8'`888. .8' .8' `888. 888ooo88P' 8 `88b. 8 888 8 `88b. 8 888
+ `888.8' `888.8' .88ooo8888. 888`88b. 8 `88b.8 888 8 `88b.8 888 ooooo
+ `888' `888' .8' `888. 888 `88b. 8 `888 888 8 `888 `88. .88'
+ `8' `8' o88o o8888o o888o o888o o8o `8 o888o o8o `8 `Y8bood8P'
+
+
+ /==================================\
+ || .-') .-. .-') .-') _ ||
+ || ( OO ).\ ( OO ) ( OO ) ) ||
+ || (_)---\_);-----.\ ,--./ ,--,' ||
+ || / _ | | .-. | | \ | |\ ||
+ || \ :` `. | '-' /_)| \| | ) ||
+ || '..`''.)| .-. `. | . |/ ||
+ || .-._) \| | \ || |\ | ||
+ || \ /| '--' /| | \ | ||
+ || `-----' `------' `--' `--' ||
+ \==================================/
+
+
+********************************************************************************************************
+
+ THIS IS A DEVELOPMENT VERSION OF GENIE USED FOR SBN.
+ IT HAS *NOT* BEEN FULLY VALIDATED AND IT HAS EXPERIMENTAL FEATURES.
+
+ USE THIS VERSION AT YOUR OWN RISK.
+
+ If you prefer to use a version with validated physics content, please see https://genie-mc.github.io/releases.html
+
+ Site managers, please don't remove this notice!
+
+
+ GENIE will continue running in 15 seconds...
+
diff --git a/src/Framework/Utils/PrintUtils.cxx b/src/Framework/Utils/PrintUtils.cxx
index 8127b0fd4e..19c8c02d61 100644
--- a/src/Framework/Utils/PrintUtils.cxx
+++ b/src/Framework/Utils/PrintUtils.cxx
@@ -131,6 +131,13 @@ void genie::utils::print::PrintBanner(void)
PrintBanner(warn_rc_banner, 0);
#endif
+#ifdef __GENIE_SBN_VERSION__
+ string warn_sbn_banner =
+ base_dir +
+ string("/data/logo/warning_sbn_version.txt");
+ PrintBanner(warn_sbn_banner, 0);
+#endif
+
string main_banner =
base_dir +
string("/data/logo/genie_banner_long.txt");
diff --git a/src/Physics/QuasiElastic/XSection/NievesQELCCPXSec.cxx b/src/Physics/QuasiElastic/XSection/NievesQELCCPXSec.cxx
index f6d79fd73c..446c55ef1e 100644
--- a/src/Physics/QuasiElastic/XSection/NievesQELCCPXSec.cxx
+++ b/src/Physics/QuasiElastic/XSection/NievesQELCCPXSec.cxx
@@ -927,7 +927,6 @@ const TLorentzVector inNucleonMomOnShell1, const TLorentzVector leptonMom1,
const TLorentzVector qTildeP41, double M, bool is_neutrino,
const Target& target, bool assumeFreeNucleon) const
{
-
// copy the const value to do the transfermation
TLorentzVector neutrinoMom = neutrinoMom1;
TLorentzVector inNucleonMomOnShell = inNucleonMomOnShell1;
@@ -944,9 +943,9 @@ const Target& target, bool assumeFreeNucleon) const
// Find the rotation angle needed to put q3VecTilde along z
TVector3 zvec(0.0, 0.0, 1.0);
TVector3 rot = ( qTildeP4.Vect().Cross(zvec) ).Unit(); // Vector to rotate about
+
// Angle between the z direction and q
double angle = zvec.Angle( qTildeP4.Vect() );
-
neutrinoMom.Rotate(angle, rot);
leptonMom.Rotate(angle, rot);
qTildeP4.Rotate(angle, rot);
diff --git a/src/scripts/setup/genie-write-gversion b/src/scripts/setup/genie-write-gversion
index c689fd7ea7..d808053fe7 100755
--- a/src/scripts/setup/genie-write-gversion
+++ b/src/scripts/setup/genie-write-gversion
@@ -5,6 +5,8 @@
# C.Andreopoulos , Rutherford Lab.
#
# Revised for usage with git by S. Gardiner , Fermilab.
+#
+# Checks for SBN added by John Plows
$GENIE = $ENV{'GENIE'};
die ("Not even the GENIE environmental variable is defined!") unless defined $GENIE;
@@ -17,10 +19,13 @@ chomp($release = $rel_info[0]);
# ($major, $minor, $rev) = split('.', $release);
# note: split() doesn't split on dots...
-$release=~m/(\d+).(\d+).(\d+)/;
+# note: escaping dots and anchoring regex with ^ and $ to avoid partial matches
+# note: adding possibility for sbn string
+$release=~m/^(\d+)\.(\d+)\.(\d+)(?:\.(sbn))?$/;
$major = $1;
$minor = $2;
$revis = $3;
+my $sbn = defined $4 ? 1 : 0;
# Get the hash of the current git commit
$git_revision = `git rev-parse --verify HEAD`;
@@ -79,6 +84,9 @@ else {
if($minor % 2) {
print GVRS "#define __GENIE_RELEASE_CANDIDATE__ \n\n";
}
+ if($sbn == 1) {
+ print GVRS "#define __GENIE_SBN_VERSION__ \n\n";
+ }
}
print GVRS "#endif\n\n";