Update dis

Update the CI scripts for the DIS stub to be consistent with the more generic DVMP scripts. Also did some more restructuring of the benchmark to make it easier to split off a generic benchmark library in the future.

benchmarks/dvmp/gen.sh

@@ -27,11 +27,6 @@ pushd ${PROJECT_ROOT}
 export REQUIRE_DECAY=1
 source util/parse_cmd.sh $@
 
-echo "DEBUGDEBUGDEBUG"
-pwd
-ls config
-echo "DEBUGDEBUGDEBUG"
-
 ## To run the generator, we need the following global variables:
 ##
 ## - LOCAL_PREFIX:      Place to cache local packages and data
@@ -78,7 +73,7 @@ elif [ $DECAY = "muon" ]; then
 fi
 
 ## generate the config file for this generator setup
-CONFIG_IN="${BENCHMARK_TAG}/generator/${CONFIG}.json.in"
+CONFIG_IN="benchmarks/${BENCHMARK_TAG}/generator/${CONFIG}.json.in"
 echo "Creating generator configuration file ${GEN_TAG}.json"
 if [ ! -f ${CONFIG_IN} ]; then
   echo "ERROR: cannot find master config file ${CONFIG_IN}"