Merge pull request #888 from SBNSoftware/bugfix/linyan_g4bnb_v1_1_1

Update g4bnb versions & add back the bypassed version check

Author: nathanielerowe

sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl

@@ -236,7 +236,7 @@ sbnd_flux_g4bnb_1_0_0_fhc: {
   FluxType:         "dk2nu"
   DetectorLocation: "SBND"
   FluxCopyMethod:   "DIRECT"
-  FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.0/fhc/a/"
+  FluxSearchPaths: "/cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.1/fhc/a/"
   FluxFiles: [ "NuBeam_production_BooNE_50m_I174000A_*.dk2nu.root" ]
 }
 
@@ -385,7 +385,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_fluxG4_gdmlv02_06.xml"
+  GeomScan: "file: GENIE/sbnd_rock_maxpathlength_fluxG4v1.1.1_gdmlv02_06.xml"
 }
 
 # Rotated bucket configuration

test/GENIE/check_genie_geom_scan.py

@@ -7,7 +7,7 @@
 #
 pset_geom_scan = pset['physics']['producers']['generator']['GeomScan']
 
-geom_scan_flux_config = pset_geom_scan.split('flux')[1][:2]
+geom_scan_flux_config = pset_geom_scan.split('fluxG4v')[1][:5]
 geom_scan_gdml_version = pset_geom_scan.split('gdml')[1][:6]
 
 print('Using GeomScan file:', pset_geom_scan)
@@ -22,18 +22,18 @@
 pset_flux = pset['physics']['producers']['generator']['FluxSearchPaths']
 print('Using:', pset_flux, pset_gdml)
 
-#flux_config = pset_flux.split('config')[1][0]
+flux_config = pset_flux.split('G4BNB/v')[1][:5]
 gdml_version = pset_gdml.split('sbnd_')[1][:6]
 
 print('\t -> gdml version:', gdml_version)
-#print('\t -> flux configuration:', flux_config)
+print('\t -> flux configuration:', flux_config)
 
 #
 # Check that the two are the same, if not, need to regenerate the GeomScan file
 #
 message = 'Please regenerate the GeomScan file. Instructions are in fcl file make_genie_geomscan_file_sbnd.fcl.'
 
-#assert geom_scan_flux_config == flux_config, f"Have you updated/changed the flux files? {message}"
+assert geom_scan_flux_config == flux_config, f"Have you updated/changed the flux files? {message}"
 
 assert geom_scan_gdml_version == gdml_version, f"Have you updated/changed the GDML file? {message}"
 

ups/product_deps

@@ -326,7 +326,7 @@ end_qualifier_list
 ####################################
 table_fragment_begin
     # currently, XML pandora files are installed in 'scripts':
-    pathPrepend(GDK2NUFLUXXML, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/v1.1.0/GNuMIFlux.xml)
+    pathPrepend(GDK2NUFLUXXML, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash/fluxFiles/bnb/G4BNB/GNuMIFlux.xml)
     pathPrepend(FW_SEARCH_PATH, ${SBNDCODE_DIR}/scripts)
     pathPrepend(FW_SEARCH_PATH, ${SBND_DATA_DIR}/CalibrationDatabase)
     pathPrepend(FW_SEARCH_PATH, /cvmfs/sbnd.osgstorage.org/pnfs/fnal.gov/usr/sbnd/persistent/stash)