diff --git a/Makefile b/Makefile
index 74aa717b6..0477f544e 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,8 @@ physics-neutrino-scattering-modes: FORCE
cd ${GENIE}/src/Physics/DeepInelastic/EventGen && $(MAKE) && \
cd ${GENIE}/src/Physics/Diffractive/XSection && $(MAKE) && \
cd ${GENIE}/src/Physics/Diffractive/EventGen && $(MAKE) && \
- cd ${GENIE}/src/Physics/GlashowResonance/XSection && $(MAKE) && \
- cd ${GENIE}/src/Physics/GlashowResonance/EventGen && $(MAKE) && \
+ cd ${GENIE}/src/Physics/HELepton/XSection && $(MAKE) && \
+ cd ${GENIE}/src/Physics/HELepton/EventGen && $(MAKE) && \
cd ${GENIE}/src/Physics/InverseBetaDecay/XSection && $(MAKE) && \
cd ${GENIE}/src/Physics/InverseBetaDecay/EventGen && $(MAKE) && \
cd ${GENIE}/src/Physics/Multinucleon/XSection && $(MAKE) && \
@@ -393,9 +393,9 @@ endif
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/Diffractive
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/Diffractive/XSection
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/Diffractive/EventGen
- mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/GlashowResonance
- mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/GlashowResonance/XSection
- mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/GlashowResonance/EventGen
+ mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/HELepton
+ mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/HELepton/XSection
+ mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/HELepton/EventGen
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/Hadronization
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/HadronTensors
mkdir ${GENIE_INC_INSTALLATION_PATH}/Physics/HadronTransport
@@ -465,8 +465,8 @@ copy-install-files: FORCE
cd ${GENIE}/src/Physics/DeepInelastic/EventGen && $(MAKE) install && \
cd ${GENIE}/src/Physics/Diffractive/XSection && $(MAKE) install && \
cd ${GENIE}/src/Physics/Diffractive/EventGen && $(MAKE) install && \
- cd ${GENIE}/src/Physics/GlashowResonance/XSection && $(MAKE) install && \
- cd ${GENIE}/src/Physics/GlashowResonance/EventGen && $(MAKE) install && \
+ cd ${GENIE}/src/Physics/HELepton/XSection && $(MAKE) install && \
+ cd ${GENIE}/src/Physics/HELepton/EventGen && $(MAKE) install && \
cd ${GENIE}/src/Physics/Hadronization && $(MAKE) install && \
cd ${GENIE}/src/Physics/HadronTransport && $(MAKE) install && \
cd ${GENIE}/src/Physics/HadronTensors && $(MAKE) install && \
@@ -527,8 +527,8 @@ purge: FORCE
cd ${GENIE}/src/Physics/DeepInelastic/EventGen && $(MAKE) purge && \
cd ${GENIE}/src/Physics/Diffractive/XSection && $(MAKE) purge && \
cd ${GENIE}/src/Physics/Diffractive/EventGen && $(MAKE) purge && \
- cd ${GENIE}/src/Physics/GlashowResonance/XSection && $(MAKE) purge && \
- cd ${GENIE}/src/Physics/GlashowResonance/EventGen && $(MAKE) purge && \
+ cd ${GENIE}/src/Physics/HELepton/XSection && $(MAKE) purge && \
+ cd ${GENIE}/src/Physics/HELepton/EventGen && $(MAKE) purge && \
cd ${GENIE}/src/Physics/Hadronization && $(MAKE) purge && \
cd ${GENIE}/src/Physics/HadronTensors && $(MAKE) purge && \
cd ${GENIE}/src/Physics/HadronTransport && $(MAKE) purge && \
@@ -590,8 +590,8 @@ clean-files: FORCE
cd ${GENIE}/src/Physics/DeepInelastic/EventGen && $(MAKE) clean && \
cd ${GENIE}/src/Physics/Diffractive/XSection && $(MAKE) clean && \
cd ${GENIE}/src/Physics/Diffractive/EventGen && $(MAKE) clean && \
- cd ${GENIE}/src/Physics/GlashowResonance/XSection && $(MAKE) clean && \
- cd ${GENIE}/src/Physics/GlashowResonance/EventGen && $(MAKE) clean && \
+ cd ${GENIE}/src/Physics/HELepton/XSection && $(MAKE) clean && \
+ cd ${GENIE}/src/Physics/HELepton/EventGen && $(MAKE) clean && \
cd ${GENIE}/src/Physics/Hadronization && $(MAKE) clean && \
cd ${GENIE}/src/Physics/HadronTensors && $(MAKE) clean && \
cd ${GENIE}/src/Physics/HadronTransport && $(MAKE) clean && \
@@ -678,8 +678,8 @@ endif
cd ${GENIE}/src/Physics/DeepInelastic/EventGen && $(MAKE) distclean && \
cd ${GENIE}/src/Physics/Diffractive/XSection && $(MAKE) distclean && \
cd ${GENIE}/src/Physics/Diffractive/EventGen && $(MAKE) distclean && \
- cd ${GENIE}/src/Physics/GlashowResonance/XSection && $(MAKE) distclean && \
- cd ${GENIE}/src/Physics/GlashowResonance/EventGen && $(MAKE) distclean && \
+ cd ${GENIE}/src/Physics/HELepton/XSection && $(MAKE) distclean && \
+ cd ${GENIE}/src/Physics/HELepton/EventGen && $(MAKE) distclean && \
cd ${GENIE}/src/Physics/Hadronization && $(MAKE) distclean && \
cd ${GENIE}/src/Physics/HadronTransport && $(MAKE) distclean && \
cd ${GENIE}/src/Physics/HadronTensors && $(MAKE) distclean && \
diff --git a/config/EventGenerator.xml b/config/EventGenerator.xml
index 8f99389c2..5fe64420a 100644
--- a/config/EventGenerator.xml
+++ b/config/EventGenerator.xml
@@ -687,7 +687,7 @@ XSecModel alg Yes Cross section model used at the thread
5
genie::InitialStateAppender/Default
genie::VertexGenerator/Default
- genie::HEDISKinematicsGenerator/Default
+ genie::HEDISKinematicsGenerator/Default
genie::HEDISGenerator/Default
genie::UnstableParticleDecayer/BeforeHadronTransport
genie::HEDISInteractionListGenerator/CC-Default
@@ -698,7 +698,7 @@ XSecModel alg Yes Cross section model used at the thread
5
genie::InitialStateAppender/Default
genie::VertexGenerator/Default
- genie::HEDISKinematicsGenerator/Default
+ genie::HEDISKinematicsGenerator/Default
genie::HEDISGenerator/Default
genie::UnstableParticleDecayer/BeforeHadronTransport
genie::HEDISInteractionListGenerator/NC-Default
@@ -706,47 +706,125 @@ XSecModel alg Yes Cross section model used at the thread
- 5
- genie::InitialStateAppender/Default
- genie::VertexGenerator/Default
- genie::GLRESKinematicsGenerator/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/BeforeHadronTransport
- genie::GLRESInteractionListGenerator/Mu-Default
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::GLRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/GLRES-Mu-Default
- 5
- genie::InitialStateAppender/Default
- genie::VertexGenerator/Default
- genie::GLRESKinematicsGenerator/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/BeforeHadronTransport
- genie::GLRESInteractionListGenerator/Tau-Default
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::GLRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/GLRES-Tau-Default
- 5
- genie::InitialStateAppender/Default
- genie::VertexGenerator/Default
- genie::GLRESKinematicsGenerator/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/BeforeHadronTransport
- genie::GLRESInteractionListGenerator/Ele-Default
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::GLRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/GLRES-Ele-Default
- 5
- genie::InitialStateAppender/Default
- genie::VertexGenerator/Default
- genie::GLRESKinematicsGenerator/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/BeforeHadronTransport
- genie::GLRESInteractionListGenerator/Had-Default
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::GLRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/GLRES-Had-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::HENuElGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/HENuEl-CC-Default
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::HENuElGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/HENuEl-NC-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::PhotonRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/PhotonRES-Mu-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::PhotonRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/PhotonRES-Ele-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::PhotonRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/PhotonRES-Tau-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::PhotonRESGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/PhotonRES-Had-Default
+
+
+
+
+ 5
+ genie::InitialStateAppender/Default
+ genie::VertexGenerator/Default
+ genie::HELeptonKinematicsGenerator/Default
+ genie::PhotonCOHGenerator/Default
+ genie::UnstableParticleDecayer/BeforeHadronTransport
+ genie::HELeptonInteractionListGenerator/PhotonCOH-Default
+
+
diff --git a/config/EventGeneratorListAssembler.xml b/config/EventGeneratorListAssembler.xml
index 25e39e350..b4f101090 100644
--- a/config/EventGeneratorListAssembler.xml
+++ b/config/EventGeneratorListAssembler.xml
@@ -57,45 +57,6 @@ Generator-%d alg No
genie::EventGenerator/CEvNS
-
- 7
- genie::EventGenerator/GLRES-Mu
- genie::EventGenerator/GLRES-Tau
- genie::EventGenerator/GLRES-Ele
- genie::EventGenerator/GLRES-Had
- genie::EventGenerator/DIS-CC
- genie::EventGenerator/DIS-NC
- genie::EventGenerator/DIS-CC-CHARM
-
-
-
- 4
- genie::EventGenerator/GLRES-Mu
- genie::EventGenerator/GLRES-Tau
- genie::EventGenerator/GLRES-Ele
- genie::EventGenerator/GLRES-Had
-
-
-
- 1
- genie::EventGenerator/GLRES-Mu
-
-
-
- 1
- genie::EventGenerator/GLRES-Tau
-
-
-
- 1
- genie::EventGenerator/GLRES-Ele
-
-
-
- 1
- genie::EventGenerator/GLRES-Had
-
-
2
genie::EventGenerator/DFR-CC
@@ -455,7 +416,39 @@ Generator-%d alg No
-
+
+
+
+ 13
+ genie::EventGenerator/HEDIS-CC
+ genie::EventGenerator/HEDIS-NC
+ genie::EventGenerator/GLRES-Mu
+ genie::EventGenerator/GLRES-Tau
+ genie::EventGenerator/GLRES-Ele
+ genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
+
+
+
+ 11
+ genie::EventGenerator/GLRES-Mu
+ genie::EventGenerator/GLRES-Tau
+ genie::EventGenerator/GLRES-Ele
+ genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
+
6
@@ -492,5 +485,82 @@ Generator-%d alg No
genie::EventGenerator/HEDIS-NC
+
+ 4
+ genie::EventGenerator/GLRES-Mu
+ genie::EventGenerator/GLRES-Tau
+ genie::EventGenerator/GLRES-Ele
+ genie::EventGenerator/GLRES-Had
+
+
+
+ 1
+ genie::EventGenerator/GLRES-Mu
+
+
+
+ 1
+ genie::EventGenerator/GLRES-Tau
+
+
+
+ 1
+ genie::EventGenerator/GLRES-Ele
+
+
+
+ 1
+ genie::EventGenerator/GLRES-Had
+
+
+
+ 2
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+
+
+
+ 1
+ genie::EventGenerator/HENuEl-CC
+
+
+
+ 1
+ genie::EventGenerator/HENuEl-NC
+
+
+
+ 4
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Had
+
+
+
+ 1
+ genie::EventGenerator/PhotonRES-Mu
+
+
+
+ 1
+ genie::EventGenerator/PhotonRES-Tau
+
+
+
+ 1
+ genie::EventGenerator/PhotonRES-Ele
+
+
+
+ 1
+ genie::EventGenerator/PhotonRES-Had
+
+
+
+ 1
+ genie::EventGenerator/PhotonCOH
+
+
diff --git a/config/G00_00a/EventGenerator.xml b/config/G00_00a/EventGenerator.xml
index 6f0a5af21..2d873f1ad 100644
--- a/config/G00_00a/EventGenerator.xml
+++ b/config/G00_00a/EventGenerator.xml
@@ -345,15 +345,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/G00_00a/ModelConfiguration.xml b/config/G00_00a/ModelConfiguration.xml
index 5aafbaeba..106bca2db 100644
--- a/config/G00_00a/ModelConfiguration.xml
+++ b/config/G00_00a/ModelConfiguration.xml
@@ -131,7 +131,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G00_00b/EventGenerator.xml b/config/G00_00b/EventGenerator.xml
index ffdf7e6f5..4baf4d531 100644
--- a/config/G00_00b/EventGenerator.xml
+++ b/config/G00_00b/EventGenerator.xml
@@ -345,15 +345,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/G00_00b/ModelConfiguration.xml b/config/G00_00b/ModelConfiguration.xml
index 74c015019..d11e03e9b 100644
--- a/config/G00_00b/ModelConfiguration.xml
+++ b/config/G00_00b/ModelConfiguration.xml
@@ -137,7 +137,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G00_00z/EventGenerator.xml b/config/G00_00z/EventGenerator.xml
index 585823ae5..56f1d07f1 100644
--- a/config/G00_00z/EventGenerator.xml
+++ b/config/G00_00z/EventGenerator.xml
@@ -345,15 +345,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/G00_00z/ModelConfiguration.xml b/config/G00_00z/ModelConfiguration.xml
index b7fbcd64e..6be7ec112 100644
--- a/config/G00_00z/ModelConfiguration.xml
+++ b/config/G00_00z/ModelConfiguration.xml
@@ -140,7 +140,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_01a/ModelConfiguration.xml b/config/G18_01a/ModelConfiguration.xml
index 5cafa550e..732c724bf 100644
--- a/config/G18_01a/ModelConfiguration.xml
+++ b/config/G18_01a/ModelConfiguration.xml
@@ -131,7 +131,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_01b/ModelConfiguration.xml b/config/G18_01b/ModelConfiguration.xml
index 0f6632dc9..6bbc38648 100644
--- a/config/G18_01b/ModelConfiguration.xml
+++ b/config/G18_01b/ModelConfiguration.xml
@@ -131,7 +131,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_02a/ModelConfiguration.xml b/config/G18_02a/ModelConfiguration.xml
index 996865804..c77a4c844 100644
--- a/config/G18_02a/ModelConfiguration.xml
+++ b/config/G18_02a/ModelConfiguration.xml
@@ -134,7 +134,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_02b/ModelConfiguration.xml b/config/G18_02b/ModelConfiguration.xml
index 1d98d4303..113ab225c 100644
--- a/config/G18_02b/ModelConfiguration.xml
+++ b/config/G18_02b/ModelConfiguration.xml
@@ -134,7 +134,6 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_10a/ModelConfiguration.xml b/config/G18_10a/ModelConfiguration.xml
index bf310de04..95c99abbf 100644
--- a/config/G18_10a/ModelConfiguration.xml
+++ b/config/G18_10a/ModelConfiguration.xml
@@ -135,8 +135,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
-
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_10b/ModelConfiguration.xml b/config/G18_10b/ModelConfiguration.xml
index bfddc32af..3c4d400a6 100644
--- a/config/G18_10b/ModelConfiguration.xml
+++ b/config/G18_10b/ModelConfiguration.xml
@@ -136,8 +136,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
-
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_10i/ModelConfiguration.xml b/config/G18_10i/ModelConfiguration.xml
index 68697e587..5e91814f9 100644
--- a/config/G18_10i/ModelConfiguration.xml
+++ b/config/G18_10i/ModelConfiguration.xml
@@ -136,8 +136,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
-
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G18_10j/ModelConfiguration.xml b/config/G18_10j/ModelConfiguration.xml
index afe5729bb..217c1e4da 100644
--- a/config/G18_10j/ModelConfiguration.xml
+++ b/config/G18_10j/ModelConfiguration.xml
@@ -137,7 +137,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G21_11a/EventGenerator.xml b/config/G21_11a/EventGenerator.xml
index 3d8152dcc..ae179f857 100644
--- a/config/G21_11a/EventGenerator.xml
+++ b/config/G21_11a/EventGenerator.xml
@@ -426,15 +426,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/G21_11a/ModelConfiguration.xml b/config/G21_11a/ModelConfiguration.xml
index 3a9df23d0..b92594217 100644
--- a/config/G21_11a/ModelConfiguration.xml
+++ b/config/G21_11a/ModelConfiguration.xml
@@ -95,7 +95,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::SuSAv2MECPXSec/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/G21_11b/EventGenerator.xml b/config/G21_11b/EventGenerator.xml
index 3d8152dcc..ae179f857 100644
--- a/config/G21_11b/EventGenerator.xml
+++ b/config/G21_11b/EventGenerator.xml
@@ -426,15 +426,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/G21_11b/ModelConfiguration.xml b/config/G21_11b/ModelConfiguration.xml
index 6e5656ddc..eba4f6b8d 100644
--- a/config/G21_11b/ModelConfiguration.xml
+++ b/config/G21_11b/ModelConfiguration.xml
@@ -95,7 +95,6 @@ STFC, Rutherford Appleton Laboratory
genie::EmpiricalMECPXSec2015/Default
genie::SuSAv2MECPXSec/Default
- genie::GLRESPXSec/Default
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/GDM18_00a/ModelConfiguration.xml b/config/GDM18_00a/ModelConfiguration.xml
index 34a6b45be..5e303b804 100644
--- a/config/GDM18_00a/ModelConfiguration.xml
+++ b/config/GDM18_00a/ModelConfiguration.xml
@@ -131,7 +131,7 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
+
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/GDM18_00b/ModelConfiguration.xml b/config/GDM18_00b/ModelConfiguration.xml
index 947ea4060..cf54a261d 100644
--- a/config/GDM18_00b/ModelConfiguration.xml
+++ b/config/GDM18_00b/ModelConfiguration.xml
@@ -131,7 +131,7 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
+
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/GEM21_11a/EventGenerator.xml b/config/GEM21_11a/EventGenerator.xml
index 3d8152dcc..ae179f857 100644
--- a/config/GEM21_11a/EventGenerator.xml
+++ b/config/GEM21_11a/EventGenerator.xml
@@ -426,15 +426,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/GEM21_11b/EventGenerator.xml b/config/GEM21_11b/EventGenerator.xml
index 3d8152dcc..ae179f857 100644
--- a/config/GEM21_11b/EventGenerator.xml
+++ b/config/GEM21_11b/EventGenerator.xml
@@ -426,15 +426,6 @@ XSecModel alg Yes Cross section model used at the thread
genie::AMNuGammaInteractionListGenerator/Default
-
-
- 3
- genie::InitialStateAppender/Default
- genie::GLRESGenerator/Default
- genie::UnstableParticleDecayer/AfterHadronTransport
- genie::GLRESInteractionListGenerator/Default
-
-
5
diff --git a/config/GHE19_00a/CommonDecay.xml b/config/GHE19_00a/CommonDecay.xml
index 7969bfcc6..d76b12158 100644
--- a/config/GHE19_00a/CommonDecay.xml
+++ b/config/GHE19_00a/CommonDecay.xml
@@ -74,6 +74,7 @@ University of Liverpool
false
false
false
+ false
diff --git a/config/GHE19_00a/ModelConfiguration.xml b/config/GHE19_00a/ModelConfiguration.xml
index 57c2f2859..337467736 100644
--- a/config/GHE19_00a/ModelConfiguration.xml
+++ b/config/GHE19_00a/ModelConfiguration.xml
@@ -26,6 +26,13 @@ STFC, Rutherford Appleton Laboratory
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonCOHPXSec/Default
genie::HEDISPXSec/Default
genie::HEDISPXSec/Default
diff --git a/config/GHE19_00a/TuneGeneratorList.xml b/config/GHE19_00a/TuneGeneratorList.xml
index d3b0947d3..cd8e39f64 100644
--- a/config/GHE19_00a/TuneGeneratorList.xml
+++ b/config/GHE19_00a/TuneGeneratorList.xml
@@ -47,13 +47,20 @@ Generator-%d alg No
-->
- 6
+ 13
genie::EventGenerator/HEDIS-CC
genie::EventGenerator/HEDIS-NC
genie::EventGenerator/GLRES-Mu
genie::EventGenerator/GLRES-Tau
genie::EventGenerator/GLRES-Ele
genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
diff --git a/config/GHE19_00b/CommonDecay.xml b/config/GHE19_00b/CommonDecay.xml
index 7969bfcc6..d76b12158 100644
--- a/config/GHE19_00b/CommonDecay.xml
+++ b/config/GHE19_00b/CommonDecay.xml
@@ -74,6 +74,7 @@ University of Liverpool
false
false
false
+ false
diff --git a/config/GHE19_00b/CommonParam.xml b/config/GHE19_00b/CommonParam.xml
index 13d82841b..1815315f7 100644
--- a/config/GHE19_00b/CommonParam.xml
+++ b/config/GHE19_00b/CommonParam.xml
@@ -14,7 +14,7 @@
1
400
400
- 1e-6
+ 1e-8
1.
1e9
80.398
diff --git a/config/GHE19_00b/ModelConfiguration.xml b/config/GHE19_00b/ModelConfiguration.xml
index 57c2f2859..337467736 100644
--- a/config/GHE19_00b/ModelConfiguration.xml
+++ b/config/GHE19_00b/ModelConfiguration.xml
@@ -26,6 +26,13 @@ STFC, Rutherford Appleton Laboratory
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonCOHPXSec/Default
genie::HEDISPXSec/Default
genie::HEDISPXSec/Default
diff --git a/config/GHE19_00b/TuneGeneratorList.xml b/config/GHE19_00b/TuneGeneratorList.xml
index d3b0947d3..cd8e39f64 100644
--- a/config/GHE19_00b/TuneGeneratorList.xml
+++ b/config/GHE19_00b/TuneGeneratorList.xml
@@ -47,13 +47,20 @@ Generator-%d alg No
-->
- 6
+ 13
genie::EventGenerator/HEDIS-CC
genie::EventGenerator/HEDIS-NC
genie::EventGenerator/GLRES-Mu
genie::EventGenerator/GLRES-Tau
genie::EventGenerator/GLRES-Ele
genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
diff --git a/config/GHE19_00c/CommonDecay.xml b/config/GHE19_00c/CommonDecay.xml
index 7969bfcc6..d76b12158 100644
--- a/config/GHE19_00c/CommonDecay.xml
+++ b/config/GHE19_00c/CommonDecay.xml
@@ -74,6 +74,7 @@ University of Liverpool
false
false
false
+ false
diff --git a/config/GHE19_00c/ModelConfiguration.xml b/config/GHE19_00c/ModelConfiguration.xml
index 57c2f2859..337467736 100644
--- a/config/GHE19_00c/ModelConfiguration.xml
+++ b/config/GHE19_00c/ModelConfiguration.xml
@@ -26,6 +26,13 @@ STFC, Rutherford Appleton Laboratory
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
genie::GLRESPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonCOHPXSec/Default
genie::HEDISPXSec/Default
genie::HEDISPXSec/Default
diff --git a/config/GHE19_00c/TuneGeneratorList.xml b/config/GHE19_00c/TuneGeneratorList.xml
index d3b0947d3..cd8e39f64 100644
--- a/config/GHE19_00c/TuneGeneratorList.xml
+++ b/config/GHE19_00c/TuneGeneratorList.xml
@@ -47,13 +47,20 @@ Generator-%d alg No
-->
- 6
+ 13
genie::EventGenerator/HEDIS-CC
genie::EventGenerator/HEDIS-NC
genie::EventGenerator/GLRES-Mu
genie::EventGenerator/GLRES-Tau
genie::EventGenerator/GLRES-Ele
genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
diff --git a/config/GHE19_00d/CommonDecay.xml b/config/GHE19_00d/CommonDecay.xml
new file mode 100644
index 000000000..d76b12158
--- /dev/null
+++ b/config/GHE19_00d/CommonDecay.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ true
+
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
diff --git a/config/GHE19_00d/CommonParam.xml b/config/GHE19_00d/CommonParam.xml
new file mode 100644
index 000000000..e1567d87b
--- /dev/null
+++ b/config/GHE19_00d/CommonParam.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+ NNPDF31sx_nlo_as_0118_LHCb_nf_6
+ 0
+ true
+ GGHR
+ 2
+ 400
+ 400
+ 1e-9
+ 2.6896
+ 1e10
+ 80.385
+ 91.1876
+ 0.00940161
+ 0.
+ 0.97427
+ 0.22536
+ 0.00355
+ 0.22522
+ 0.97343
+ 0.04140
+ 0.00886
+ 0.04050
+ 0.99914
+
+
+
+ 2.
+ 100000
+ 100000
+ 1
+
+
+
+ 1.4
+
+
+
+ 100.000
+ 1000000000000.000
+
+
+
diff --git a/config/GHE19_00d/ModelConfiguration.xml b/config/GHE19_00d/ModelConfiguration.xml
new file mode 100644
index 000000000..337467736
--- /dev/null
+++ b/config/GHE19_00d/ModelConfiguration.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+ genie::GLRESPXSec/Default
+ genie::GLRESPXSec/Default
+ genie::GLRESPXSec/Default
+ genie::GLRESPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::HENuElPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonRESPXSec/Default
+ genie::PhotonCOHPXSec/Default
+ genie::HEDISPXSec/Default
+ genie::HEDISPXSec/Default
+
+
+
+
+
diff --git a/config/GHE19_00d/TuneGeneratorList.xml b/config/GHE19_00d/TuneGeneratorList.xml
new file mode 100644
index 000000000..cd8e39f64
--- /dev/null
+++ b/config/GHE19_00d/TuneGeneratorList.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+ 13
+ genie::EventGenerator/HEDIS-CC
+ genie::EventGenerator/HEDIS-NC
+ genie::EventGenerator/GLRES-Mu
+ genie::EventGenerator/GLRES-Tau
+ genie::EventGenerator/GLRES-Ele
+ genie::EventGenerator/GLRES-Had
+ genie::EventGenerator/HENuEl-CC
+ genie::EventGenerator/HENuEl-NC
+ genie::EventGenerator/PhotonRES-Mu
+ genie::EventGenerator/PhotonRES-Ele
+ genie::EventGenerator/PhotonRES-Tau
+ genie::EventGenerator/PhotonRES-Had
+ genie::EventGenerator/PhotonCOH
+
+
+
+
diff --git a/config/GLRESGenerator.xml b/config/GLRESGenerator.xml
index 3065b63f4..225e7a2d0 100644
--- a/config/GLRESGenerator.xml
+++ b/config/GLRESGenerator.xml
@@ -2,6 +2,10 @@
+
+
HEDIS-PYTHIA
diff --git a/config/GLRESInteractionListGenerator.xml b/config/GLRESInteractionListGenerator.xml
deleted file mode 100644
index def1d1ef1..000000000
--- a/config/GLRESInteractionListGenerator.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
- true
-
-
-
- true
-
-
-
- true
-
-
-
- true
-
-
-
-
diff --git a/config/GLRESPXSec.xml b/config/GLRESPXSec.xml
index 6f70498c7..773990665 100644
--- a/config/GLRESPXSec.xml
+++ b/config/GLRESPXSec.xml
@@ -1,12 +1,14 @@
+
+
-
- HEDIS-PYTHIA
- genie::GLRESXSec/Default
+ HEDIS-PYTHIA
+ genie::HELeptonXSec/Default
+
diff --git a/config/GTEST18_02c/ModelConfiguration.xml b/config/GTEST18_02c/ModelConfiguration.xml
index 63fc0024f..6ccae260f 100644
--- a/config/GTEST18_02c/ModelConfiguration.xml
+++ b/config/GTEST18_02c/ModelConfiguration.xml
@@ -134,7 +134,7 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
+
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/GTEST18_02d/ModelConfiguration.xml b/config/GTEST18_02d/ModelConfiguration.xml
index ced0f5192..3d33cced7 100644
--- a/config/GTEST18_02d/ModelConfiguration.xml
+++ b/config/GTEST18_02d/ModelConfiguration.xml
@@ -134,7 +134,7 @@ STFC, Rutherford Appleton Laboratory
-->
genie::EmpiricalMECPXSec2015/Default
genie::EmpiricalMECPXSec2015/Default
- genie::GLRESPXSec/Default
+
genie::DummyPXSec/Default
genie::NNBarOscDummyPXSec/Default
diff --git a/config/HEDISXSec.xml b/config/HEDISXSec.xml
index 4b38784dc..b251edcd6 100644
--- a/config/HEDISXSec.xml
+++ b/config/HEDISXSec.xml
@@ -9,10 +9,8 @@ Configuration for the HEDIS integration algorithm
HEDIS-SF
- adaptive
- 5000000
- 100000
- 0.0001
+ vegas
+ 200000
diff --git a/config/HELeptonInteractionListGenerator.xml b/config/HELeptonInteractionListGenerator.xml
new file mode 100644
index 000000000..2a6a648eb
--- /dev/null
+++ b/config/HELeptonInteractionListGenerator.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+ true
+
+
+
+
diff --git a/config/GLRESKinematicsGenerator.xml b/config/HELeptonKinematicsGenerator.xml
similarity index 64%
rename from config/GLRESKinematicsGenerator.xml
rename to config/HELeptonKinematicsGenerator.xml
index 9c6275cf0..6d29106e4 100644
--- a/config/GLRESKinematicsGenerator.xml
+++ b/config/HELeptonKinematicsGenerator.xml
@@ -3,7 +3,7 @@
1.05
+ 0.000001
+ 0.1
+ 1.0
diff --git a/config/GLRESXSec.xml b/config/HELeptonXSec.xml
similarity index 60%
rename from config/GLRESXSec.xml
rename to config/HELeptonXSec.xml
index 5f7c2018a..5d07d0159 100644
--- a/config/GLRESXSec.xml
+++ b/config/HELeptonXSec.xml
@@ -3,20 +3,17 @@
- adaptive
- 40000
- 0.001
+ vegas
+ 500000
diff --git a/config/HENuElGenerator.xml b/config/HENuElGenerator.xml
new file mode 100644
index 000000000..7801edb13
--- /dev/null
+++ b/config/HENuElGenerator.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/HENuElPXSec.xml b/config/HENuElPXSec.xml
new file mode 100644
index 000000000..e3a2c7afa
--- /dev/null
+++ b/config/HENuElPXSec.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ HEDIS-PYTHIA
+ genie::HELeptonXSec/Default
+
+
+
diff --git a/config/Messenger.xml b/config/Messenger.xml
index 42b898f6b..95a3e472b 100644
--- a/config/Messenger.xml
+++ b/config/Messenger.xml
@@ -93,7 +93,7 @@
NOTICE
WARN
NOTICE
- NOTICE
+ WARN
NOTICE
INFO
INFO
@@ -111,7 +111,7 @@
NOTICE
NOTICE
WARN
- NOTICE
+ WARN
NOTICE
NOTICE
WARN
@@ -151,7 +151,7 @@
NOTICE
WARN
NOTICE
- NOTICE
+ WARN
INFO
NOTICE
INFO
@@ -164,12 +164,12 @@
NOTICE
NOTICE
INFO
- NOTICE
- NOTICE
+ WARN
+ WARN
WARN
WARN
WARN
- INFO
+ WARN
NOTICE
WARN
NOTICE
@@ -204,19 +204,26 @@
WARN
NOTICE
NOTICE
- NOTICE
+ WARN
NOTICE
- WARN
+ WARN
+ WARN
WARN
WARN
- WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
WARN
WARN
WARN
WARN
+ WARN
ERROR
- NOTICE
+ WARN
NOTICE
NOTICE
NOTICE
@@ -227,8 +234,11 @@
NOTICE
INFO
INFO
- INFO
+ WARN
INFO
INFO
+ INFO
+ INFO
+ INFO
diff --git a/config/Messenger_inuke_verbose.xml b/config/Messenger_inuke_verbose.xml
index 4e741b006..c131b2c2d 100644
--- a/config/Messenger_inuke_verbose.xml
+++ b/config/Messenger_inuke_verbose.xml
@@ -180,6 +180,22 @@
NOTICE
NOTICE
NOTICE
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ ERROR
NOTICE
NOTICE
@@ -193,5 +209,8 @@
INFO
INFO
INFO
+ INFO
+ INFO
+ INFO
diff --git a/config/Messenger_laconic.xml b/config/Messenger_laconic.xml
index a3845ccb6..ca600c5ea 100644
--- a/config/Messenger_laconic.xml
+++ b/config/Messenger_laconic.xml
@@ -199,6 +199,22 @@
WARN
WARN
WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
WARN
WARN
@@ -213,5 +229,8 @@
WARN
WARN
WARN
+ WARN
+ WARN
+ WARN
diff --git a/config/Messenger_rambling.xml b/config/Messenger_rambling.xml
index 40411a260..f2f5e4e92 100644
--- a/config/Messenger_rambling.xml
+++ b/config/Messenger_rambling.xml
@@ -197,6 +197,20 @@
NOTICE
NOTICE
NOTICE
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ WARN
+ ERROR
NOTICE
NOTICE
@@ -212,5 +226,8 @@
INFO
INFO
INFO
+ INFO
+ INFO
+ INFO
diff --git a/config/Messenger_whisper.xml b/config/Messenger_whisper.xml
index 5e54805d0..a8450bb2c 100644
--- a/config/Messenger_whisper.xml
+++ b/config/Messenger_whisper.xml
@@ -196,6 +196,20 @@
FATAL
FATAL
FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
+ FATAL
FATAL
FATAL
@@ -211,5 +225,8 @@
FATAL
FATAL
FATAL
+ FATAL
+ FATAL
+ FATAL
diff --git a/config/PhotonCOHGenerator.xml b/config/PhotonCOHGenerator.xml
new file mode 100644
index 000000000..a5a8053b1
--- /dev/null
+++ b/config/PhotonCOHGenerator.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ HEDIS-PYTHIA
+
+
+
+
diff --git a/config/PhotonCOHPXSec.xml b/config/PhotonCOHPXSec.xml
new file mode 100644
index 000000000..b49e48c0f
--- /dev/null
+++ b/config/PhotonCOHPXSec.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ HEDIS-PYTHIA
+ genie::HELeptonXSec/Default
+
+
+
diff --git a/config/PhotonRESGenerator.xml b/config/PhotonRESGenerator.xml
new file mode 100644
index 000000000..8b2c2d092
--- /dev/null
+++ b/config/PhotonRESGenerator.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ HEDIS-SF,HEDIS-PYTHIA
+
+
+
+
diff --git a/config/PhotonRESPXSec.xml b/config/PhotonRESPXSec.xml
new file mode 100644
index 000000000..d910fb7ae
--- /dev/null
+++ b/config/PhotonRESPXSec.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+ HEDIS-SF,HEDIS-PYTHIA
+ genie::HELeptonXSec/Default
+
+
+
diff --git a/config/master_config.xml b/config/master_config.xml
index 89001b065..65775c665 100644
--- a/config/master_config.xml
+++ b/config/master_config.xml
@@ -43,7 +43,7 @@
SKKinematicsGenerator.xml
DMELKinematicsGenerator.xml
DMDISKinematicsGenerator.xml
- GLRESKinematicsGenerator.xml
+ HELeptonKinematicsGenerator.xml
HEDISKinematicsGenerator.xml
IBDHadronicSystemGenerator.xml
QELHadronicSystemGenerator.xml
@@ -59,6 +59,9 @@
AMNuGammaGenerator.xml
MECGenerator.xml
GLRESGenerator.xml
+ HENuElGenerator.xml
+ PhotonCOHGenerator.xml
+ PhotonRESGenerator.xml
HEDISGenerator.xml
CEvNSEventGenerator.xml
COHDNuEventGenerator.xml
@@ -79,7 +82,7 @@
COHInteractionListGenerator.xml
AMNuGammaInteractionListGenerator.xml
MECInteractionListGenerator.xml
- GLRESInteractionListGenerator.xml
+ HELeptonInteractionListGenerator.xml
DFRInteractionListGenerator.xml
SKInteractionListGenerator.xml
DMELInteractionListGenerator.xml
@@ -160,7 +163,7 @@
DMElectronXSec.xml
DMELXSec.xml
DMDISXSec.xml
- GLRESXSec.xml
+ HELeptonXSec.xml
HEDISXSec.xml
BostedChristyEMPXSec.xml
@@ -193,6 +196,9 @@
NuElectronPXSec.xml
DMElectronPXSec.xml
GLRESPXSec.xml
+ HENuElPXSec.xml
+ PhotonCOHPXSec.xml
+ PhotonRESPXSec.xml
BergerSehgalRESPXSec2014.xml
KuzminLyubushkinNaumovRESPXSec2014.xml
ReinDFRPXSec.xml
diff --git a/src/Apps/Makefile b/src/Apps/Makefile
index 32b839ba5..9b13d1645 100644
--- a/src/Apps/Makefile
+++ b/src/Apps/Makefile
@@ -19,20 +19,22 @@ GENIE_LIBS = $(shell $(GENIE)/src/scripts/setup/genie-config --libs)
LIBRARIES := $(LIBRARIES) $(GENIE_LIBS)
#LIBRARIES := $(LIBRARIES) $(CERN_LIBRARIES) $(GENIE_LIBS)
-TGT_BASE = gevgen \
- gevgen_hadron \
- gevdump \
- gevpick \
- gevscan \
- gevcomp \
- gxscomp \
- gmkspl \
- gspladd \
- gspl2root \
- gntpc \
- gpdfcomp \
- gsfcomp \
- gmkhedissf \
+TGT_BASE = gevgen \
+ gevgen_hadron \
+ gevdump \
+ gevpick \
+ gevscan \
+ gevcomp \
+ gxscomp \
+ gmkspl \
+ gspladd \
+ gspl2root \
+ gntpc \
+ gpdfcomp \
+ gsfcomp \
+ gmkhedissf \
+ gcalchedisdiffxsec \
+ gmkphotonsf \
gconfigdump
ifeq ($(strip $(GOPT_ENABLE_FNAL)),YES)
@@ -244,6 +246,18 @@ $(GENIE_BIN_PATH)/gsfcomp: gSFComp.o $(call find_libs,gsfcomp)
@echo "** Building gsfcomp"
$(LD) $(LDFLAGS) gSFComp.o $(LIBRARIES) -o $(GENIE_BIN_PATH)/gsfcomp
+# App to calculate differential cross sections from HEDIS
+#
+$(GENIE_BIN_PATH)/gcalchedisdiffxsec: gCalcHEDISDiffXsec.o $(call find_libs,gcalchedisdiffxsec)
+ @echo "** Building gcalchedisdiffxsec"
+ $(LD) $(LDFLAGS) gCalcHEDISDiffXsec.o $(LIBRARIES) -o $(GENIE_BIN_PATH)/gcalchedisdiffxsec
+
+# App to create structure functions suitable for HELepton
+#
+$(GENIE_BIN_PATH)/gmkphotonsf: gMakePhotonStrucFunc.o $(call find_libs,gmkphotonsf)
+ @echo "** Building gmkphotonsf"
+ $(LD) $(LDFLAGS) gMakePhotonStrucFunc.o $(LIBRARIES) -o $(GENIE_BIN_PATH)/gmkphotonsf
+
# App to create structure functions suitable for HEDIS
#
$(GENIE_BIN_PATH)/gmkhedissf: gMakeHEDISStrucFunc.o $(call find_libs,gmkhedissf)
diff --git a/src/Apps/gCalcHEDISDiffXsec.cxx b/src/Apps/gCalcHEDISDiffXsec.cxx
new file mode 100644
index 000000000..be9cb69f2
--- /dev/null
+++ b/src/Apps/gCalcHEDISDiffXsec.cxx
@@ -0,0 +1,338 @@
+//____________________________________________________________________________
+/*!
+\program gcalchedisdiffxsec
+\brief GENIE utility program calculating differential cross sections from
+ HEDIS package.
+ Syntax :
+ gcalchedisdiffxsec -p nu -t tgt -o root_file
+ -x table_type
+ --tune genie_tune
+ --event-generator-list list_name
+ Note :
+ [] marks optional arguments.
+ <> marks a list of arguments out of which only one can be
+ selected at any given time.
+ Options :
+ -p
+ the neutrino pdg code
+ -t
+ the target pdg code (format: 10LZZZAAAI)
+ -x
+ path to ascii file with x values
+ -y
+ path to ascii file with y values
+ -e
+ path to ascii file with energy values
+ -o
+ output ROOT file name
+ --tune
+ Specifies a GENIE comprehensive neutrino interaction model tune.
+ --event-generator-list
+ List of event generators to load in event generation drivers.
+ [default: "Default"].
+ --message-thresholds
+ Allows users to customize the message stream thresholds.
+ The thresholds are specified using an XML file.
+ See $GENIE/config/Messenger.xml for the XML schema.
+ *** See the User Manual for more details and examples. ***
+\author Alfonso Garcia
+ NIKHEF (Amsterdam)
+\created May 26, 2021
+\cpright Copyright (c) 2003-2021, The GENIE Collaboration
+ For the full text of the license visit http://copyright.genie-mc.org
+ or see $GENIE/LICENSE
+*/
+//____________________________________________________________________________
+
+#include "TMath.h"
+#include "TSystem.h"
+#include "TTree.h"
+#include "TFile.h"
+
+#include "Framework/EventGen/XSecAlgorithmI.h"
+#include "Framework/EventGen/InteractionList.h"
+#include "Framework/EventGen/EventGeneratorI.h"
+#include "Framework/EventGen/GEVGDriver.h"
+#include "Framework/Utils/AppInit.h"
+#include "Framework/Utils/RunOpt.h"
+#include "Framework/Utils/KineUtils.h"
+#include "Framework/Utils/CmdLnArgParser.h"
+#include "Framework/Interaction/Interaction.h"
+#include "Framework/Interaction/InitialState.h"
+#include "Framework/Messenger/Messenger.h"
+#include "Framework/ParticleData/PDGLibrary.h"
+#include "Framework/Conventions/Units.h"
+
+#include
+#include
+
+using namespace genie;
+
+void PrintSyntax (void);
+void DecodeCommandLine (int argc, char * argv[]);
+
+vector ReadListFromPath (string path);
+
+const double epsilon = 1e-5;
+
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//INPUT ARGUMENTS
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+
+int fNu = -1;
+int fTgt = -1;
+string fPathXlist = "";
+string fPathYlist = "";
+string fPathElist = "";
+string fOutFileName = "";
+bool fSaveAll = false;
+
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//MAIN PROGRAM
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+
+int main(int argc, char ** argv) {
+
+ DecodeCommandLine(argc,argv);
+
+ RunOpt::Instance()->BuildTune();
+ utils::app_init::MesgThresholds(RunOpt::Instance()->MesgThresholdFiles());
+
+ string fChannel = RunOpt::Instance()->EventGeneratorList();
+
+ GEVGDriver evg_driver;
+ InitialState init_state(fTgt, fNu);
+ evg_driver.SetEventGeneratorList(fChannel);
+ evg_driver.Configure(init_state);
+
+ vector ve = ReadListFromPath(fPathElist);
+ vector vx = ReadListFromPath(fPathXlist);
+ vector vy = ReadListFromPath(fPathYlist);
+
+ double widthx = (TMath::Log10(vx[1])-TMath::Log10(vx[0]));
+
+ LOG("gcalchedisdiffxsec", pINFO) << widthx;
+
+ int quark;
+ double ei;
+ double bx;
+ double by;
+ double dxsec;
+
+ TString treename = Form("diffxsec_nu%d_tgt%d_%s",fNu,fTgt,fChannel.c_str());
+
+ LOG("gcalchedisdiffxsec", pINFO) << treename;
+
+ TTree * tree = new TTree(treename,treename);
+ tree->Branch( "Quark", &quark, "Quark/I" );
+ tree->Branch( "Ei", &ei, "Ei/D" );
+ tree->Branch( "Bx", &bx, "Bx/D" );
+ tree->Branch( "By", &by, "By/D" );
+ tree->Branch( "DiffXsec", &dxsec, "DiffXsec/D" );
+
+ const InteractionList * intlst = evg_driver.Interactions();
+
+ InteractionList::const_iterator intliter;
+ for(intliter = intlst->begin(); intliter != intlst->end(); ++intliter) {
+
+ const Interaction * interaction = *intliter;
+
+ quark = 10000 * interaction->InitState().Tgt().HitQrkPdg();
+ if (!interaction->InitState().Tgt().HitSeaQrk()) {
+ if ( quark>0 ) quark += 100;
+ else quark -= 100;
+ }
+ quark += 1 * interaction->ExclTag().FinalQuarkPdg();
+
+ LOG("gcalchedisdiffxsec", pINFO) << "Current interaction: " << interaction->AsString();
+
+ const XSecAlgorithmI * xsec_alg = evg_driver.FindGenerator(interaction)->CrossSectionAlg();
+
+ for ( unsigned i=0; iInitStatePtr()->SetProbeP4(p4);
+
+ for ( unsigned j=0; jby_prev) by = 1e-4;
+ }
+
+ if ( by<0 || by>1 ) continue;
+
+ interaction->KinePtr()->Sety(by);
+
+ if (fSaveAll) {
+ for ( unsigned k=0; kKinePtr()->Setx(bx);
+ utils::kinematics::UpdateWQ2FromXY(interaction);
+ dxsec = xsec_alg->XSec(interaction, kPSxyfE) / units::cm2;
+ LOG("gcalchedisdiffxsec", pDEBUG) << "x: " << bx << " y: " << by << " -> d2sigmadxdy[E=" << ei << "GeV] = " << dxsec << " cm2";
+ tree->Fill();
+ }
+ }
+ else {
+ dxsec = 0.;
+ for ( unsigned k=0; kKinePtr()->Setx(bx);
+ utils::kinematics::UpdateWQ2FromXY(interaction);
+ dxsec += xsec_alg->XSec(interaction, kPSxyfE) * bx;
+ }
+ dxsec *= widthx*TMath::Log(10) / units::cm2;
+ LOG("gcalchedisdiffxsec", pDEBUG) << " y: " << by << " -> d2sigmady[E=" << ei << "GeV] = " << dxsec << " cm2";
+ tree->Fill();
+ }
+
+ }
+
+ }
+
+ }
+
+ TFile * outfile = new TFile(fOutFileName.c_str(),"RECREATE");
+ tree->Write(tree->GetName());
+ outfile->Close();
+
+}
+
+
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//READ LIST
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+vector ReadListFromPath(string path) {
+
+ vector list;
+
+ std::ifstream infile(path.c_str());
+
+ //check to see that the file was opened correctly:
+ if (!infile.is_open()) {
+ LOG("gcalchedisdiffxsec", pFATAL) << "There was a problem opening the input file!";
+ exit(1);//exit or do additional error checking
+ }
+
+ double val = 0.;
+ while (infile >> val) list.push_back(val);
+
+ return list;
+
+}
+
+
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+//INPUT PARSER
+//----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+
+void DecodeCommandLine(int argc, char * argv[]) {
+
+ // Common run options. Set defaults and read.
+ RunOpt::Instance()->ReadFromCommandLine(argc,argv);
+
+ // Parse run options for this app
+ CmdLnArgParser parser(argc,argv);
+
+ if( parser.OptionExists('p') ){
+ fNu = parser.ArgAsInt('p');
+ LOG("gcalchedisdiffxsec", pINFO) << "Probe = " << fNu;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified input neutrino type!";
+ PrintSyntax();
+ exit(1);
+ }
+
+ if( parser.OptionExists('t') ){
+ fTgt = parser.ArgAsInt('t');
+ LOG("gcalchedisdiffxsec", pINFO) << "Target = " << fTgt;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified input target type!";
+ PrintSyntax();
+ exit(1);
+ }
+
+ if( parser.OptionExists('x') ){
+ fPathXlist = parser.ArgAsString('x');
+ LOG("gcalchedisdiffxsec", pINFO) << "PathXlist = " << fPathXlist;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified input path to Xlist!";
+ PrintSyntax();
+ exit(1);
+ }
+
+ if( parser.OptionExists('y') ){
+ fPathYlist = parser.ArgAsString('y');
+ LOG("gcalchedisdiffxsec", pINFO) << "PathYlist = " << fPathYlist;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified input path to Ylist!";
+ PrintSyntax();
+ exit(1);
+ }
+
+ if( parser.OptionExists('e') ){
+ fPathElist = parser.ArgAsString('e');
+ LOG("gcalchedisdiffxsec", pINFO) << "PathElist = " << fPathElist;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified input path to Elist!";
+ PrintSyntax();
+ exit(1);
+ }
+
+ if( parser.OptionExists('s') ) {
+ fSaveAll = true;
+ LOG("gcalchedisdiffxsec", pINFO) << "SaveAll = " << fSaveAll;
+ }
+
+ if( parser.OptionExists('o') ){
+ fOutFileName = parser.ArgAsString('o');
+ LOG("gcalchedisdiffxsec", pINFO) << "OutFileName = " << fOutFileName;
+ }
+ else {
+ LOG("gcalchedisdiffxsec", pFATAL) << "Unspecified output file name!";
+ PrintSyntax();
+ exit(1);
+ }
+
+}
+
+//____________________________________________________________________________
+void PrintSyntax(void)
+{
+ LOG("gcalchedisdiffxsec", pNOTICE)
+ << "\n\n" << "Syntax:" << "\n"
+ << " gcalchedisdiffxsec -p nu -t tgt -o root_file\n"
+ << " -x pathxlist\n"
+ << " -y pathylist\n"
+ << " -e pathelist\n"
+ << " --tune genie_tune\n"
+ << " --event-generator-list list_name\n"
+ << " [--message-thresholds xml_file]\n";
+}
\ No newline at end of file
diff --git a/src/Apps/gMakePhotonStrucFunc.cxx b/src/Apps/gMakePhotonStrucFunc.cxx
new file mode 100644
index 000000000..dd030d9f1
--- /dev/null
+++ b/src/Apps/gMakePhotonStrucFunc.cxx
@@ -0,0 +1,197 @@
+//____________________________________________________________________________
+/*!
+\program gmkspl
+\brief GENIE utility program building Structure Functions needed for HEDIS
+ package.
+ Syntax :
+ gmkphotonsf [-h]
+ Note :
+ [] marks optional arguments.
+ <> marks a list of arguments out of which only one can be
+ selected at any given time.
+ Options :
+ *** See the User Manual for more details and examples. ***
+\author Alfonso Garcia
+ Harvard University & IFIC
+\created Dev 8, 2020
+\cpright Copyright (c) 2003-2019, The GENIE Collaboration
+ For the full text of the license visit http://copyright.genie-mc.org
+ or see $GENIE/LICENSE
+*/
+//____________________________________________________________________________
+
+#include "Framework/Messenger/Messenger.h"
+#include "Framework/Conventions/Constants.h"
+#include "Framework/ParticleData/PDGCodes.h"
+#include "Framework/ParticleData/PDGUtils.h"
+
+#include
+#include
+#include