Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/HEDIS/updates' into HEDIS/updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@mroda88
mroda88 committed Feb 18, 2022
2 parents 79e7281 + adfa535 commit 4fc657e
Show file tree
Hide file tree
Showing 105 changed files with 5,056 additions and 1,293 deletions.
26 changes: 13 additions & 13 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
Expand Down Expand Up @@ -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 && \
Expand Down Expand Up @@ -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 && \
Expand Down Expand Up @@ -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 && \
Expand Down
138 changes: 108 additions & 30 deletions config/EventGenerator.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ XSecModel alg Yes Cross section model used at the thread
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HEDISKinematicsGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HEDISKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::HEDISGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HEDISInteractionListGenerator/CC-Default </param>
Expand All @@ -698,55 +698,133 @@ XSecModel alg Yes Cross section model used at the thread
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HEDISKinematicsGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HEDISKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::HEDISGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HEDISInteractionListGenerator/NC-Default </param>
</param_set>

<param_set name="GLRES-Mu">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::GLRESKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::GLRESInteractionListGenerator/Mu-Default </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/GLRES-Mu-Default </param>
</param_set>

<param_set name="GLRES-Tau">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::GLRESKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::GLRESInteractionListGenerator/Tau-Default </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/GLRES-Tau-Default </param>
</param_set>

<param_set name="GLRES-Ele">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::GLRESKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::GLRESInteractionListGenerator/Ele-Default </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/GLRES-Ele-Default </param>
</param_set>

<param_set name="GLRES-Had">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::GLRESKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::GLRESInteractionListGenerator/Had-Default </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::GLRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/GLRES-Had-Default </param>
</param_set>

<param_set name="HENuEl-CC">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::HENuElGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/HENuEl-CC-Default </param>
</param_set>

<param_set name="HENuEl-NC">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::HENuElGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/HENuEl-NC-Default </param>
</param_set>

<param_set name="PhotonRES-Mu">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::PhotonRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/PhotonRES-Mu-Default </param>
</param_set>

<param_set name="PhotonRES-Ele">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::PhotonRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/PhotonRES-Ele-Default </param>
</param_set>

<param_set name="PhotonRES-Tau">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::PhotonRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/PhotonRES-Tau-Default </param>
</param_set>

<param_set name="PhotonRES-Had">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::PhotonRESGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/PhotonRES-Had-Default </param>
</param_set>

<param_set name="PhotonCOH">
<param type="string" name="VldContext"> </param>
<param type="int" name="NModules"> 5 </param>
<param type="alg" name="Module-0"> genie::InitialStateAppender/Default </param>
<param type="alg" name="Module-1"> genie::VertexGenerator/Default </param>
<param type="alg" name="Module-2"> genie::HELeptonKinematicsGenerator/Default </param>
<param type="alg" name="Module-3"> genie::PhotonCOHGenerator/Default </param>
<param type="alg" name="Module-4"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="alg" name="ILstGen"> genie::HELeptonInteractionListGenerator/PhotonCOH-Default </param>
</param_set>


</alg_conf>

Loading

0 comments on commit 4fc657e

Please sign in to comment.