Compare commits
6 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 9c1225853d | |||
| b0d6613785 | |||
| 5b7afe4698 | |||
| b5a06ee5d1 | |||
| 86f2cb3b83 | |||
| 3aaf1f9d2a |
@@ -1,31 +1,17 @@
|
||||
Index: pythia8311/examples/Makefile
|
||||
---
|
||||
examples/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: pythia8313/examples/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/examples/Makefile
|
||||
+++ pythia8311/examples/Makefile
|
||||
@@ -119,7 +119,7 @@ endif
|
||||
# FASTJET3.
|
||||
main71 main72 main75 main81 main82 main83: $(PYTHIA) $$@.cc
|
||||
ifeq ($(FASTJET3_USE),true)
|
||||
- $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB)
|
||||
+ $(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB) -lgmp
|
||||
else
|
||||
$(error Error: $@ requires FASTJET3)
|
||||
endif
|
||||
@@ -128,7 +128,7 @@ endif
|
||||
main74: $(PYTHIA) $$@.cc
|
||||
ifeq ($(FASTJET3_USE),true)
|
||||
$(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\
|
||||
- $(FASTJET3_LIB) -lfastjettools -lRecursiveTools
|
||||
+ $(FASTJET3_LIB) -lfastjettools -lRecursiveTools -lgmp
|
||||
else
|
||||
$(error Error: $@ requires FASTJET3)
|
||||
endif
|
||||
@@ -137,7 +137,7 @@ endif
|
||||
main84: $(PYTHIA) $$@.cc
|
||||
ifeq ($(FASTJET3_USE)$(HEPMC3_USE),truetrue)
|
||||
$(CXX) $@.cc -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\
|
||||
- $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB)
|
||||
+ $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB) -lgmp
|
||||
else
|
||||
$(error Error: $@ requires FASTJET3 and HEPMC3)
|
||||
--- pythia8313.orig/examples/Makefile
|
||||
+++ pythia8313/examples/Makefile
|
||||
@@ -55,7 +55,7 @@ HEPMC2_OPTS=$(HEPMC2_INCLUDE) $(HEPMC2_L
|
||||
HEPMC3_OPTS=$(HEPMC3_INCLUDE) $(HEPMC3_LIB) -DHEPMC3
|
||||
HDF5_OPTS=$(HDF5_INCLUDE) $(HIGHFIVE_INCLUDE) $(MPICH_INCLUDE)
|
||||
HDF5_OPTS+= $(HDF5_LIB) -DHDF5
|
||||
-FASTJET3_OPTS=$(FASTJET3_INCLUDE) $(FASTJET3_LIB)
|
||||
+FASTJET3_OPTS=$(FASTJET3_INCLUDE) $(FASTJET3_LIB) -lgmp
|
||||
ifeq ($(ROOT_USE),true)
|
||||
ROOT_OPTS=$(ROOT_LIB) $(shell $(ROOT_CONFIG) --cflags --glibs) -DPY8ROOT
|
||||
endif
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
Index: pythia8311/configure
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: pythia8316/configure
|
||||
===================================================================
|
||||
--- pythia8311.orig/configure
|
||||
+++ pythia8311/configure
|
||||
@@ -326,7 +326,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" !
|
||||
--- pythia8316.orig/configure
|
||||
+++ pythia8316/configure
|
||||
@@ -329,7 +329,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" !
|
||||
warn "Unknown architecture $ARCH, set as LINUX."; ARCH="LINUX"; fi
|
||||
if [ -z "$CXX" ]; then warn "CXX not set, using g++."; CXX="g++"; fi
|
||||
if [ -z "$CXX_COMMON" ]; then
|
||||
- CXX_COMMON="${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC"
|
||||
+ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC"
|
||||
CXX_COMMON="${CXX_COMMON} -pthread"; fi
|
||||
- CXX_COMMON="${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC"; fi
|
||||
+ CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC"; fi
|
||||
if [ -z "$CXX_SHARED" ]; then
|
||||
if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi
|
||||
if [ "$ARCH" = "DARWIN" ]; then CXX_SHARED="-dynamiclib"; fi; fi
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: pythia8310/Makefile
|
||||
Index: pythia8313/Makefile
|
||||
===================================================================
|
||||
--- pythia8310.orig/Makefile
|
||||
+++ pythia8310/Makefile
|
||||
@@ -140,12 +140,12 @@ python: $(LOCAL_LIB)/libpythia8$(LIB_SUF
|
||||
--- pythia8313.orig/Makefile
|
||||
+++ pythia8313/Makefile
|
||||
@@ -141,12 +141,12 @@ python: $(LOCAL_LIB)/libpythia8$(LIB_SUF
|
||||
|
||||
# Install.
|
||||
install: all
|
||||
|
||||
@@ -1,36 +1,44 @@
|
||||
Index: pythia8311/Makefile
|
||||
---
|
||||
Makefile | 10 +++++++++-
|
||||
configure | 5 ++++-
|
||||
examples/Makefile | 2 +-
|
||||
plugins/mg5mes/Makefile | 6 +++++-
|
||||
plugins/python/Makefile | 12 +++++++++++-
|
||||
5 files changed, 30 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: pythia8316/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/Makefile
|
||||
+++ pythia8311/Makefile
|
||||
--- pythia8316.orig/Makefile
|
||||
+++ pythia8316/Makefile
|
||||
@@ -36,7 +36,11 @@ LOCAL_TMP=tmp
|
||||
LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(LOCAL_LIB))
|
||||
CXX_COMMON:=-I$(LOCAL_INCLUDE) $(CXX_COMMON)
|
||||
OBJ_COMMON:=-MD $(CXX_COMMON) $(OBJ_COMMON)
|
||||
-LIB_COMMON=-Wl,-rpath,../lib:$(PREFIX_LIB) -ldl $(GZIP_LIB)
|
||||
-LIB_COMMON=-pthread -Wl,-rpath,../lib:$(PREFIX_LIB) -ldl $(GZIP_LIB)
|
||||
+ifneq ($(DISABLE_RPATH),true)
|
||||
+ LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl $(GZIP_LIB)
|
||||
+ LIB_COMMON=-pthread -Wl,-rpath,../$(PREFIX_LIB) -ldl $(GZIP_LIB)
|
||||
+else
|
||||
+ LIB_COMMON=-ldl $(GZIP_LIB)
|
||||
+ LIB_COMMON=-pthread -ldl $(GZIP_LIB)
|
||||
+endif
|
||||
|
||||
# PYTHIA.
|
||||
OBJECTS=$(patsubst $(LOCAL_SRC)/%.cc,$(LOCAL_TMP)/%.o,\
|
||||
@@ -124,7 +128,11 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW
|
||||
@@ -151,7 +155,11 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW
|
||||
$(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
$(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\
|
||||
$(CXX_SONAME)$(notdir $@) -Llib -lpythia8\
|
||||
+ifneq ($(DISABLE_RPATH),true)
|
||||
-Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$*
|
||||
-Wl,-rpath,../lib:$(POWHEG_DIR) -L$(POWHEG_DIR) -l$*
|
||||
+else
|
||||
+ -L$(POWHEG_BIN) -l$*
|
||||
+ -L$(POWHEG_DIR) -l$*
|
||||
+endif
|
||||
$(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\
|
||||
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
$(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
|
||||
Index: pythia8311/configure
|
||||
Index: pythia8316/configure
|
||||
===================================================================
|
||||
--- pythia8311.orig/configure
|
||||
+++ pythia8311/configure
|
||||
--- pythia8316.orig/configure
|
||||
+++ pythia8316/configure
|
||||
@@ -30,6 +30,7 @@ Configuration options.
|
||||
--help : Print this help message (also -h, --h, and -help).
|
||||
--enable-debug : Turn on debugging and disable optimization.
|
||||
@@ -39,7 +47,7 @@ Index: pythia8311/configure
|
||||
--lcg=PLATFORM : Specify the LCG platform to use when the
|
||||
--with-PACKAGE-version option, described below,
|
||||
is set for a given optional package
|
||||
@@ -95,7 +96,7 @@ Advanced options.
|
||||
@@ -96,7 +97,7 @@ Advanced options.
|
||||
--obj-common='FLAGS' : Set the common C++ flags used for object (.o) compilation
|
||||
only (not linking).
|
||||
BLOCKTEXT
|
||||
@@ -47,8 +55,8 @@ Index: pythia8311/configure
|
||||
+OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --disable-rpath --lcg --lcg-ver"
|
||||
OPTIONS+=" --prefix --prefix-bin --prefix-lib --prefix-include --prefix-share"
|
||||
for PKG in "evtgen" "fastjet3" "hepmc2" "hepmc3" "lhapdf5" "lhapdf6" "powheg"\
|
||||
"rivet" "root" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\
|
||||
@@ -320,6 +321,7 @@ done
|
||||
"rivet" "yoda" "root" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\
|
||||
@@ -323,6 +324,7 @@ echo "# ./configure$USER_CFG" >> $CFG_FI
|
||||
# Set the compilation flags and options (order matters).
|
||||
[ "$ENABLE_DEBUG_SET" = true ] && ENABLE_DEBUG="-g " || ENABLE_DEBUG="-O2 "
|
||||
[ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O "
|
||||
@@ -56,18 +64,18 @@ Index: pythia8311/configure
|
||||
if [ -z "$ARCH" ]; then ARCH=$(uname | grep -i -o -e Linux -e Darwin); fi
|
||||
ARCH=$(echo $ARCH | awk '{print toupper($0)}')
|
||||
if [ "$ARCH" != "LINUX" ] && [ "$ARCH" != "DARWIN" ]; then
|
||||
@@ -453,6 +455,7 @@ PREFIX_LIB=$PREFIX_LIB
|
||||
@@ -465,6 +467,7 @@ PREFIX_LIB=$PREFIX_LIB
|
||||
PREFIX_SHARE=$PREFIX_SHARE
|
||||
|
||||
# Compilation flags (see ./configure --help for further documentation).
|
||||
+DISABLE_RPATH=$DISABLE_RPATH
|
||||
CXX=$CXX
|
||||
CXX_DTAGS=$CXX_DTAGS
|
||||
CXX_COMMON=$CXX_COMMON
|
||||
CXX_SHARED=$CXX_SHARED
|
||||
Index: pythia8311/plugins/mg5mes/Makefile
|
||||
Index: pythia8316/plugins/mg5mes/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/plugins/mg5mes/Makefile
|
||||
+++ pythia8311/plugins/mg5mes/Makefile
|
||||
--- pythia8316.orig/plugins/mg5mes/Makefile
|
||||
+++ pythia8316/plugins/mg5mes/Makefile
|
||||
@@ -28,7 +28,11 @@ LOCAL_DIRS:=$(subst $(LOCAL_TMP)/,,$(wil
|
||||
LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB))
|
||||
LOCAL_MKDIRS:=$(foreach DIR,$(LOCAL_DIRS),$(shell mkdir -p $(LOCAL_TMP)/$(DIR)))
|
||||
@@ -81,12 +89,12 @@ Index: pythia8311/plugins/mg5mes/Makefile
|
||||
PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
|
||||
# Set the wrapper, determine the objects and targets.
|
||||
Index: pythia8311/plugins/python/Makefile
|
||||
Index: pythia8316/plugins/python/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/plugins/python/Makefile
|
||||
+++ pythia8311/plugins/python/Makefile
|
||||
@@ -27,7 +27,11 @@ LOCAL_TMP=tmp
|
||||
LOCAL_INCLUDE=include
|
||||
--- pythia8316.orig/plugins/python/Makefile
|
||||
+++ pythia8316/plugins/python/Makefile
|
||||
@@ -28,7 +28,11 @@ LOCAL_INCLUDE=include
|
||||
LOCAL_EXTRA=extra
|
||||
LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB))
|
||||
OBJ_COMMON=-MD $(CXX_COMMON) -Iinclude $(PYTHON_INCLUDE) -w -fpermissive
|
||||
-LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB)
|
||||
@@ -98,7 +106,7 @@ Index: pythia8311/plugins/python/Makefile
|
||||
PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
|
||||
# Determine the headers.
|
||||
@@ -76,9 +80,15 @@ $(LOCAL_TMP)/%.o: $(LOCAL_SRC)/%.cpp $(L
|
||||
@@ -77,9 +81,15 @@ $(LOCAL_TMP)/%.o: $(LOCAL_SRC)/%.cpp $(L
|
||||
|
||||
# Build the library.
|
||||
$(TOP_LIB)/pythia8.so: $(PYTHIA) $(HEADERS) $(OBJECTS)
|
||||
@@ -111,13 +119,13 @@ Index: pythia8311/plugins/python/Makefile
|
||||
+ $(CXX_SONAME)$(notdir $@) $(LIB_COMMON) -L$(TOP_LIB)\
|
||||
+ -lpythia8 -Wl,-undefined,dynamic_lookup
|
||||
+endif
|
||||
|
||||
# Clean.
|
||||
clean:
|
||||
Index: pythia8311/examples/Makefile
|
||||
@mkdir -p $(TOP_LIB)/python
|
||||
if test -e $(LOCAL_EXTRA)/*.py; then\
|
||||
cp $(LOCAL_EXTRA)/*.py $(TOP_LIB)/python; fi
|
||||
Index: pythia8316/examples/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/examples/Makefile
|
||||
+++ pythia8311/examples/Makefile
|
||||
--- pythia8316.orig/examples/Makefile
|
||||
+++ pythia8316/examples/Makefile
|
||||
@@ -26,7 +26,7 @@ ifneq ("$(wildcard ../lib/libpythia8.*)"
|
||||
PREFIX_INCLUDE=../include
|
||||
endif
|
||||
@@ -126,4 +134,4 @@ Index: pythia8311/examples/Makefile
|
||||
+CXX_COMMON+= -L$(PREFIX_LIB) -lpythia8 -ldl
|
||||
PYTHIA=$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
|
||||
# Fix missing runtime paths from RIVET and determine C++ standard used.
|
||||
# Define additional dependency options.
|
||||
|
||||
145
pythia.changes
145
pythia.changes
@@ -1,3 +1,148 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 17 08:51:56 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 8.316:
|
||||
* The DIRE parton shower is no longer supported and consequently
|
||||
has been removed in this release.
|
||||
* The reorganization of fragmentation models, begun in 8.313,
|
||||
continues.
|
||||
* New code for the cross section of the production of t-tbar
|
||||
pairs in hadron collisions near the threshold, both above and
|
||||
below it.
|
||||
* New options to add non-singular and higher-order terms to the
|
||||
splitting kernels for timelike showers, along with a new
|
||||
example program main303.cc.
|
||||
* New options to regulate the running of alphaS in the infrared,
|
||||
by freezing it at a maximum value, and/or by shifting the
|
||||
argument by a number of order LambdaQCD.
|
||||
* Improved version of DIS kinematics reconstruction. Namely the
|
||||
lepton mass is appropriately accounted and phase-space cut for
|
||||
Q2min accounts also masses for final-state partons.
|
||||
* Introduction of parameters StringFragmentation:eJunctionCutoff
|
||||
and StringFragmentation:mJunctionCutoff allows for the
|
||||
modification of stopping conditions on the fragmentation of
|
||||
the first two junction legs.
|
||||
* The default value of StringFragmentation:stopMass has been
|
||||
changed from 1.0 GeV to 0.8 GeV, the same value as used in
|
||||
PYTHIA 6.4.
|
||||
* Added the Detroit tune (Agu22) to the list of available tune
|
||||
presets.
|
||||
* RandomState of the random-number generator is now saved before
|
||||
the generation of each event starts.
|
||||
* Support has been added for parallel running of plugins.
|
||||
* New RivetHooks plugin allows for Rivet analyses to be run via
|
||||
the plugin structure with Init:plugins =
|
||||
{libpythia8rivet.so::RivetHooks}, including in parallel.
|
||||
* The new plugin HepMC3Hooks allows users to write output to
|
||||
HepMC3 by loading.
|
||||
* Added the ability to include purely Pythonic code in the
|
||||
pythia8 Python module.
|
||||
* Updates to the Hist class:
|
||||
- Introduced new methods: getBinCenter(int iBin),
|
||||
getBinError(int iBin), and getBinError2(). Equivalent
|
||||
versions getBinCenters(), etc., return a vector of doubles
|
||||
for all bins.
|
||||
- Added an optional third argument to the Hist::fill() method,
|
||||
to allow for weighted uncertainties that are not purely
|
||||
stochastic. Thanks to Claire Bergman.
|
||||
- Added new method Hist::getXPercentile() to extract
|
||||
percentiles from histograms.
|
||||
- Added the method Hist::yodaTable to enable printing a Hist
|
||||
to the ESTIMATE1D_V3 format from YODA.
|
||||
* New particle data method(s) mSelInRange selects the mass of a
|
||||
particle according to a Breit-Wigner shape, but within a range
|
||||
that is determined event-by-event.
|
||||
* A small internal analysis of differential jet rates has been
|
||||
added to main164. Also, legacy HepMC2 support has been added
|
||||
to main164.
|
||||
* The SigmaTotal::calc(...) code has been rearranged so as to
|
||||
provide a clean abort when the energy is too low, rather than
|
||||
a segmentation fault.
|
||||
* Moved -pthread option to the Makefile.
|
||||
* Updated many of the references to now include hyperlinks to a
|
||||
publicly accessible version of the reference.
|
||||
* Fixed an issue where the post-hoc and in-situ flavor
|
||||
variations for hadronization, see Hadronization Variations,
|
||||
did not match if particle decays were turned on, as the
|
||||
in-situ weights did not account for flavor variations in the
|
||||
hadron decays.
|
||||
* Fixed a bug where tuning parameters are incorrectly loaded
|
||||
when specified inside a subrun in a .cmnd file.
|
||||
* Fix trial hadron generation in
|
||||
StringFragmentation::kinematicsHadronTmp used in the
|
||||
closepacking and thermal string breaking frameworks.
|
||||
* The introduction of StringZ:deriveLundPars inadvertently broke
|
||||
the behaviour for when only bLund is derived,
|
||||
StringZ:deriveLundPars = 1. This has now been fixed.
|
||||
* Fixed the spelling of the addAtribute method of the
|
||||
PythiaToHepMC class to addAttribute. Also, added a
|
||||
specialization for this method for integer attributes, as is
|
||||
already done for double attributes.
|
||||
* Fixed an issue with the toString helper method which formatted
|
||||
numbers greater than 1e+6 with an exponent ending in zero
|
||||
incorrectly, e.g. 1e+10 would be returned as "1e+1".
|
||||
* Fixed issue with Settings::readFile where for some systems an
|
||||
empty line could cause a std::out_of_range crash.
|
||||
* A bug was fixed that led to a pointer to the wrong
|
||||
ParticleData object when a Pythia object was created from the
|
||||
Settings and ParticleData of another Pythia instance.
|
||||
* Tiny cosmetic fix so that a total cross section is not
|
||||
attempted to be initialized if not both incoming particles are
|
||||
hadrons (or photons).
|
||||
- Minor rebase of patches for update:
|
||||
* pythia-honour-env-cxxflags.patch
|
||||
* pythia-remove-rpaths.patch
|
||||
- Split off new shared lib packages for new libraries:
|
||||
libpythia8hepmc3 and libpythia8rivet (for Leap 16 and newer).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 15 04:20:08 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 8.315:
|
||||
* Fix bug in the Lund symmetric fragmentation function (LSFF).
|
||||
It concerns the case where diquarks or strange quarks are
|
||||
assumed to be produced at a later average time than the up and
|
||||
down quarks.
|
||||
* Some changes in the Hidden Valley machinery. Several automatic
|
||||
rescalings of (safety) parameters and constants to allow a
|
||||
broader range of HV mass scales, including ones below the QCD
|
||||
one.
|
||||
* The prefix for custom weights can now be specified with the
|
||||
setting Weights:prefix which is by default empty.
|
||||
* The logic behind the construction of parton-shower histories
|
||||
in CKKW-L merging has been improved.
|
||||
* Fixed two bugs in PartonLevel.cc:
|
||||
- When checking if beams are point-like (to determine if ISR
|
||||
and beam remnants), a lepton check was not performed for the
|
||||
second beam (B).
|
||||
- An incorrect check was made when calculating maximum weights
|
||||
for FSR decays with W/Z.
|
||||
* Fixed a rare bug in StringFragmentation::setHadronVertices
|
||||
that caused a segmentation fault when the string endpoints are
|
||||
c or b quarks, and a quark mass offset correction is
|
||||
introduced.
|
||||
* Fixed typos in the documentation for Hadronization Variations
|
||||
that do not effect that results of Pythia.
|
||||
* Reverted beam particles back to raw pointers for technical
|
||||
reasons.
|
||||
* An incorrect type declaration in 8.314 invalidated the new
|
||||
option to derive the a and b parameters from the average and
|
||||
RMS width of the Lund FF, causing this option to fail for any
|
||||
choice of input parameters, corrected now.
|
||||
* Fixed a typo in the MPI initialization when using saved grid
|
||||
which caused an out-of-access memory read.
|
||||
- Minor re-base of reproducible.patch for update.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 24 07:49:27 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 8.313:
|
||||
* Too many changes to list, see https://pythia.org/history/.
|
||||
- Minor rebase of all patches for update.
|
||||
- Major rebase of pythia-examples-link-gmp.patch to apply against
|
||||
updated make file.
|
||||
- Revise disabled tests for %check.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 10 18:39:27 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
71
pythia.spec
71
pythia.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package pythia
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,10 +16,10 @@
|
||||
#
|
||||
|
||||
|
||||
%define ver 8311
|
||||
%define ver 8316
|
||||
%define soname lib%{name}8
|
||||
Name: pythia
|
||||
Version: 8.311
|
||||
Version: 8.316
|
||||
Release: 0
|
||||
Summary: A simulation program for particle collisions at very high energies
|
||||
License: GPL-2.0-or-later
|
||||
@@ -49,6 +49,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: rsync
|
||||
BuildRequires: pkgconfig(lhapdf)
|
||||
BuildRequires: pkgconfig(rivet)
|
||||
BuildRequires: pkgconfig(yoda)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%description
|
||||
@@ -89,11 +90,37 @@ incoming particles.
|
||||
This package provides the shared libraries for the lhapdf6 bindings of
|
||||
%{name}.
|
||||
|
||||
%package -n %{soname}hepmc3
|
||||
Summary: HepMC bindings for Pythia - a simulation program for particle collisions
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{soname}hepmc3
|
||||
Pythia can be used to generate high-energy-physics events, i.e. sets
|
||||
of outgoing particles produced in the interactions between two
|
||||
incoming particles.
|
||||
|
||||
This package provides the shared libraries for the HepMC bindings of
|
||||
%{name}.
|
||||
|
||||
%package -n %{soname}rivet
|
||||
Summary: Rivet bindings for Pythia - a simulation program for particle collisions
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{soname}rivet
|
||||
Pythia can be used to generate high-energy-physics events, i.e. sets
|
||||
of outgoing particles produced in the interactions between two
|
||||
incoming particles.
|
||||
|
||||
This package provides the shared libraries for the rivet bindings of
|
||||
%{name}.
|
||||
|
||||
%package devel
|
||||
Summary: Development package for Pythia - a simulation program for particle collisions
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{soname} = %{version}
|
||||
Requires: %{soname}hepmc3 = %{version}
|
||||
Requires: %{soname}lhapdf6 = %{version}
|
||||
Requires: %{soname}rivet = %{version}
|
||||
Recommends: %{name}-doc
|
||||
|
||||
%description devel
|
||||
@@ -125,22 +152,16 @@ rm include/Pythia8Plugins/MixMax.h
|
||||
# FIX EOF ENCODINGS
|
||||
sed -i 's/\r$//' share/Pythia8/pdfdata/mrstlostarstar.00.dat
|
||||
sed -i 's/\r$//' share/Pythia8/htmldoc/pythia.css
|
||||
sed -i 's/\r$//' examples/main29.cc
|
||||
|
||||
sed -E -i "s|%{_bindir}/env bash|/bin/bash|" examples/runmains
|
||||
|
||||
%build
|
||||
# FOR oS > 1320, "-std=c++14" IS NEEDED FOR BUILDING EXAMPLES
|
||||
# WITH FASTJET3 (WHICH ALREADY USES THIS STD)
|
||||
CXXFLAGS="%{optflags}"
|
||||
%if 0%{?suse_version} > 1320
|
||||
export CXXFLAGS="$CXXFLAGS -std=c++14"
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--prefix-lib=%{_libdir} \
|
||||
--prefix-share=%{_docdir}/%{name} \
|
||||
--enable-shared \
|
||||
--disable-rpath \
|
||||
--with-fastjet3 \
|
||||
--with-gzip \
|
||||
--with-hdf5 \
|
||||
@@ -184,17 +205,21 @@ sed -E -i "s|%{_bindir}/env bash|/bin/bash|" %{buildroot}%{_bindir}/pythia8-conf
|
||||
export ncpus=%(echo %{?_smp_mflags} | sed "s/^\-j//")
|
||||
pushd examples
|
||||
# SECTION Disabled examples:
|
||||
# 23: MixMax header deleted as it is non-free
|
||||
# 46, 48: Require evtgen which oS does not have packaged
|
||||
# 91, 92, 93: Require root6 which is not avaliable in Factory
|
||||
./runmains --skip="23 46 48 91 92 93" --threads="${ncpus}"
|
||||
## 114: needs yoda2
|
||||
## 136, 164: need highfive library
|
||||
## 141-143: need ROOT
|
||||
## 245: needs MixMax
|
||||
## 364: needs evtgen
|
||||
./runmains --skip="114 136 141 142 143 164 245 364" --threads="${ncpus}"
|
||||
# /SECTION
|
||||
popd
|
||||
|
||||
%post -n %{soname} -p /sbin/ldconfig
|
||||
%postun -n %{soname} -p /sbin/ldconfig
|
||||
%post -n %{soname}lhapdf6 -p /sbin/ldconfig
|
||||
%postun -n %{soname}lhapdf6 -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n %{soname}
|
||||
%ldconfig_scriptlets -n %{soname}lhapdf6
|
||||
%ldconfig_scriptlets -n %{soname}hepmc3
|
||||
%if 0%{?suse_version} >= 1600
|
||||
%ldconfig_scriptlets -n %{soname}rivet
|
||||
%endif
|
||||
|
||||
%files -n %{soname}
|
||||
%{_libdir}/%{soname}.so
|
||||
@@ -202,6 +227,14 @@ popd
|
||||
%files -n %{soname}lhapdf6
|
||||
%{_libdir}/%{soname}lhapdf6.so
|
||||
|
||||
%files -n %{soname}hepmc3
|
||||
%{_libdir}/%{soname}hepmc3.so
|
||||
|
||||
%if 0%{?suse_version} >= 1600
|
||||
%files -n %{soname}rivet
|
||||
%{_libdir}/%{soname}rivet.so
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS GUIDELINES CODINGSTYLE README
|
||||
%license COPYING
|
||||
@@ -210,7 +243,7 @@ popd
|
||||
%{_includedir}/Pythia8/
|
||||
%{_includedir}/Pythia8Plugins/
|
||||
%{_docdir}/%{name}/pdfdata/
|
||||
%{_docdir}/%{name}/settings/
|
||||
%{_docdir}/%{name}/tunes/
|
||||
%{_docdir}/%{name}/xmldoc/
|
||||
|
||||
%files doc
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2782d5e429c1543c67375afe547fd4c4ca0720309deb008f7db78626dc7d1464
|
||||
size 28757044
|
||||
3
pythia8316.tgz
Normal file
3
pythia8316.tgz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1d99301aafd6896b57435edd73850e53f368f0021a647b12cf25584d77313489
|
||||
size 30428099
|
||||
@@ -1,33 +1,47 @@
|
||||
a variant was sent via mail to phil...@cern.ch
|
||||
|
||||
Index: pythia8311/configure
|
||||
---
|
||||
Makefile | 7 +++----
|
||||
configure | 4 ++--
|
||||
2 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: pythia8315/configure
|
||||
===================================================================
|
||||
--- pythia8311.orig/configure
|
||||
+++ pythia8311/configure
|
||||
@@ -304,7 +304,7 @@ done
|
||||
--- pythia8315.orig/configure
|
||||
+++ pythia8315/configure
|
||||
@@ -296,7 +296,7 @@ function error() {
|
||||
################################################################################
|
||||
|
||||
# Check if help requested.
|
||||
-bold "Running PYTHIA configuration script. Now is `date`"
|
||||
+bold "Running PYTHIA configuration script"
|
||||
for VAR in "$@"; do
|
||||
if [ "$VAR" = "-h" ] || [ "$VAR" = "--h" ] || [ "$VAR" = "-help" ] \
|
||||
|| [ "$VAR" = "--help" ]; then
|
||||
@@ -307,7 +307,7 @@ done
|
||||
|
||||
# Parse the user arguments and evaluate each as a global variable.
|
||||
echo "# PYTHIA configuration file." > $CFG_FILE
|
||||
-echo "# Generated on" `date` "with the user supplied options:" >> $CFG_FILE
|
||||
+echo "# Generated with the user supplied options:" >> $CFG_FILE
|
||||
-echo "# Generated on" `date` "with the following command:" >> $CFG_FILE
|
||||
+echo "# Generated on with the following command:" >> $CFG_FILE
|
||||
USER_CFG=""
|
||||
for VAR in "$@"; do
|
||||
if [[ $OPTIONS =~ (^| )${VAR%%=*}($| ) ]]; then
|
||||
echo "# $VAR" >> $CFG_FILE;
|
||||
Index: pythia8311/Makefile
|
||||
if [[ $OPTIONS =~ (^| )${VAR%%=*}($| ) ]]; then USER_CFG+=" $VAR"
|
||||
Index: pythia8315/Makefile
|
||||
===================================================================
|
||||
--- pythia8311.orig/Makefile
|
||||
+++ pythia8311/Makefile
|
||||
@@ -128,11 +128,10 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW
|
||||
--- pythia8315.orig/Makefile
|
||||
+++ pythia8315/Makefile
|
||||
@@ -129,11 +129,10 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW
|
||||
$(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
$(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\
|
||||
$(CXX_SONAME)$(notdir $@) -Llib -lpythia8\
|
||||
-ifneq ($(DISABLE_RPATH),true)
|
||||
- -Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$*
|
||||
- -Wl,-rpath,../lib:$(POWHEG_DIR) -L$(POWHEG_DIR) -l$*
|
||||
-else
|
||||
+ ifneq($(DISABLE_RPATH),true)
|
||||
+ -Wl,-rpath,../lib:$(POWHEG_BIN)\
|
||||
+ endif
|
||||
-L$(POWHEG_BIN) -l$*
|
||||
+ ifneq ($(DISABLE_RPATH),true)
|
||||
+ -Wl,-rpath,../lib:$(POWHEG_DIR)\
|
||||
+ endif
|
||||
-L$(POWHEG_DIR) -l$*
|
||||
-endif
|
||||
$(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\
|
||||
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
||||
|
||||
Reference in New Issue
Block a user