From fbcfaf0c5fa10a3568fc254c9cf3b14d4ebe84f7 Mon Sep 17 00:00:00 2001
From: Richard Diurba <rdiurba@dunegpvm07.fnal.gov>
Date: Tue, 17 Oct 2023 15:24:56 -0500
Subject: [PATCH 1/2] Added alternative FSI CMCs of AR23_20

---
 config/AR23_20i/CommonParam.xml               |  44 ++-
 config/AR23_20j/CommonParam.xml               | 363 ++++++++++++++++++
 .../AR23_20j/MECInteractionListGenerator.xml  |  47 +++
 config/AR23_20j/ModelConfiguration.xml        | 145 +++++++
 config/AR23_20j/NucDeExcitationSim.xml        |  20 +
 config/AR23_20j/README.md                     |  12 +
 config/AR23_20j/TuneGeneratorList.xml         |  72 ++++
 config/AR23_20k/CommonParam.xml               | 363 ++++++++++++++++++
 .../AR23_20k/MECInteractionListGenerator.xml  |  47 +++
 config/AR23_20k/ModelConfiguration.xml        | 145 +++++++
 config/AR23_20k/NucDeExcitationSim.xml        |  20 +
 config/AR23_20k/README.md                     |  12 +
 config/AR23_20k/TuneGeneratorList.xml         |  72 ++++
 config/AR23_20l/CommonParam.xml               | 363 ++++++++++++++++++
 .../AR23_20l/MECInteractionListGenerator.xml  |  47 +++
 config/AR23_20l/ModelConfiguration.xml        | 145 +++++++
 config/AR23_20l/NucDeExcitationSim.xml        |  20 +
 config/AR23_20l/README.md                     |  12 +
 config/AR23_20l/TuneGeneratorList.xml         |  72 ++++
 19 files changed, 2013 insertions(+), 8 deletions(-)
 create mode 100644 config/AR23_20j/CommonParam.xml
 create mode 100644 config/AR23_20j/MECInteractionListGenerator.xml
 create mode 100644 config/AR23_20j/ModelConfiguration.xml
 create mode 100644 config/AR23_20j/NucDeExcitationSim.xml
 create mode 100644 config/AR23_20j/README.md
 create mode 100644 config/AR23_20j/TuneGeneratorList.xml
 create mode 100644 config/AR23_20k/CommonParam.xml
 create mode 100644 config/AR23_20k/MECInteractionListGenerator.xml
 create mode 100644 config/AR23_20k/ModelConfiguration.xml
 create mode 100644 config/AR23_20k/NucDeExcitationSim.xml
 create mode 100644 config/AR23_20k/README.md
 create mode 100644 config/AR23_20k/TuneGeneratorList.xml
 create mode 100644 config/AR23_20l/CommonParam.xml
 create mode 100644 config/AR23_20l/MECInteractionListGenerator.xml
 create mode 100644 config/AR23_20l/ModelConfiguration.xml
 create mode 100644 config/AR23_20l/NucDeExcitationSim.xml
 create mode 100644 config/AR23_20l/README.md
 create mode 100644 config/AR23_20l/TuneGeneratorList.xml

diff --git a/config/AR23_20i/CommonParam.xml b/config/AR23_20i/CommonParam.xml
index e0a74f912..ad5f46618 100644
--- a/config/AR23_20i/CommonParam.xml
+++ b/config/AR23_20i/CommonParam.xml
@@ -98,26 +98,19 @@ University of Liverpool
     <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
-    <param type="double" name="DIS-HMultWgt-vp-EM-m2">  0.100  </param>
-    <param type="double" name="DIS-HMultWgt-vp-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
-    <param type="double" name="DIS-HMultWgt-vn-EM-m2">  0.300  </param>
-    <param type="double" name="DIS-HMultWgt-vn-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
-    <param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300  </param>
-    <param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
-    <param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100  </param>
-    <param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000  </param>
+
   </param_set>
 
 
@@ -157,6 +150,41 @@ University of Liverpool
   </param_set>
 
 
+  <!--
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      INTRANUKE-specific parameters:
+      - Mode options are: hA, hN
+      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
+      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
+
+Probably these should all be moved in the local configurations
+  -->
+
+  <param_set name="INUKE">
+    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
+    <param type="double" name="INUKE-HadStep">           0.05  </param>
+    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
+    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
+    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
+    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
+    <param type="double" name="INUKE-FermiFac">          1.0   </param>
+    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
+    <param type="bool"   name="INUKE-DoFermi">           true  </param>
+    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
+    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
+  </param_set>
+
+  <param_set name="HAINUKE">
+    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
+    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
+  </param_set>
+
+  <param_set name="HNINUKE">
+    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
+    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
+    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
+  </param_set>
+
   <param_set name="Coherent">
 
     <param type="double" name="COH-Ro"> 1.000 </param>
diff --git a/config/AR23_20j/CommonParam.xml b/config/AR23_20j/CommonParam.xml
new file mode 100644
index 000000000..ad5f46618
--- /dev/null
+++ b/config/AR23_20j/CommonParam.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+***************************************************************************************************
+This file defines parameters sets for parameters which are common between algorithms and therefore
+has to be the same for those parameters to be meaningful.
+This is file is read from the AlgConfigPool and the parameters set are expected to be used by the
+algorithms to configure these common parameters.
+
+Author:
+Costas Andreopoulos <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+
+and
+Marco Roda <marco.roda \at liverpool.ac.uk>
+University of Liverpool
+***************************************************************************************************
+-->
+
+
+
+<common_Param_list>
+
+
+  <param_set name="Tunable">
+    <!-- Reserved register for tuning -->
+
+    <param type="double" name="RES-Ma">  1.088962  </param>
+    <param type="double" name="DIS-XSecScale"> 1.062213 </param>
+    <param type="double" name="RES-CC-XSecScale"> 0.838730 </param>
+ 
+  </param_set>
+
+
+  <param_set name="WeakInt">
+    <param type="double" name="WeinbergAngle"> 0.501716712132 </param> <!-- 0.501568 -->
+
+  </param_set>
+
+  <param_set name="StrongInt">
+    <param type="double" name="SU3-D"> 0.804 </param>
+    <param type="double" name="SU3-F"> 0.463 </param>
+
+  </param_set>
+
+
+  <param_set name="CKM">
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 CKM quark mixing parameters
+	 Chinese Physics C Vol.40, No. 10 (2016) 100001
+	 Review of Particle Physics
+    -->
+    <param type="double" name="CKM-Vud">  0.97417  </param>
+    <param type="double" name="CKM-Vus">  0.2248   </param>
+    <param type="double" name="CKM-Vcd">  0.220    </param>  <!-- 0.2239 -->
+    <param type="double" name="CKM-Vcs">  0.995    </param>
+
+    <param type="double" name="CabibboAngle">  0.227780466682 </param> <!-- 0.226893 -->
+
+  </param_set>
+
+  <param_set name="NUCL">
+
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 NUCL-Ro (in fm) is a scale parameter driving the effective nuclear sizes (Ro in R=Ro*A^1/3)
+    -->
+    <param type="double" name="NUCL-R0"> 1.4 </param>
+    <param type="double" name="NUCL-NR"> 3.0 </param>
+
+  </param_set>
+
+  <param_set name="Masses">
+    <param type="double" name="Charm-Mass"> 1.430  </param> <!-- GeV -->
+  </param_set>
+
+
+  <param_set name="NonResBackground">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	RES/DIS joining scheme
+	At this point there is a single scheme, the one originally developed in neugen3.
+	For W >  Wcut : RES -> 0,   +  DIS                -> full
+	For W <= Wcut : RES -> full + `DIS' (non-RES bkg) -> modified by DIS-HMultWgt-* params
+	-
+	- ...
+
+    -->
+    <param type="bool"   name="UseDRJoinScheme"> true      </param>
+    <param type="double" name="Wcut">            1.809000  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	NEUGEN parameters applied to DIS hadronic multiplicity distributions
+	to avoid 2-ble counting with RES
+    -->
+
+    <param type="double" name="DIS-HMultWgt-vp-CC-m2">  0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
+
+  </param_set>
+
+
+  <param_set name="FermiGas">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Parameters related with GENIE's Fermi Gas (RFG) model implementation
+	- RFG-Momentum-CutOff is a momentum cut-off for the NN correlation tail
+	- RFG-NucRemovalE@Pdg=10LZZZAAAI is the removal energy for the nucleus with the specified pdg
+	code. If none is used then the average binding energy will be computed from Wapstra's semi-
+	empirical formula.
+	Currently, if you explicitly specify a binding energy for a nucleus then the same value will
+	be used for all isotopes.
+    -->
+    <param type="double" name="RFG-MomentumCutOff">              0.0001 </param> <!-- No BR tail    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000020040">  0.0150 </param> <!-- He4    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000030060">  0.0150 </param> <!-- Li6    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000060120">  0.0200 </param> <!-- C12    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000080160">  0.0160 </param> <!-- O16    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000120240">  0.0250 </param> <!-- Mg24   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000180400">  0.0280 </param> <!-- Ar40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000200400">  0.0280 </param> <!-- Ca40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000260560">  0.0230 </param> <!-- Fe56   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000280580">  0.0300 </param> <!-- Ni58   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000501190">  0.0280 </param> <!-- Sn119  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000791970">  0.0310 </param> <!-- Au197  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000822080">  0.0310 </param> <!-- Pb208  -->
+    <param type="bool"   name="RFG-UseParametrization">          false  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Table of Fermi momentum (kF) constants for various nuclei
+	The tables can be found in $GENIE/config/FermiMomentumTables.xml
+    -->
+    <param type="string" name="FermiMomentumTable"> SuSA </param>
+
+  </param_set>
+
+
+  <!--
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      INTRANUKE-specific parameters:
+      - Mode options are: hA, hN
+      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
+      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
+
+Probably these should all be moved in the local configurations
+  -->
+
+  <param_set name="INUKE">
+    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
+    <param type="double" name="INUKE-HadStep">           0.05  </param>
+    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
+    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
+    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
+    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
+    <param type="double" name="INUKE-FermiFac">          1.0   </param>
+    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
+    <param type="bool"   name="INUKE-DoFermi">           true  </param>
+    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
+    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
+  </param_set>
+
+  <param_set name="HAINUKE">
+    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
+    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
+  </param_set>
+
+  <param_set name="HNINUKE">
+    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
+    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
+    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
+  </param_set>
+
+  <param_set name="Coherent">
+
+    <param type="double" name="COH-Ro"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Minimum and maximum considered Q^2 for Berger-Sehgal coherent reactions when estimating
+	the max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-Q2-min"> 0.000 </param>
+    <param type="double" name="COH-Q2-max"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for Berger-Sehgal coherent reactions when estimating the
+	max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-t-max"> 0.250 </param>
+
+  </param_set>
+
+
+  <param_set name="Diffractive">
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Slope parameter beta for diffractive scattering (GeV^-2) (b ~ 0.333 * nucleon_size^2)
+    -->
+    <param type="double" name="DFR-Beta"> 7.0 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for diffractive scattering reactions when estimating the max cross section.
+	Units in GeV^2.
+
+This value is read in KpHase space!!! It's mental, but we have to be careful before removing this
+Or changing the name of this parameter set
+    -->
+    <param type="double" name="DFR-t-max"> 0.35 </param>
+
+  </param_set>
+
+  <param_set name="QuasiElastic">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Value of axial form factor at Q2=0
+    -->
+    <param type="double" name="QEL-FA0"> -1.2670 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Axial and vector masses for quasi-elastic scattering
+    -->
+    <param type="double" name="QEL-Ma"> 0.994989 </param>
+    <param type="double" name="QEL-Mv"> 0.840 </param>
+
+  </param_set>
+
+  <param_set name="MagnMoments">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	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_set>
+
+  <param_set name="MultiNucleons">
+    <!--  Q3 max for 2p2h model    -->
+    <param type="double" name="NSV-Q3Max"> 2.0 </param>
+  </param_set>
+
+  <param_set name="ElasticFF">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Elastic form factors used for QEL CC cross section calculation.
+	Options are:
+	- genie::DipoleELFormFactorsModel
+	- 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>
+
+    <!-- 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
+    -->
+    <param type="bool" name="UseElFFTransverseEnhancement">  false                              </param>
+    <param type="alg" name="TransverseEnhancement"> genie::TransverseEnhancementFFModel/Default </param>
+
+  </param_set>
+
+  <param_set name="Resonances">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Default list of baryon resonances included in cross section models and generation threads
+    -->
+    <param type="string" name="ResonanceNameList">
+      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)
+    </param>
+
+  </param_set>
+
+  <param_set name="Lepton">
+    <param type="bool" name="ApplyCoulombCorrection"> false </param>
+
+  </param_set>
+
+
+  <param_set name="BoostedDarkMatter">
+    <!--
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Set the coupling of dark matter to nucleons
+    -->
+    <param type="double" name="ZpCoupling"> 0.1 </param>
+    <param type="double" name="DarkLeftCharge"> 1.0 </param>
+    <param type="double" name="DarkRightCharge"> 1.0 </param>
+    <param type="double" name="DarkScalarCharge"> 1.0 </param>
+    <param type="double" name="UpLeftCharge"> 1.0 </param>
+    <param type="double" name="UpRightCharge"> 1.0 </param>
+    <param type="double" name="DownLeftCharge"> 1.0 </param>
+    <param type="double" name="DownRightCharge"> 1.0 </param>
+    <param type="double" name="StrangeLeftCharge"> 1.0 </param>
+    <param type="double" name="StrangeRightCharge"> 1.0 </param>
+    <param type="double" name="CharmLeftCharge"> 1.0 </param>
+    <param type="double" name="CharmRightCharge"> 1.0 </param>
+    <param type="double" name="ElectronLeftCharge"> 1.0 </param>
+    <param type="double" name="ElectronRightCharge"> 1.0 </param>
+    <param type="double" name="DMEL-Mp"> 1.441 </param>
+    <param type="double" name="DMEL-Mpi"> 0.1349766 </param>
+    <param type="double" name="DMEL-Meta"> 0.547862 </param>
+    <param type="double" name="AxialVectorSpin-u"> 0.827 </param>
+    <param type="double" name="AxialVectorSpin-d"> -0.38 </param>
+    <param type="double" name="AxialVectorSpin-s"> -0.0427 </param>
+  </param_set>
+
+
+  <param_set name="KNO2Pythia">
+    <!--
+
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Invariant mass window for the transition from KNO model to PYTHIA
+    -->
+
+    <param type="double" name="KNO2PYTHIA-Wmin">  2.30 </param>
+    <param type="double" name="KNO2PYTHIA-Wmax">  3.00 </param>
+  </param_set>
+
+  <param_set name="PDG">
+    <!-- when using the PDG table provideed by genie,
+         that are contained in $GENIE/data/evgen/catalogues/pdg
+         this string specifies the file to be used.
+         Please be aware that changing the PDG table might invalidated the selected tune -->
+    <param type="string" name="PDG-TableName"> genie_pdg_table.txt </param>
+  </param_set>
+
+
+
+  <param_set name="Validation">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	GENIE validity range
+    -->
+    <param type="double" name="GVLD-Emin">    0.010  </param>
+    <param type="double" name="GVLD-Emax"> 1000.000  </param>
+
+  </param_set>
+
+
+
+</common_Param_list>
diff --git a/config/AR23_20j/MECInteractionListGenerator.xml b/config/AR23_20j/MECInteractionListGenerator.xml
new file mode 100644
index 000000000..a6ea945a6
--- /dev/null
+++ b/config/AR23_20j/MECInteractionListGenerator.xml
@@ -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>
+
diff --git a/config/AR23_20j/ModelConfiguration.xml b/config/AR23_20j/ModelConfiguration.xml
new file mode 100644
index 000000000..8736e27b1
--- /dev/null
+++ b/config/AR23_20j/ModelConfiguration.xml
@@ -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 <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+***************************************************************************************************
+-->
+
+ <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::HNIntranuke2018/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>
diff --git a/config/AR23_20j/NucDeExcitationSim.xml b/config/AR23_20j/NucDeExcitationSim.xml
new file mode 100644
index 000000000..d9029fd75
--- /dev/null
+++ b/config/AR23_20j/NucDeExcitationSim.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration sets for NucDeExcitationSim EventRecordVisitorI
+
+Configurable Parameters:
+............................................................................................
+Name                    Type     Optional   Comment                     Default
+............................................................................................
+
+-->
+
+  <param_set name="Default"> 
+    <param type="bool" name="DoCarbon"> true </param>
+    <param type="bool" name="DoArgon">  true </param>
+  </param_set>
+
+</alg_conf>
diff --git a/config/AR23_20j/README.md b/config/AR23_20j/README.md
new file mode 100644
index 000000000..e53314ed9
--- /dev/null
+++ b/config/AR23_20j/README.md
@@ -0,0 +1,12 @@
+# Liquid Argon Experiment tune
+
+This configuration is the result of requests from SBN and DUNE collaborations.
+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
+ - 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
diff --git a/config/AR23_20j/TuneGeneratorList.xml b/config/AR23_20j/TuneGeneratorList.xml
new file mode 100644
index 000000000..938e22406
--- /dev/null
+++ b/config/AR23_20j/TuneGeneratorList.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<tune_generator_list>
+
+<!--
+
+This xml files contains the default configuration for the tune
+
+..........................................................................................................................
+NOTE:
+
+The GENIE authors would like to caution users against using anything but a comprehensive 
+GENIE mode (`Default' setting below) for physics studies.
+No detector measures generator-level reaction modes like CCQE or NCRES.
+Detectors measure final states / topologies like {1mu-,0pi}, {1mu-,1pi+}, {0mu-, 1pi0}, 
+{1 track, 1 shower}, {1 mu-like ring} etc depending on granularity, thresholds and PID capabilities.
+No final state / topology is a proxy for any particular reaction mode.
+Intranuclear re-scattering in particular causes significant migration between states
+(see Table 8.1 in the Physics and User manual).
+
+Examples:
+- {1mu-,0pi} is mostly numuCCQE, but can also be caused by numu resonance production followed by pion absorption.
+- numuCCQE gives mostly {1mu-,0pi} but occasionaly can give {1mu-,1pi} if the recoil nucleon re-interacts.
+- NC1pi0 final states can be caused by all a) NC elastic followed by nucleon rescattering, 
+  b) NC resonance neutrino-production, c) NC non-resonance background, d) low-W NC DIS
+  e) NC coherent scattering. Each source contributes differently in the pion momentum distribution.
+
+We also recommend that you treat the generator-level reaction modes largely as as an internal degree of freedom. 
+Consequently, try to define your selection efficiencies and purities in terms of observable final states _only_.
+For example, if you define as `numuCCQE-like' := {1mu-,0pi} then define your selection efficiency
+as:
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true {1mu-,0pi} events)
+and not as: 
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true numuCCQE events)
+
+..........................................................................................................................
+
+
+
+Configurable Parameters:
+..........................................................................................................................
+Name                        Type    Opt  Comment                                               Default
+..........................................................................................................................
+NGenerators                 int     No
+Generator-%d                alg     No
+
+-->
+
+  <param_set name="Default"> 
+     <param type="int" name="NGenerators">   18                                    </param>
+     <param type="alg" name="Generator-0">   genie::EventGenerator/QEL-CC          </param>
+     <param type="alg" name="Generator-1">   genie::EventGenerator/QEL-NC          </param>
+     <param type="alg" name="Generator-2">   genie::EventGenerator/RES-CC          </param>
+     <param type="alg" name="Generator-3">   genie::EventGenerator/RES-NC          </param>
+     <param type="alg" name="Generator-4">   genie::EventGenerator/DIS-CC          </param>
+     <param type="alg" name="Generator-5">   genie::EventGenerator/DIS-NC          </param>
+     <param type="alg" name="Generator-6">   genie::EventGenerator/COH-CC-PION          </param>
+     <param type="alg" name="Generator-7">   genie::EventGenerator/COH-NC-PION          </param>
+     <param type="alg" name="Generator-8">   genie::EventGenerator/DIS-CC-CHARM    </param>
+     <param type="alg" name="Generator-9">   genie::EventGenerator/QEL-CC-CHARM    </param>
+     <param type="alg" name="Generator-10">  genie::EventGenerator/NUE-EL          </param>
+     <param type="alg" name="Generator-11">  genie::EventGenerator/IMD             </param>
+     <param type="alg" name="Generator-12">  genie::EventGenerator/IMD-ANH         </param>
+     <param type="alg" name="Generator-13">  genie::EventGenerator/DFR-CC          </param>
+     <param type="alg" name="Generator-14">  genie::EventGenerator/DFR-NC          </param>
+     <param type="alg" name="Generator-15">  genie::EventGenerator/QEL-CC-LAMBDA   </param>
+     <param type="alg" name="Generator-16">  genie::EventGenerator/MEC-CC          </param>
+     <param type="alg" name="Generator-17">  genie::EventGenerator/MEC-NC          </param>
+  </param_set>
+
+</tune_generator_list>
+
diff --git a/config/AR23_20k/CommonParam.xml b/config/AR23_20k/CommonParam.xml
new file mode 100644
index 000000000..ad5f46618
--- /dev/null
+++ b/config/AR23_20k/CommonParam.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+***************************************************************************************************
+This file defines parameters sets for parameters which are common between algorithms and therefore
+has to be the same for those parameters to be meaningful.
+This is file is read from the AlgConfigPool and the parameters set are expected to be used by the
+algorithms to configure these common parameters.
+
+Author:
+Costas Andreopoulos <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+
+and
+Marco Roda <marco.roda \at liverpool.ac.uk>
+University of Liverpool
+***************************************************************************************************
+-->
+
+
+
+<common_Param_list>
+
+
+  <param_set name="Tunable">
+    <!-- Reserved register for tuning -->
+
+    <param type="double" name="RES-Ma">  1.088962  </param>
+    <param type="double" name="DIS-XSecScale"> 1.062213 </param>
+    <param type="double" name="RES-CC-XSecScale"> 0.838730 </param>
+ 
+  </param_set>
+
+
+  <param_set name="WeakInt">
+    <param type="double" name="WeinbergAngle"> 0.501716712132 </param> <!-- 0.501568 -->
+
+  </param_set>
+
+  <param_set name="StrongInt">
+    <param type="double" name="SU3-D"> 0.804 </param>
+    <param type="double" name="SU3-F"> 0.463 </param>
+
+  </param_set>
+
+
+  <param_set name="CKM">
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 CKM quark mixing parameters
+	 Chinese Physics C Vol.40, No. 10 (2016) 100001
+	 Review of Particle Physics
+    -->
+    <param type="double" name="CKM-Vud">  0.97417  </param>
+    <param type="double" name="CKM-Vus">  0.2248   </param>
+    <param type="double" name="CKM-Vcd">  0.220    </param>  <!-- 0.2239 -->
+    <param type="double" name="CKM-Vcs">  0.995    </param>
+
+    <param type="double" name="CabibboAngle">  0.227780466682 </param> <!-- 0.226893 -->
+
+  </param_set>
+
+  <param_set name="NUCL">
+
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 NUCL-Ro (in fm) is a scale parameter driving the effective nuclear sizes (Ro in R=Ro*A^1/3)
+    -->
+    <param type="double" name="NUCL-R0"> 1.4 </param>
+    <param type="double" name="NUCL-NR"> 3.0 </param>
+
+  </param_set>
+
+  <param_set name="Masses">
+    <param type="double" name="Charm-Mass"> 1.430  </param> <!-- GeV -->
+  </param_set>
+
+
+  <param_set name="NonResBackground">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	RES/DIS joining scheme
+	At this point there is a single scheme, the one originally developed in neugen3.
+	For W >  Wcut : RES -> 0,   +  DIS                -> full
+	For W <= Wcut : RES -> full + `DIS' (non-RES bkg) -> modified by DIS-HMultWgt-* params
+	-
+	- ...
+
+    -->
+    <param type="bool"   name="UseDRJoinScheme"> true      </param>
+    <param type="double" name="Wcut">            1.809000  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	NEUGEN parameters applied to DIS hadronic multiplicity distributions
+	to avoid 2-ble counting with RES
+    -->
+
+    <param type="double" name="DIS-HMultWgt-vp-CC-m2">  0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
+
+  </param_set>
+
+
+  <param_set name="FermiGas">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Parameters related with GENIE's Fermi Gas (RFG) model implementation
+	- RFG-Momentum-CutOff is a momentum cut-off for the NN correlation tail
+	- RFG-NucRemovalE@Pdg=10LZZZAAAI is the removal energy for the nucleus with the specified pdg
+	code. If none is used then the average binding energy will be computed from Wapstra's semi-
+	empirical formula.
+	Currently, if you explicitly specify a binding energy for a nucleus then the same value will
+	be used for all isotopes.
+    -->
+    <param type="double" name="RFG-MomentumCutOff">              0.0001 </param> <!-- No BR tail    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000020040">  0.0150 </param> <!-- He4    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000030060">  0.0150 </param> <!-- Li6    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000060120">  0.0200 </param> <!-- C12    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000080160">  0.0160 </param> <!-- O16    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000120240">  0.0250 </param> <!-- Mg24   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000180400">  0.0280 </param> <!-- Ar40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000200400">  0.0280 </param> <!-- Ca40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000260560">  0.0230 </param> <!-- Fe56   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000280580">  0.0300 </param> <!-- Ni58   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000501190">  0.0280 </param> <!-- Sn119  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000791970">  0.0310 </param> <!-- Au197  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000822080">  0.0310 </param> <!-- Pb208  -->
+    <param type="bool"   name="RFG-UseParametrization">          false  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Table of Fermi momentum (kF) constants for various nuclei
+	The tables can be found in $GENIE/config/FermiMomentumTables.xml
+    -->
+    <param type="string" name="FermiMomentumTable"> SuSA </param>
+
+  </param_set>
+
+
+  <!--
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      INTRANUKE-specific parameters:
+      - Mode options are: hA, hN
+      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
+      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
+
+Probably these should all be moved in the local configurations
+  -->
+
+  <param_set name="INUKE">
+    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
+    <param type="double" name="INUKE-HadStep">           0.05  </param>
+    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
+    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
+    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
+    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
+    <param type="double" name="INUKE-FermiFac">          1.0   </param>
+    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
+    <param type="bool"   name="INUKE-DoFermi">           true  </param>
+    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
+    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
+  </param_set>
+
+  <param_set name="HAINUKE">
+    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
+    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
+  </param_set>
+
+  <param_set name="HNINUKE">
+    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
+    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
+    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
+  </param_set>
+
+  <param_set name="Coherent">
+
+    <param type="double" name="COH-Ro"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Minimum and maximum considered Q^2 for Berger-Sehgal coherent reactions when estimating
+	the max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-Q2-min"> 0.000 </param>
+    <param type="double" name="COH-Q2-max"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for Berger-Sehgal coherent reactions when estimating the
+	max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-t-max"> 0.250 </param>
+
+  </param_set>
+
+
+  <param_set name="Diffractive">
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Slope parameter beta for diffractive scattering (GeV^-2) (b ~ 0.333 * nucleon_size^2)
+    -->
+    <param type="double" name="DFR-Beta"> 7.0 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for diffractive scattering reactions when estimating the max cross section.
+	Units in GeV^2.
+
+This value is read in KpHase space!!! It's mental, but we have to be careful before removing this
+Or changing the name of this parameter set
+    -->
+    <param type="double" name="DFR-t-max"> 0.35 </param>
+
+  </param_set>
+
+  <param_set name="QuasiElastic">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Value of axial form factor at Q2=0
+    -->
+    <param type="double" name="QEL-FA0"> -1.2670 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Axial and vector masses for quasi-elastic scattering
+    -->
+    <param type="double" name="QEL-Ma"> 0.994989 </param>
+    <param type="double" name="QEL-Mv"> 0.840 </param>
+
+  </param_set>
+
+  <param_set name="MagnMoments">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	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_set>
+
+  <param_set name="MultiNucleons">
+    <!--  Q3 max for 2p2h model    -->
+    <param type="double" name="NSV-Q3Max"> 2.0 </param>
+  </param_set>
+
+  <param_set name="ElasticFF">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Elastic form factors used for QEL CC cross section calculation.
+	Options are:
+	- genie::DipoleELFormFactorsModel
+	- 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>
+
+    <!-- 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
+    -->
+    <param type="bool" name="UseElFFTransverseEnhancement">  false                              </param>
+    <param type="alg" name="TransverseEnhancement"> genie::TransverseEnhancementFFModel/Default </param>
+
+  </param_set>
+
+  <param_set name="Resonances">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Default list of baryon resonances included in cross section models and generation threads
+    -->
+    <param type="string" name="ResonanceNameList">
+      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)
+    </param>
+
+  </param_set>
+
+  <param_set name="Lepton">
+    <param type="bool" name="ApplyCoulombCorrection"> false </param>
+
+  </param_set>
+
+
+  <param_set name="BoostedDarkMatter">
+    <!--
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Set the coupling of dark matter to nucleons
+    -->
+    <param type="double" name="ZpCoupling"> 0.1 </param>
+    <param type="double" name="DarkLeftCharge"> 1.0 </param>
+    <param type="double" name="DarkRightCharge"> 1.0 </param>
+    <param type="double" name="DarkScalarCharge"> 1.0 </param>
+    <param type="double" name="UpLeftCharge"> 1.0 </param>
+    <param type="double" name="UpRightCharge"> 1.0 </param>
+    <param type="double" name="DownLeftCharge"> 1.0 </param>
+    <param type="double" name="DownRightCharge"> 1.0 </param>
+    <param type="double" name="StrangeLeftCharge"> 1.0 </param>
+    <param type="double" name="StrangeRightCharge"> 1.0 </param>
+    <param type="double" name="CharmLeftCharge"> 1.0 </param>
+    <param type="double" name="CharmRightCharge"> 1.0 </param>
+    <param type="double" name="ElectronLeftCharge"> 1.0 </param>
+    <param type="double" name="ElectronRightCharge"> 1.0 </param>
+    <param type="double" name="DMEL-Mp"> 1.441 </param>
+    <param type="double" name="DMEL-Mpi"> 0.1349766 </param>
+    <param type="double" name="DMEL-Meta"> 0.547862 </param>
+    <param type="double" name="AxialVectorSpin-u"> 0.827 </param>
+    <param type="double" name="AxialVectorSpin-d"> -0.38 </param>
+    <param type="double" name="AxialVectorSpin-s"> -0.0427 </param>
+  </param_set>
+
+
+  <param_set name="KNO2Pythia">
+    <!--
+
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Invariant mass window for the transition from KNO model to PYTHIA
+    -->
+
+    <param type="double" name="KNO2PYTHIA-Wmin">  2.30 </param>
+    <param type="double" name="KNO2PYTHIA-Wmax">  3.00 </param>
+  </param_set>
+
+  <param_set name="PDG">
+    <!-- when using the PDG table provideed by genie,
+         that are contained in $GENIE/data/evgen/catalogues/pdg
+         this string specifies the file to be used.
+         Please be aware that changing the PDG table might invalidated the selected tune -->
+    <param type="string" name="PDG-TableName"> genie_pdg_table.txt </param>
+  </param_set>
+
+
+
+  <param_set name="Validation">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	GENIE validity range
+    -->
+    <param type="double" name="GVLD-Emin">    0.010  </param>
+    <param type="double" name="GVLD-Emax"> 1000.000  </param>
+
+  </param_set>
+
+
+
+</common_Param_list>
diff --git a/config/AR23_20k/MECInteractionListGenerator.xml b/config/AR23_20k/MECInteractionListGenerator.xml
new file mode 100644
index 000000000..a6ea945a6
--- /dev/null
+++ b/config/AR23_20k/MECInteractionListGenerator.xml
@@ -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>
+
diff --git a/config/AR23_20k/ModelConfiguration.xml b/config/AR23_20k/ModelConfiguration.xml
new file mode 100644
index 000000000..4f46d3717
--- /dev/null
+++ b/config/AR23_20k/ModelConfiguration.xml
@@ -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 <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+***************************************************************************************************
+-->
+
+ <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::HINCLCascadeIntranuke/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>
diff --git a/config/AR23_20k/NucDeExcitationSim.xml b/config/AR23_20k/NucDeExcitationSim.xml
new file mode 100644
index 000000000..d9029fd75
--- /dev/null
+++ b/config/AR23_20k/NucDeExcitationSim.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration sets for NucDeExcitationSim EventRecordVisitorI
+
+Configurable Parameters:
+............................................................................................
+Name                    Type     Optional   Comment                     Default
+............................................................................................
+
+-->
+
+  <param_set name="Default"> 
+    <param type="bool" name="DoCarbon"> true </param>
+    <param type="bool" name="DoArgon">  true </param>
+  </param_set>
+
+</alg_conf>
diff --git a/config/AR23_20k/README.md b/config/AR23_20k/README.md
new file mode 100644
index 000000000..e53314ed9
--- /dev/null
+++ b/config/AR23_20k/README.md
@@ -0,0 +1,12 @@
+# Liquid Argon Experiment tune
+
+This configuration is the result of requests from SBN and DUNE collaborations.
+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
+ - 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
diff --git a/config/AR23_20k/TuneGeneratorList.xml b/config/AR23_20k/TuneGeneratorList.xml
new file mode 100644
index 000000000..938e22406
--- /dev/null
+++ b/config/AR23_20k/TuneGeneratorList.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<tune_generator_list>
+
+<!--
+
+This xml files contains the default configuration for the tune
+
+..........................................................................................................................
+NOTE:
+
+The GENIE authors would like to caution users against using anything but a comprehensive 
+GENIE mode (`Default' setting below) for physics studies.
+No detector measures generator-level reaction modes like CCQE or NCRES.
+Detectors measure final states / topologies like {1mu-,0pi}, {1mu-,1pi+}, {0mu-, 1pi0}, 
+{1 track, 1 shower}, {1 mu-like ring} etc depending on granularity, thresholds and PID capabilities.
+No final state / topology is a proxy for any particular reaction mode.
+Intranuclear re-scattering in particular causes significant migration between states
+(see Table 8.1 in the Physics and User manual).
+
+Examples:
+- {1mu-,0pi} is mostly numuCCQE, but can also be caused by numu resonance production followed by pion absorption.
+- numuCCQE gives mostly {1mu-,0pi} but occasionaly can give {1mu-,1pi} if the recoil nucleon re-interacts.
+- NC1pi0 final states can be caused by all a) NC elastic followed by nucleon rescattering, 
+  b) NC resonance neutrino-production, c) NC non-resonance background, d) low-W NC DIS
+  e) NC coherent scattering. Each source contributes differently in the pion momentum distribution.
+
+We also recommend that you treat the generator-level reaction modes largely as as an internal degree of freedom. 
+Consequently, try to define your selection efficiencies and purities in terms of observable final states _only_.
+For example, if you define as `numuCCQE-like' := {1mu-,0pi} then define your selection efficiency
+as:
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true {1mu-,0pi} events)
+and not as: 
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true numuCCQE events)
+
+..........................................................................................................................
+
+
+
+Configurable Parameters:
+..........................................................................................................................
+Name                        Type    Opt  Comment                                               Default
+..........................................................................................................................
+NGenerators                 int     No
+Generator-%d                alg     No
+
+-->
+
+  <param_set name="Default"> 
+     <param type="int" name="NGenerators">   18                                    </param>
+     <param type="alg" name="Generator-0">   genie::EventGenerator/QEL-CC          </param>
+     <param type="alg" name="Generator-1">   genie::EventGenerator/QEL-NC          </param>
+     <param type="alg" name="Generator-2">   genie::EventGenerator/RES-CC          </param>
+     <param type="alg" name="Generator-3">   genie::EventGenerator/RES-NC          </param>
+     <param type="alg" name="Generator-4">   genie::EventGenerator/DIS-CC          </param>
+     <param type="alg" name="Generator-5">   genie::EventGenerator/DIS-NC          </param>
+     <param type="alg" name="Generator-6">   genie::EventGenerator/COH-CC-PION          </param>
+     <param type="alg" name="Generator-7">   genie::EventGenerator/COH-NC-PION          </param>
+     <param type="alg" name="Generator-8">   genie::EventGenerator/DIS-CC-CHARM    </param>
+     <param type="alg" name="Generator-9">   genie::EventGenerator/QEL-CC-CHARM    </param>
+     <param type="alg" name="Generator-10">  genie::EventGenerator/NUE-EL          </param>
+     <param type="alg" name="Generator-11">  genie::EventGenerator/IMD             </param>
+     <param type="alg" name="Generator-12">  genie::EventGenerator/IMD-ANH         </param>
+     <param type="alg" name="Generator-13">  genie::EventGenerator/DFR-CC          </param>
+     <param type="alg" name="Generator-14">  genie::EventGenerator/DFR-NC          </param>
+     <param type="alg" name="Generator-15">  genie::EventGenerator/QEL-CC-LAMBDA   </param>
+     <param type="alg" name="Generator-16">  genie::EventGenerator/MEC-CC          </param>
+     <param type="alg" name="Generator-17">  genie::EventGenerator/MEC-NC          </param>
+  </param_set>
+
+</tune_generator_list>
+
diff --git a/config/AR23_20l/CommonParam.xml b/config/AR23_20l/CommonParam.xml
new file mode 100644
index 000000000..ad5f46618
--- /dev/null
+++ b/config/AR23_20l/CommonParam.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+***************************************************************************************************
+This file defines parameters sets for parameters which are common between algorithms and therefore
+has to be the same for those parameters to be meaningful.
+This is file is read from the AlgConfigPool and the parameters set are expected to be used by the
+algorithms to configure these common parameters.
+
+Author:
+Costas Andreopoulos <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+
+and
+Marco Roda <marco.roda \at liverpool.ac.uk>
+University of Liverpool
+***************************************************************************************************
+-->
+
+
+
+<common_Param_list>
+
+
+  <param_set name="Tunable">
+    <!-- Reserved register for tuning -->
+
+    <param type="double" name="RES-Ma">  1.088962  </param>
+    <param type="double" name="DIS-XSecScale"> 1.062213 </param>
+    <param type="double" name="RES-CC-XSecScale"> 0.838730 </param>
+ 
+  </param_set>
+
+
+  <param_set name="WeakInt">
+    <param type="double" name="WeinbergAngle"> 0.501716712132 </param> <!-- 0.501568 -->
+
+  </param_set>
+
+  <param_set name="StrongInt">
+    <param type="double" name="SU3-D"> 0.804 </param>
+    <param type="double" name="SU3-F"> 0.463 </param>
+
+  </param_set>
+
+
+  <param_set name="CKM">
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 CKM quark mixing parameters
+	 Chinese Physics C Vol.40, No. 10 (2016) 100001
+	 Review of Particle Physics
+    -->
+    <param type="double" name="CKM-Vud">  0.97417  </param>
+    <param type="double" name="CKM-Vus">  0.2248   </param>
+    <param type="double" name="CKM-Vcd">  0.220    </param>  <!-- 0.2239 -->
+    <param type="double" name="CKM-Vcs">  0.995    </param>
+
+    <param type="double" name="CabibboAngle">  0.227780466682 </param> <!-- 0.226893 -->
+
+  </param_set>
+
+  <param_set name="NUCL">
+
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 NUCL-Ro (in fm) is a scale parameter driving the effective nuclear sizes (Ro in R=Ro*A^1/3)
+    -->
+    <param type="double" name="NUCL-R0"> 1.4 </param>
+    <param type="double" name="NUCL-NR"> 3.0 </param>
+
+  </param_set>
+
+  <param_set name="Masses">
+    <param type="double" name="Charm-Mass"> 1.430  </param> <!-- GeV -->
+  </param_set>
+
+
+  <param_set name="NonResBackground">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	RES/DIS joining scheme
+	At this point there is a single scheme, the one originally developed in neugen3.
+	For W >  Wcut : RES -> 0,   +  DIS                -> full
+	For W <= Wcut : RES -> full + `DIS' (non-RES bkg) -> modified by DIS-HMultWgt-* params
+	-
+	- ...
+
+    -->
+    <param type="bool"   name="UseDRJoinScheme"> true      </param>
+    <param type="double" name="Wcut">            1.809000  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	NEUGEN parameters applied to DIS hadronic multiplicity distributions
+	to avoid 2-ble counting with RES
+    -->
+
+    <param type="double" name="DIS-HMultWgt-vp-CC-m2">  0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
+
+  </param_set>
+
+
+  <param_set name="FermiGas">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Parameters related with GENIE's Fermi Gas (RFG) model implementation
+	- RFG-Momentum-CutOff is a momentum cut-off for the NN correlation tail
+	- RFG-NucRemovalE@Pdg=10LZZZAAAI is the removal energy for the nucleus with the specified pdg
+	code. If none is used then the average binding energy will be computed from Wapstra's semi-
+	empirical formula.
+	Currently, if you explicitly specify a binding energy for a nucleus then the same value will
+	be used for all isotopes.
+    -->
+    <param type="double" name="RFG-MomentumCutOff">              0.0001 </param> <!-- No BR tail    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000020040">  0.0150 </param> <!-- He4    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000030060">  0.0150 </param> <!-- Li6    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000060120">  0.0200 </param> <!-- C12    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000080160">  0.0160 </param> <!-- O16    -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000120240">  0.0250 </param> <!-- Mg24   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000180400">  0.0280 </param> <!-- Ar40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000200400">  0.0280 </param> <!-- Ca40   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000260560">  0.0230 </param> <!-- Fe56   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000280580">  0.0300 </param> <!-- Ni58   -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000501190">  0.0280 </param> <!-- Sn119  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000791970">  0.0310 </param> <!-- Au197  -->
+    <param type="double" name="RFG-NucRemovalE@Pdg=1000822080">  0.0310 </param> <!-- Pb208  -->
+    <param type="bool"   name="RFG-UseParametrization">          false  </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Table of Fermi momentum (kF) constants for various nuclei
+	The tables can be found in $GENIE/config/FermiMomentumTables.xml
+    -->
+    <param type="string" name="FermiMomentumTable"> SuSA </param>
+
+  </param_set>
+
+
+  <!--
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      INTRANUKE-specific parameters:
+      - Mode options are: hA, hN
+      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
+      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
+
+Probably these should all be moved in the local configurations
+  -->
+
+  <param_set name="INUKE">
+    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
+    <param type="double" name="INUKE-HadStep">           0.05  </param>
+    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
+    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
+    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
+    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
+    <param type="double" name="INUKE-FermiFac">          1.0   </param>
+    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
+    <param type="bool"   name="INUKE-DoFermi">           true  </param>
+    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
+    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
+  </param_set>
+
+  <param_set name="HAINUKE">
+    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
+    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
+  </param_set>
+
+  <param_set name="HNINUKE">
+    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
+    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
+    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
+  </param_set>
+
+  <param_set name="Coherent">
+
+    <param type="double" name="COH-Ro"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Minimum and maximum considered Q^2 for Berger-Sehgal coherent reactions when estimating
+	the max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-Q2-min"> 0.000 </param>
+    <param type="double" name="COH-Q2-max"> 1.000 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for Berger-Sehgal coherent reactions when estimating the
+	max cross section.
+	Units in GeV^2.
+    -->
+    <param type="double" name="COH-t-max"> 0.250 </param>
+
+  </param_set>
+
+
+  <param_set name="Diffractive">
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Slope parameter beta for diffractive scattering (GeV^-2) (b ~ 0.333 * nucleon_size^2)
+    -->
+    <param type="double" name="DFR-Beta"> 7.0 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Maximum considered t for diffractive scattering reactions when estimating the max cross section.
+	Units in GeV^2.
+
+This value is read in KpHase space!!! It's mental, but we have to be careful before removing this
+Or changing the name of this parameter set
+    -->
+    <param type="double" name="DFR-t-max"> 0.35 </param>
+
+  </param_set>
+
+  <param_set name="QuasiElastic">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Value of axial form factor at Q2=0
+    -->
+    <param type="double" name="QEL-FA0"> -1.2670 </param>
+
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Axial and vector masses for quasi-elastic scattering
+    -->
+    <param type="double" name="QEL-Ma"> 0.994989 </param>
+    <param type="double" name="QEL-Mv"> 0.840 </param>
+
+  </param_set>
+
+  <param_set name="MagnMoments">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	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_set>
+
+  <param_set name="MultiNucleons">
+    <!--  Q3 max for 2p2h model    -->
+    <param type="double" name="NSV-Q3Max"> 2.0 </param>
+  </param_set>
+
+  <param_set name="ElasticFF">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Elastic form factors used for QEL CC cross section calculation.
+	Options are:
+	- genie::DipoleELFormFactorsModel
+	- 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>
+
+    <!-- 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
+    -->
+    <param type="bool" name="UseElFFTransverseEnhancement">  false                              </param>
+    <param type="alg" name="TransverseEnhancement"> genie::TransverseEnhancementFFModel/Default </param>
+
+  </param_set>
+
+  <param_set name="Resonances">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Default list of baryon resonances included in cross section models and generation threads
+    -->
+    <param type="string" name="ResonanceNameList">
+      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)
+    </param>
+
+  </param_set>
+
+  <param_set name="Lepton">
+    <param type="bool" name="ApplyCoulombCorrection"> false </param>
+
+  </param_set>
+
+
+  <param_set name="BoostedDarkMatter">
+    <!--
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Set the coupling of dark matter to nucleons
+    -->
+    <param type="double" name="ZpCoupling"> 0.1 </param>
+    <param type="double" name="DarkLeftCharge"> 1.0 </param>
+    <param type="double" name="DarkRightCharge"> 1.0 </param>
+    <param type="double" name="DarkScalarCharge"> 1.0 </param>
+    <param type="double" name="UpLeftCharge"> 1.0 </param>
+    <param type="double" name="UpRightCharge"> 1.0 </param>
+    <param type="double" name="DownLeftCharge"> 1.0 </param>
+    <param type="double" name="DownRightCharge"> 1.0 </param>
+    <param type="double" name="StrangeLeftCharge"> 1.0 </param>
+    <param type="double" name="StrangeRightCharge"> 1.0 </param>
+    <param type="double" name="CharmLeftCharge"> 1.0 </param>
+    <param type="double" name="CharmRightCharge"> 1.0 </param>
+    <param type="double" name="ElectronLeftCharge"> 1.0 </param>
+    <param type="double" name="ElectronRightCharge"> 1.0 </param>
+    <param type="double" name="DMEL-Mp"> 1.441 </param>
+    <param type="double" name="DMEL-Mpi"> 0.1349766 </param>
+    <param type="double" name="DMEL-Meta"> 0.547862 </param>
+    <param type="double" name="AxialVectorSpin-u"> 0.827 </param>
+    <param type="double" name="AxialVectorSpin-d"> -0.38 </param>
+    <param type="double" name="AxialVectorSpin-s"> -0.0427 </param>
+  </param_set>
+
+
+  <param_set name="KNO2Pythia">
+    <!--
+
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Invariant mass window for the transition from KNO model to PYTHIA
+    -->
+
+    <param type="double" name="KNO2PYTHIA-Wmin">  2.30 </param>
+    <param type="double" name="KNO2PYTHIA-Wmax">  3.00 </param>
+  </param_set>
+
+  <param_set name="PDG">
+    <!-- when using the PDG table provideed by genie,
+         that are contained in $GENIE/data/evgen/catalogues/pdg
+         this string specifies the file to be used.
+         Please be aware that changing the PDG table might invalidated the selected tune -->
+    <param type="string" name="PDG-TableName"> genie_pdg_table.txt </param>
+  </param_set>
+
+
+
+  <param_set name="Validation">
+    <!--
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	GENIE validity range
+    -->
+    <param type="double" name="GVLD-Emin">    0.010  </param>
+    <param type="double" name="GVLD-Emax"> 1000.000  </param>
+
+  </param_set>
+
+
+
+</common_Param_list>
diff --git a/config/AR23_20l/MECInteractionListGenerator.xml b/config/AR23_20l/MECInteractionListGenerator.xml
new file mode 100644
index 000000000..a6ea945a6
--- /dev/null
+++ b/config/AR23_20l/MECInteractionListGenerator.xml
@@ -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>
+
diff --git a/config/AR23_20l/ModelConfiguration.xml b/config/AR23_20l/ModelConfiguration.xml
new file mode 100644
index 000000000..2b954f349
--- /dev/null
+++ b/config/AR23_20l/ModelConfiguration.xml
@@ -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 <constantinos.andreopoulos \at cern.ch>
+STFC, Rutherford Appleton Laboratory
+***************************************************************************************************
+-->
+
+ <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::HG4BertCascIntranuke/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>
diff --git a/config/AR23_20l/NucDeExcitationSim.xml b/config/AR23_20l/NucDeExcitationSim.xml
new file mode 100644
index 000000000..d9029fd75
--- /dev/null
+++ b/config/AR23_20l/NucDeExcitationSim.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration sets for NucDeExcitationSim EventRecordVisitorI
+
+Configurable Parameters:
+............................................................................................
+Name                    Type     Optional   Comment                     Default
+............................................................................................
+
+-->
+
+  <param_set name="Default"> 
+    <param type="bool" name="DoCarbon"> true </param>
+    <param type="bool" name="DoArgon">  true </param>
+  </param_set>
+
+</alg_conf>
diff --git a/config/AR23_20l/README.md b/config/AR23_20l/README.md
new file mode 100644
index 000000000..e53314ed9
--- /dev/null
+++ b/config/AR23_20l/README.md
@@ -0,0 +1,12 @@
+# Liquid Argon Experiment tune
+
+This configuration is the result of requests from SBN and DUNE collaborations.
+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
+ - 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
diff --git a/config/AR23_20l/TuneGeneratorList.xml b/config/AR23_20l/TuneGeneratorList.xml
new file mode 100644
index 000000000..938e22406
--- /dev/null
+++ b/config/AR23_20l/TuneGeneratorList.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<tune_generator_list>
+
+<!--
+
+This xml files contains the default configuration for the tune
+
+..........................................................................................................................
+NOTE:
+
+The GENIE authors would like to caution users against using anything but a comprehensive 
+GENIE mode (`Default' setting below) for physics studies.
+No detector measures generator-level reaction modes like CCQE or NCRES.
+Detectors measure final states / topologies like {1mu-,0pi}, {1mu-,1pi+}, {0mu-, 1pi0}, 
+{1 track, 1 shower}, {1 mu-like ring} etc depending on granularity, thresholds and PID capabilities.
+No final state / topology is a proxy for any particular reaction mode.
+Intranuclear re-scattering in particular causes significant migration between states
+(see Table 8.1 in the Physics and User manual).
+
+Examples:
+- {1mu-,0pi} is mostly numuCCQE, but can also be caused by numu resonance production followed by pion absorption.
+- numuCCQE gives mostly {1mu-,0pi} but occasionaly can give {1mu-,1pi} if the recoil nucleon re-interacts.
+- NC1pi0 final states can be caused by all a) NC elastic followed by nucleon rescattering, 
+  b) NC resonance neutrino-production, c) NC non-resonance background, d) low-W NC DIS
+  e) NC coherent scattering. Each source contributes differently in the pion momentum distribution.
+
+We also recommend that you treat the generator-level reaction modes largely as as an internal degree of freedom. 
+Consequently, try to define your selection efficiencies and purities in terms of observable final states _only_.
+For example, if you define as `numuCCQE-like' := {1mu-,0pi} then define your selection efficiency
+as:
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true {1mu-,0pi} events)
+and not as: 
+  efficiency = (`numuCCQE-like' events passing cuts) / (all true numuCCQE events)
+
+..........................................................................................................................
+
+
+
+Configurable Parameters:
+..........................................................................................................................
+Name                        Type    Opt  Comment                                               Default
+..........................................................................................................................
+NGenerators                 int     No
+Generator-%d                alg     No
+
+-->
+
+  <param_set name="Default"> 
+     <param type="int" name="NGenerators">   18                                    </param>
+     <param type="alg" name="Generator-0">   genie::EventGenerator/QEL-CC          </param>
+     <param type="alg" name="Generator-1">   genie::EventGenerator/QEL-NC          </param>
+     <param type="alg" name="Generator-2">   genie::EventGenerator/RES-CC          </param>
+     <param type="alg" name="Generator-3">   genie::EventGenerator/RES-NC          </param>
+     <param type="alg" name="Generator-4">   genie::EventGenerator/DIS-CC          </param>
+     <param type="alg" name="Generator-5">   genie::EventGenerator/DIS-NC          </param>
+     <param type="alg" name="Generator-6">   genie::EventGenerator/COH-CC-PION          </param>
+     <param type="alg" name="Generator-7">   genie::EventGenerator/COH-NC-PION          </param>
+     <param type="alg" name="Generator-8">   genie::EventGenerator/DIS-CC-CHARM    </param>
+     <param type="alg" name="Generator-9">   genie::EventGenerator/QEL-CC-CHARM    </param>
+     <param type="alg" name="Generator-10">  genie::EventGenerator/NUE-EL          </param>
+     <param type="alg" name="Generator-11">  genie::EventGenerator/IMD             </param>
+     <param type="alg" name="Generator-12">  genie::EventGenerator/IMD-ANH         </param>
+     <param type="alg" name="Generator-13">  genie::EventGenerator/DFR-CC          </param>
+     <param type="alg" name="Generator-14">  genie::EventGenerator/DFR-NC          </param>
+     <param type="alg" name="Generator-15">  genie::EventGenerator/QEL-CC-LAMBDA   </param>
+     <param type="alg" name="Generator-16">  genie::EventGenerator/MEC-CC          </param>
+     <param type="alg" name="Generator-17">  genie::EventGenerator/MEC-NC          </param>
+  </param_set>
+
+</tune_generator_list>
+

From 48c15ce516ccb5670b2718ce13ce1a8b2611b296 Mon Sep 17 00:00:00 2001
From: Richard Diurba <rdiurba@dunegpvm07.fnal.gov>
Date: Tue, 17 Oct 2023 15:34:39 -0500
Subject: [PATCH 2/2] Reverted changes to cleaning up CommonParam.xml in AR23

---
 config/AR23_20i/CommonParam.xml | 44 ++++++---------------------------
 config/AR23_20j/CommonParam.xml | 44 ++++++---------------------------
 config/AR23_20k/CommonParam.xml | 44 ++++++---------------------------
 config/AR23_20l/CommonParam.xml | 44 ++++++---------------------------
 4 files changed, 32 insertions(+), 144 deletions(-)

diff --git a/config/AR23_20i/CommonParam.xml b/config/AR23_20i/CommonParam.xml
index ad5f46618..e0a74f912 100644
--- a/config/AR23_20i/CommonParam.xml
+++ b/config/AR23_20i/CommonParam.xml
@@ -98,19 +98,26 @@ University of Liverpool
     <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
-
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000  </param>
   </param_set>
 
 
@@ -150,41 +157,6 @@ University of Liverpool
   </param_set>
 
 
-  <!--
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      INTRANUKE-specific parameters:
-      - Mode options are: hA, hN
-      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
-      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
-
-Probably these should all be moved in the local configurations
-  -->
-
-  <param_set name="INUKE">
-    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
-    <param type="double" name="INUKE-HadStep">           0.05  </param>
-    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
-    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
-    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
-    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
-    <param type="double" name="INUKE-FermiFac">          1.0   </param>
-    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
-    <param type="bool"   name="INUKE-DoFermi">           true  </param>
-    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
-    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
-  </param_set>
-
-  <param_set name="HAINUKE">
-    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
-    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
-  </param_set>
-
-  <param_set name="HNINUKE">
-    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
-    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
-    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
-  </param_set>
-
   <param_set name="Coherent">
 
     <param type="double" name="COH-Ro"> 1.000 </param>
diff --git a/config/AR23_20j/CommonParam.xml b/config/AR23_20j/CommonParam.xml
index ad5f46618..e0a74f912 100644
--- a/config/AR23_20j/CommonParam.xml
+++ b/config/AR23_20j/CommonParam.xml
@@ -98,19 +98,26 @@ University of Liverpool
     <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
-
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000  </param>
   </param_set>
 
 
@@ -150,41 +157,6 @@ University of Liverpool
   </param_set>
 
 
-  <!--
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      INTRANUKE-specific parameters:
-      - Mode options are: hA, hN
-      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
-      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
-
-Probably these should all be moved in the local configurations
-  -->
-
-  <param_set name="INUKE">
-    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
-    <param type="double" name="INUKE-HadStep">           0.05  </param>
-    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
-    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
-    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
-    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
-    <param type="double" name="INUKE-FermiFac">          1.0   </param>
-    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
-    <param type="bool"   name="INUKE-DoFermi">           true  </param>
-    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
-    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
-  </param_set>
-
-  <param_set name="HAINUKE">
-    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
-    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
-  </param_set>
-
-  <param_set name="HNINUKE">
-    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
-    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
-    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
-  </param_set>
-
   <param_set name="Coherent">
 
     <param type="double" name="COH-Ro"> 1.000 </param>
diff --git a/config/AR23_20k/CommonParam.xml b/config/AR23_20k/CommonParam.xml
index ad5f46618..e0a74f912 100644
--- a/config/AR23_20k/CommonParam.xml
+++ b/config/AR23_20k/CommonParam.xml
@@ -98,19 +98,26 @@ University of Liverpool
     <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
-
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000  </param>
   </param_set>
 
 
@@ -150,41 +157,6 @@ University of Liverpool
   </param_set>
 
 
-  <!--
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      INTRANUKE-specific parameters:
-      - Mode options are: hA, hN
-      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
-      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
-
-Probably these should all be moved in the local configurations
-  -->
-
-  <param_set name="INUKE">
-    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
-    <param type="double" name="INUKE-HadStep">           0.05  </param>
-    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
-    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
-    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
-    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
-    <param type="double" name="INUKE-FermiFac">          1.0   </param>
-    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
-    <param type="bool"   name="INUKE-DoFermi">           true  </param>
-    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
-    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
-  </param_set>
-
-  <param_set name="HAINUKE">
-    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
-    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
-  </param_set>
-
-  <param_set name="HNINUKE">
-    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
-    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
-    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
-  </param_set>
-
   <param_set name="Coherent">
 
     <param type="double" name="COH-Ro"> 1.000 </param>
diff --git a/config/AR23_20l/CommonParam.xml b/config/AR23_20l/CommonParam.xml
index ad5f46618..e0a74f912 100644
--- a/config/AR23_20l/CommonParam.xml
+++ b/config/AR23_20l/CommonParam.xml
@@ -98,19 +98,26 @@ University of Liverpool
     <param type="double" name="DIS-HMultWgt-vp-CC-m3">  0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m2">  0.100  </param>
     <param type="double" name="DIS-HMultWgt-vp-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m2">  0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vp-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m2">  0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vn-CC-m3">  2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m2">  0.300  </param>
     <param type="double" name="DIS-HMultWgt-vn-NC-m3">  1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m2">  0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vn-EM-m3">  1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m2"> 0.030802 </param>
     <param type="double" name="DIS-HMultWgt-vbp-CC-m3"> 2.338338 </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m2"> 0.300  </param>
     <param type="double" name="DIS-HMultWgt-vbp-NC-m3"> 1.000  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m2"> 0.300  </param>
+    <param type="double" name="DIS-HMultWgt-vbp-EM-m3"> 1.000  </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m2"> 0.008 </param>
     <param type="double" name="DIS-HMultWgt-vbn-CC-m3"> 0.943153 </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m2"> 0.100  </param>
     <param type="double" name="DIS-HMultWgt-vbn-NC-m3"> 1.000  </param>
-
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m2"> 0.100  </param>
+    <param type="double" name="DIS-HMultWgt-vbn-EM-m3"> 1.000  </param>
   </param_set>
 
 
@@ -150,41 +157,6 @@ University of Liverpool
   </param_set>
 
 
-  <!--
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      INTRANUKE-specific parameters:
-      - Mode options are: hA, hN
-      - NucRemovalE is the binding E to subtract from cascade nucleons (in GeV)
-      - typical values for pion, nucleon DelR are 0.5, 0.7 (hA) and 0.2, 0.2 (hN)
-
-Probably these should all be moved in the local configurations
-  -->
-
-  <param_set name="INUKE">
-    <param type="double" name="INUKE-NucRemovalE">       0.00  </param>
-    <param type="double" name="INUKE-HadStep">           0.05  </param>
-    <param type="double" name="INUKE-NucAbsFac">         1.0   </param>
-    <param type="double" name="INUKE-NucQEFac">          1.0   </param>
-    <param type="double" name="INUKE-NucCEXFac">         1.0   </param>
-    <param type="double" name="INUKE-Energy_Pre_Eq">     0.041 </param>
-    <param type="double" name="INUKE-FermiFac">          1.0   </param>
-    <param type="double" name="INUKE-FermiMomentum">     0.250 </param>
-    <param type="bool"   name="INUKE-DoFermi">           true  </param>
-    <param type="bool"   name="INUKE-DoCompoundNucleus"> true  </param>
-    <param type="bool"   name="INUKE-XsecNNCorr">        true  </param>
-  </param_set>
-
-  <param_set name="HAINUKE">
-    <param type="double" name="HAINUKE-DelRPion">        0.5   </param>
-    <param type="double" name="HAINUKE-DelRNucleon">     0.7   </param>
-  </param_set>
-
-  <param_set name="HNINUKE">
-    <param type="double" name="HNINUKE-DelRPion">        0.0   </param>
-    <param type="double" name="HNINUKE-DelRNucleon">     0.0   </param>
-    <param type="bool"   name="HNINUKE-UseOset">         true  </param>
-  </param_set>
-
   <param_set name="Coherent">
 
     <param type="double" name="COH-Ro"> 1.000 </param>