diff --git a/config/AGKY2019.xml b/config/AGKY2019.xml index f09c6dcee..157501a17 100644 --- a/config/AGKY2019.xml +++ b/config/AGKY2019.xml @@ -24,7 +24,7 @@ KNO2PYTHIA-Wmax double No relevant only for method=2 KNO2Pythia genie::AGKYLowW2019/Default - genie::Pythia6Hadro2019/Default + genie::Pythia8Hadro2019/Default diff --git a/config/AGKYLowW2019.xml b/config/AGKYLowW2019.xml index 50fb5d1f9..e1c9536d3 100644 --- a/config/AGKYLowW2019.xml +++ b/config/AGKYLowW2019.xml @@ -169,7 +169,7 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig true - genie::Pythia6Decayer2023/Default + genie::Pythia8Decayer2023/Default @@ -179,7 +179,7 @@ KNO-PhaseSpDec-ReweightParm double Yes parameter controlling the reweig true - genie::Pythia6Decayer2023/Default + genie::Pythia8Decayer2023/Default false false diff --git a/config/DISHadronicSystemGenerator.xml b/config/DISHadronicSystemGenerator.xml index ce78b8229..51de28438 100644 --- a/config/DISHadronicSystemGenerator.xml +++ b/config/DISHadronicSystemGenerator.xml @@ -40,7 +40,7 @@ NUCL-NR double No - genie::AGCharmPythia6Hadro2023/Default + genie::AGCharmPythia8Hadro2023/Default genie::UnstableParticleDecayer/BeforeHadronTransport false diff --git a/config/Messenger.xml b/config/Messenger.xml index 713a15a71..620929500 100644 --- a/config/Messenger.xml +++ b/config/Messenger.xml @@ -171,6 +171,7 @@ INFO WARN WARN + WARN WARN WARN WARN diff --git a/config/Messenger_inuke_verbose.xml b/config/Messenger_inuke_verbose.xml index e53bb4f35..356a117ee 100644 --- a/config/Messenger_inuke_verbose.xml +++ b/config/Messenger_inuke_verbose.xml @@ -147,7 +147,10 @@ INFO NOTICE NOTICE + NOTICE NOTICE + NOTICE + NOTICE INFO NOTICE NOTICE diff --git a/config/Messenger_laconic.xml b/config/Messenger_laconic.xml index 1cfaf6590..3cc5c579f 100644 --- a/config/Messenger_laconic.xml +++ b/config/Messenger_laconic.xml @@ -23,6 +23,7 @@ --> WARN WARN + WARN WARN WARN @@ -166,6 +167,7 @@ WARN WARN WARN + WARN WARN WARN WARN diff --git a/config/Messenger_rambling.xml b/config/Messenger_rambling.xml index e591abc5e..c212f2456 100644 --- a/config/Messenger_rambling.xml +++ b/config/Messenger_rambling.xml @@ -164,6 +164,7 @@ INFO NOTICE NOTICE + NOTICE NOTICE NOTICE NOTICE diff --git a/config/Messenger_whisper.xml b/config/Messenger_whisper.xml index c8d945a86..7d9e295ed 100644 --- a/config/Messenger_whisper.xml +++ b/config/Messenger_whisper.xml @@ -163,6 +163,7 @@ FATAL FATAL FATAL + FATAL FATAL FATAL FATAL diff --git a/config/UnstableParticleDecayer.xml b/config/UnstableParticleDecayer.xml index 49af36c18..08237bab1 100644 --- a/config/UnstableParticleDecayer.xml +++ b/config/UnstableParticleDecayer.xml @@ -13,19 +13,19 @@ Name Type Optional Comment Default 2 - genie::Pythia6Decayer2023/BeforeHadronTransport + genie::Pythia8Decayer2023/BeforeHadronTransport genie::BaryonResonanceDecayer/BeforeHadronTransport 2 - genie::Pythia6Decayer2023/AfterHadronTransport + genie::Pythia8Decayer2023/AfterHadronTransport genie::BaryonResonanceDecayer/AfterHadronTransport 3 - genie::Pythia6Decayer2023/AfterHadronTransport + genie::Pythia8Decayer2023/AfterHadronTransport genie::BaryonResonanceDecayer/AfterHadronTransport genie::DarkSectorDecayer/Default diff --git a/configure b/configure index ddb6fe5d5..24371afde 100755 --- a/configure +++ b/configure @@ -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"; @@ -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"; @@ -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"; diff --git a/src/make/Make.include b/src/make/Make.include index 200955bf8..74ebb606c 100644 --- a/src/make/Make.include +++ b/src/make/Make.include @@ -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 @@ -250,7 +250,7 @@ endif PY6ROOT_LIBRARY = -lEGPythia6 else - $(info GOPT_ENABLE_PYTHIA6 is NO) + #$(info GOPT_ENABLE_PYTHIA6 is NO) endif #-------------------------------------------------------------------