Skip to content

Changes to XML files to support use of Pythia8 rather than Pythia6 #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Changes to XML files to support use of Pythia8 rather than Pythia6 #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fc76e1
add controls for Pythia8 related streams
nusense Jan 14, 2025
0a34c19
necessary changes to use Pythia8 instead of Pythia6
nusense Jan 14, 2025
2d4e3c4
Adjust configure script so that Pythia 8 is used by default and Pythia 6
sjgardiner Sep 16, 2025
9cce37d
Remove info message about Pythia 6 being disabled (since this is now the
sjgardiner Sep 16, 2025
709493d
Merge pull request #1 from sjgardiner/gardiner/pythia8-is-default
nusense Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/AGKY2019.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KNO2PYTHIA-Wmax double No relevant only for method=2
<param type="string" name="CommonParam"> KNO2Pythia </param>

<param type="alg" name="KNO-Hadronizer"> genie::AGKYLowW2019/Default </param>
<param type="alg" name="PYTHIA-Hadronizer"> genie::Pythia6Hadro2019/Default </param>
<param type="alg" name="PYTHIA-Hadronizer"> genie::Pythia8Hadro2019/Default </param>

</param_set>

Expand Down
4 changes: 2 additions & 2 deletions config/AGKYLowW2019.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig

<param_set name="Default-Decaying">
<param type="bool" name="ForceDecays"> true </param>
<param type="alg" name="Decayer"> genie::Pythia6Decayer2023/Default </param>
<param type="alg" name="Decayer"> genie::Pythia8Decayer2023/Default </param>
</param_set>

<param_set name="Old">
Expand All @@ -179,7 +179,7 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig

<param_set name="Old-Decaying">
<param type="bool" name="ForceDecays"> true </param>
<param type="alg" name="Decayer"> genie::Pythia6Decayer2023/Default </param>
<param type="alg" name="Decayer"> genie::Pythia8Decayer2023/Default </param>
<param type="bool" name="KNO-UseBaryonPdfs-xFpT2"> false </param>
<param type="bool" name="KNO-PhaseSpDec-Reweight"> false </param>
</param_set>
Expand Down
2 changes: 1 addition & 1 deletion config/DISHadronicSystemGenerator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ NUCL-NR double No
</param_set>

<param_set name="Charm">
<param type="alg" name="Hadronizer"> genie::AGCharmPythia6Hadro2023/Default </param>
<param type="alg" name="Hadronizer"> genie::AGCharmPythia8Hadro2023/Default </param>
<param type="alg" name="PreTransportDecayer"> genie::UnstableParticleDecayer/BeforeHadronTransport </param>
<param type="bool" name="FilterPreFragm"> false </param>

Expand Down
1 change: 1 addition & 0 deletions config/Messenger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
<priority msgstream="PaschLal"> INFO </priority>
<priority msgstream="PythiaDec"> WARN </priority>
<priority msgstream="Pythia6Decay"> WARN </priority>
<priority msgstream="Pythia8Decay"> WARN </priority>
<priority msgstream="PythiaHad"> WARN </priority>
<priority msgstream="Pythia6Had"> WARN </priority>
<priority msgstream="Pythia8Had"> WARN </priority>
Expand Down
3 changes: 3 additions & 0 deletions config/Messenger_inuke_verbose.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@
<priority msgstream="PaschLal"> INFO </priority>
<priority msgstream="PythiaDec"> NOTICE </priority>
<priority msgstream="Pythia6Decay"> NOTICE </priority>
<priority msgstream="Pythia8Decay"> NOTICE </priority>
<priority msgstream="PythiaHad"> NOTICE </priority>
<priority msgstream="Pythia6Had"> NOTICE </priority>
<priority msgstream="Pythia8Had"> NOTICE </priority>
<priority msgstream="PDG"> INFO </priority>
<priority msgstream="PathL"> NOTICE </priority>
<priority msgstream="PhysUtil"> NOTICE </priority>
Expand Down
2 changes: 2 additions & 0 deletions config/Messenger_laconic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
-->
<priority msgstream="ResonanceDecay"> WARN </priority>
<priority msgstream="Pythia6Decay"> WARN </priority>
<priority msgstream="Pythia8Decay"> WARN </priority>
<priority msgstream="Messenger"> WARN </priority>
<priority msgstream="AhrensNCEL"> WARN </priority>
<!-- EDIT: add notification for DM EL algorithm -->
Expand Down Expand Up @@ -166,6 +167,7 @@
<priority msgstream="PaschLal"> WARN </priority>
<priority msgstream="PythiaDec"> WARN </priority>
<priority msgstream="Pythia6Decay"> WARN </priority>
<priority msgstream="Pythia8Decay"> WARN </priority>
<priority msgstream="PythiaHad"> WARN </priority>
<priority msgstream="Pythia6Had"> WARN </priority>
<priority msgstream="Pythia8Had"> WARN </priority>
Expand Down
1 change: 1 addition & 0 deletions config/Messenger_rambling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
<priority msgstream="PaschLal"> INFO </priority>
<priority msgstream="PythiaDec"> NOTICE </priority>
<priority msgstream="Pythia6Decay"> NOTICE </priority>
<priority msgstream="Pythia8Decay"> NOTICE </priority>
<priority msgstream="PythiaHad"> NOTICE </priority>
<priority msgstream="Pythia6Had"> NOTICE </priority>
<priority msgstream="Pythia8Had"> NOTICE </priority>
Expand Down
1 change: 1 addition & 0 deletions config/Messenger_whisper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<priority msgstream="PaschLal"> FATAL </priority>
<priority msgstream="PythiaDec"> FATAL </priority>
<priority msgstream="Pythia6Decay"> FATAL </priority>
<priority msgstream="Pythia8Decay"> FATAL </priority>
<priority msgstream="PythiaHad"> FATAL </priority>
<priority msgstream="Pythia6Had"> FATAL </priority>
<priority msgstream="Pythia8Had"> FATAL </priority>
Expand Down
6 changes: 3 additions & 3 deletions config/UnstableParticleDecayer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ Name Type Optional Comment Default

<param_set name="BeforeHadronTransport">
<param type="int" name="NDecayers"> 2 </param>
<param type="alg" name="Decayer-0"> genie::Pythia6Decayer2023/BeforeHadronTransport </param>
<param type="alg" name="Decayer-0"> genie::Pythia8Decayer2023/BeforeHadronTransport </param>
<param type="alg" name="Decayer-1"> genie::BaryonResonanceDecayer/BeforeHadronTransport </param>
</param_set>

<param_set name="AfterHadronTransport">
<param type="int" name="NDecayers"> 2 </param>
<param type="alg" name="Decayer-0"> genie::Pythia6Decayer2023/AfterHadronTransport </param>
<param type="alg" name="Decayer-0"> genie::Pythia8Decayer2023/AfterHadronTransport </param>
<param type="alg" name="Decayer-1"> genie::BaryonResonanceDecayer/AfterHadronTransport </param>
</param_set>

<param_set name="DarkSector">
<param type="int" name="NDecayers"> 3 </param>
<param type="alg" name="Decayer-0"> genie::Pythia6Decayer2023/AfterHadronTransport </param>
<param type="alg" name="Decayer-0"> genie::Pythia8Decayer2023/AfterHadronTransport </param>
<param type="alg" name="Decayer-1"> genie::BaryonResonanceDecayer/AfterHadronTransport </param>
<param type="alg" name="Decayer-2"> genie::DarkSectorDecayer/Default </param>
</param_set>
Expand Down
10 changes: 5 additions & 5 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ if(($match = grep(/--help/i, @ARGV)) > 0) {
print " FLAG DESCRIPTION DEFAULT\n\n";
print " --prefix Installation location (for 'make install') /usr/local/\n";
print "\n enable/disable options with either --enable- or --disable- (eg --enable-lhapdf5 --disable-flux-drivers)\n\n";
print " pythia6 Use the PYTHIA6 MC generator, assumed to be incl. w/ ROOT default: enabled \n";
print " pythia8 Use the PYTHIA8 MC generator default: disabled \n";
print " pythia6 Use the PYTHIA6 MC generator, assumed to be incl. w/ ROOT default: disabled \n";
print " pythia8 Use the PYTHIA8 MC generator default: enabled \n";
print " incl Interface with INCL++ for nuclear transport default: disabled \n";
print " geant4 Interface with Geant4 for nuclear transport default: disabled \n";
print " lhapdf5 Use the LHAPDF5 parton density function library default: enabled \n";
Expand Down Expand Up @@ -54,7 +54,7 @@ if(($match = grep(/--help/i, @ARGV)) > 0) {
print " profiler-lib Path to profiler library needed if you --enable-profiler \n";
print " doxygen-path Doxygen binary path needed if you --enable-doxygen-doc (if unset: checks for a \$DOXYGENPATH env.var.) \n";

print " pythia6-lib PYTHIA6 libraries path always needed (if unset: checks for a \$PYTHIA6 env.var., then tries to auto-detect it) \n";
print " pythia6-lib PYTHIA6 libraries path needed if you --enable-pythia6 (if unset: checks for a \$PYTHIA6 env.var., then tries to auto-detect it) \n";
print " pythia8-inc PYTHIA8 includes path needed if you --enable-pythia8 (if unset: checks for a \$PYTHIA8_INC env.var., then tries to auto-detect it) \n";
print " pythia8-lib PYTHIA8 libraries path needed if you --enable-pythia8 (if unset: checks for a \$PYTHIA8_LIB env.var.. then tries to auto-detect it) \n";
print " incl-inc INCL++ includes path needed if you --enable-incl (if unset: tries to auto-detect it) \n";
Expand Down Expand Up @@ -151,8 +151,8 @@ print MKCONF "GENIE_INSTALLATION_PATH=$prefix\n";

# Default --enable/--disable config options (for a minimal genie build)
#
my $gopt_enable_pythia6 = "YES";
my $gopt_enable_pythia8 = "NO";
my $gopt_enable_pythia6 = "NO";
my $gopt_enable_pythia8 = "YES";
my $gopt_enable_lhapdf5 = "YES";
my $gopt_enable_lhapdf6 = "NO";
my $gopt_enable_apfel = "NO";
Expand Down
8 changes: 4 additions & 4 deletions src/make/Make.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ endif
# APFEL
#-------------------------------------------------------------------

APFEL_LIBRARIES =
APFEL_LIBRARIES =
APFEL_INCLUDES =

ifeq ($(strip $(GOPT_ENABLE_APFEL)),YES)
ifeq ($(strip $(GOPT_ENABLE_APFEL)),YES)

APFEL_INCLUDES = -I$(GOPT_WITH_APFEL_INC)
APFEL_LIBRARIES = -L$(GOPT_WITH_APFEL_LIB) -lAPFEL
APFEL_LIBRARIES = -L$(GOPT_WITH_APFEL_LIB) -lAPFEL

endif

Expand Down Expand Up @@ -250,7 +250,7 @@ endif

PY6ROOT_LIBRARY = -lEGPythia6
else
$(info GOPT_ENABLE_PYTHIA6 is NO)
#$(info GOPT_ENABLE_PYTHIA6 is NO)
endif

#-------------------------------------------------------------------
Expand Down