Merge branch 'develop' into features/linyan_recodrop

Author: nathanielerowe

test/ci/ci_tests.cfg

@@ -342,7 +342,7 @@ INPUT_STAGE_NAME=detsim
 NEVENTS=2
 # calibrated on sbndbuild01.fnal.gov on 20180306
 cpu_usage_range=200:1000
-mem_usage_range=1000000:3000000
+mem_usage_range=1000000:3300000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)ssingle_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -1004,7 +1004,7 @@ testlist=nucosmics_seq_test_sbndcode
 STAGE_NAME=decoders
 NEVENTS=2
 cpu_usage_range=0:200
-mem_usage_range=1200000:1350000
+mem_usage_range=1100000:1350000
 
 script=%(EXPSCRIPT_SBNDCODE)s
 FHiCL_FILE=%(CI_FHICL_PREFIX_SBNDCODE)sdata_offBeamZeroBias_%(STAGE_NAME)s_quick_test_sbndcode.fcl
@@ -1062,7 +1062,7 @@ output1=%(TFILENAME)s
 STAGE_NAME=caf
 INPUT_STAGE_NAME=reco2
 NEVENTS=5
-cpu_usage_range=200:1000
+cpu_usage_range=100:1000
 mem_usage_range=1000000:3000000
 
 script=%(EXPSCRIPT_SBNDCODE)s

ups/product_deps

@@ -255,7 +255,7 @@ wpdir   product_dir     wire-cell-cfg
 product		version		qual	flags		<table_format=2>
 sbncode		v10_06_00_01       -
 cetmodules	v3_24_01	-	only_for_build
-sbnd_data	v01_32_00	-	
+sbnd_data	v01_33_00	-	
 sbndutil        v10_06_01    -       optional
 fhiclpy		v4_03_05    -
 end_product_list