diff --git a/aligenmc b/aligenmc index 00f4d71..0937181 100755 --- a/aligenmc +++ b/aligenmc @@ -68,6 +68,7 @@ par_k() { par_K() { help "set ktmax" + setvar KTMAX } # initialisation diff --git a/gen/herwig/gen.sh b/gen/herwig/gen.sh index dbef7cc..5bf3deb 100644 --- a/gen/herwig/gen.sh +++ b/gen/herwig/gen.sh @@ -24,7 +24,7 @@ gen_herwig(){ run_in_env 'Herwig --repo=${HERWIG_ROOT}/share/Herwig/HerwigDefaults.rpo read herwig.in' > setup.log fi - run_in_env 'Herwig --repo=${HERWIG_ROOT}/share/Herwig/HerwigDefaults.rpo run herwig.run -N ${NEV} --seed ${SEED}' > hwgen.log + run_in_env 'Herwig --repo=${HERWIG_ROOT}/share/Herwig/HerwigDefaults.rpo run herwig.run -N ${NEV} --seed=${SEED}' > hwgen.log ;; *) help "Herwig 7" diff --git a/gen/herwig/generate_hwgin.py b/gen/herwig/generate_hwgin.py index 5996e72..b97e37d 100644 --- a/gen/herwig/generate_hwgin.py +++ b/gen/herwig/generate_hwgin.py @@ -112,10 +112,10 @@ def GenerateHerwigInput(outputfile, tune, cmsenegy, events, hepmcfile, ktmin, kt # - Omega (3334) # Also set corresponding antiparticles to stable stableparticles = ["K0", "Kbar0", "Lambda0", "Lambdabar0", "Sigma0", "Sigmabar0", - "Sigma+", "Sigmabar-", "Sigma-", "Sigmabar+", "Xi0", "Xibar0" + "Sigma+", "Sigmabar-", "Sigma-", "Sigmabar+", "Xi0", "Xibar0", "Xi-", "Xibar+", "Omega-", "Omegabar+"] for particle in stableparticles: - myfile.write("set /Herwig/Particle/{}:Stable Stable".format(particle)) + myfile.write("set /Herwig/Particles/{}:Stable Stable\n".format(particle)) # In addition: stable particles with a lifetime > 10 mm (decay externally) myfile.write("set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm\n") diff --git a/lib/tools.sh b/lib/tools.sh index b3b7ce9..35c5cac 100644 --- a/lib/tools.sh +++ b/lib/tools.sh @@ -27,6 +27,6 @@ run_in_env() { fi # alienv setenv ${GEN_PACKAGES} -c "$*" else - /bin/bash -c "$*" + (eval $*) fi }