Fix issue where caching leads to DVMP samples to not be re-generated when the...

Fix issue where caching leads to DVMP samples to not be re-generated when the requested number of events changes.

dvmp/dvmp.sh

@@ -51,7 +51,7 @@ source config/env.sh
 source dvmp/env.sh
 
 ## Get a unique file names based on the configuration options
-GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${DECAY}.hepmc
+GEN_FILE=${INPUT_PATH}/gen-${CONFIG}_${DECAY}_${JUGGLER_N_EVENTS}.hepmc
 
 SIM_FILE=${TMP_PATH}/sim-${CONFIG}_${DECAY}.root
 SIM_LOG=${TMP_PATH}/sim-${CONFIG}_${DECAY}.log

dvmp/gen.sh

@@ -46,7 +46,7 @@ source config/env.sh
 source dvmp/env.sh
 
 ## Get a unique file name prefix based on the configuration options
-GEN_TAG=gen-${CONFIG}_${DECAY}        ## Generic file prefix
+GEN_TAG=gen-${CONFIG}_${DECAY}_${JUGGLER_N_EVENTS} ## Generic file prefix
 
 ## =============================================================================
 ## Step 2: Check if we really need to run, or can use the cache.

util/run_many.py

@@ -117,7 +117,7 @@ if __name__ == '__main__':
         ## check if we all exited nicely, else exit with status 1
         if not all(ret == 0 for ret in return_values):
             n_fail = sum([1 for ret in return_values if ret != 0])
-            print('ERROR, {} of {} jobs failed'.format(n_fail))
+            print('ERROR, {} of {} jobs failed'.format(n_fail, len(cmds)))
             print('Return values:', [ret for ret in return_values if ret != 0])
             exit(1)