Merge pull request #59 from MohitS704/MADMela

changes to make CircleCI work
JHUGen · Jul 11, 2024 · 38039b1 · 38039b1
2 parents 1c7fee8 + 6111489
commit 38039b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/MELA/data/retrieve.csh b/MELA/data/retrieve.csh
@@ -7,6 +7,12 @@ set LIB="lib$2.so"
 if (! -e "$LIB") then
   set filedir=`cat download.url`
   set MCFMfilename="$filedir$LIB"
-  set Madgraphfilename="$filedir"libMG_SMEFTsim_v1.so
-  wget --no-check-certificate -q "$MCFMfilename" "$Madgraphfilename"
+  wget --no-check-certificate -q "$MCFMfilename"
+endif
+
+set MADLIB="libMG_SMEFTsim_v$3.so"
+if (! -e "$MADLIB") then
+  set filedir=`cat download.url`
+  set Madgraphfilename="$filedir$MADLIB"
+  wget --no-check-certificate -q "$Madgraphfilename"
 endif
diff --git a/MELA/setup.sh b/MELA/setup.sh
@@ -38,6 +38,7 @@ cd $(dirname ${BASH_SOURCE[0]})
 
 MELADIR="$(readlink -f .)"
 MCFMVERSION=mcfm_710
+MGVERSION=1
 declare -i doDeps=0
 declare -i doPrintEnv=0
 declare -i doPrintEnvInstr=0
@@ -152,13 +153,13 @@ doenv () {
 }
 dodeps () {
   ${MELADIR}/COLLIER/setup.sh "${setupArgs[@]}"
-  tcsh ${MELADIR}/data/retrieve.csh ${MELA_ARCH} $MCFMVERSION
+  tcsh ${MELADIR}/data/retrieve.csh ${MELA_ARCH} $MCFMVERSION $MGVERSION
   ${MELADIR}/downloadNNPDF.sh
 }
 
 dodeps_nopy () {
   ${MELADIR}/COLLIER/setup.sh 
-  tcsh ${MELADIR}/data/retrieve.csh ${MELA_ARCH} $MCFMVERSION
+  tcsh ${MELADIR}/data/retrieve.csh ${MELA_ARCH} $MCFMVERSION $MGVERSION
   ${MELADIR}/downloadNNPDF.sh
 }