Merge pull request #40 from lk11235/master

Updating ResonancePropagatorScheme and Adding new gcc10 compiled MCFM library
JHUGen · Dec 21, 2023 · 20ca0fb · 20ca0fb
2 parents b9964e2 + b2c27ac
commit 20ca0fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/MELA/interface/TVar.hh b/MELA/interface/TVar.hh
@@ -118,7 +118,8 @@ namespace TVar{
     NoPropagator=0,
     RunningWidth=1,
     FixedWidth=2,
-    CPS=3
+    CPS=3,
+    AltRunningWidth=4
   };
 
   enum Process{

diff --git a/MELA/setup.sh b/MELA/setup.sh
@@ -53,9 +53,6 @@ nSetupArgs=${#setupArgs[@]}
 # If CMS SCRAM_ARCH is set as an environment variable and it is present in data/,
 # use SCRAM_ARCH as MELA_ARCH.
 mela_arch=$(getMELAARCH)
-if [[ ! -z "${SCRAM_ARCH+x}" ]] && [[ -d ${MELADIR}/data/${SCRAM_ARCH} ]]; then
-  mela_arch=${SCRAM_ARCH}
-fi
 mela_lib_path="${MELADIR}/data/${mela_arch}"
 
 if [[ -z "${ROOFITSYS+x}" ]] && [[ $doDeps -eq 0 ]]; then