Merge pull request cms-sw#3695 from danbarto/fix_patching

Moving user-specific patching to after extramodel download

bin/MadGraph5_aMCatNLO/gridpack_generation.sh

@@ -190,11 +190,6 @@ make_gridpack () {
       cd $MGBASEDIRORIG
       cat $PRODHOME/patches/*.patch | patch -p1
       cp -r $PRODHOME/PLUGIN/CMS_CLUSTER/ PLUGIN/ 
-      # Intended for expert use only!
-      if ls $CARDSDIR/${name}*.patch; then
-        echo "    WARNING: Applying custom user patch. I hope you know what you're doing!"
-        cat $CARDSDIR/${name}*.patch | patch -p1
-      fi
 
       # Copy bias module (cp3.irmp.ucl.ac.be/projects/madgraph/wiki/LOEventGenerationBias)
       # Expected structure: 
@@ -303,6 +298,14 @@ make_gridpack () {
         set +u
         if [ "${BASH_SOURCE[0]}" != "${0}" ]; then return 0; else exit 0; fi
       fi
+
+      cd $MGBASEDIRORIG
+      # Intended for expert use only!
+      if ls $CARDSDIR/${name}*.patch; then
+        echo "    WARNING: Applying custom user patch. I hope you know what you're doing!"
+        cat $CARDSDIR/${name}*.patch | patch -p 1
+      fi
+      cd $WORKDIR
 
       echo `pwd`