Merge branch 'develop' into feature/blip_changeto_simide

Author: nathanielerowe

sbndcode/Geometry/gdml/sbnd_v02_06.gdml

@@ -53,8 +53,8 @@
 
 BEGIN_PROLOG
 
-sbnd_geometry_file: "sbnd_v02_05.gdml"
-sbnd_geometry_file_nowires: "sbnd_v02_05_nowires.gdml"
+sbnd_geometry_file: "sbnd_v02_06.gdml"
+sbnd_geometry_file_nowires: "sbnd_v02_06_nowires.gdml"
 
 
 #

sbndcode/Geometry/gdml/sbnd_v02_06_base.gdml

@@ -318,7 +318,7 @@ sbnd_genie_simple_rockbox: {
   # As we are changing the FV we need to recalculate the maximum path lengths
   # This file was generated by running with:
   # GeomScan: "flux: 10000 1.1 1"
-  GeomScan: "file: GENIE/sbnd_rock_maxpathlength_fluxL_gdmlv02_05.xml"
+  GeomScan: "file: GENIE/sbnd_rock_maxpathlength_fluxL_gdmlv02_06.xml"
 }
 
 # Rotated bucket configuration

sbndcode/Geometry/gdml/sbnd_v02_06_nowires.gdml

@@ -145,7 +145,7 @@ base {
     },
 
     files: {
-        wires: "sbnd-wires-geometry-v0202.json.bz2", // new SBND geometry
+        wires: "sbnd-wires-geometry-v0206.json.bz2", // new SBND geometry
 
         fields: [ "garfield-sbnd-v1.json.bz2" ],
 

sbndcode/Geometry/geometry_sbnd.fcl

@@ -3,6 +3,11 @@
 # with the exception of the ones listed in this file.
 #
 
+# Skip for BNB Flux see discussion on PR#854
+set_flux_rhc.fcl
+set_flux_fhc_g4bnb.fcl
+set_flux_beamdump.fcl
+
 # GENIE Configuration fhicls
 set_flux_config_b.fcl
 set_flux_config_c.fcl

sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl

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