From 3cafa64aefb2fa795923d7890868275b1b3bbd72 Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Wed, 3 Dec 2025 10:37:05 -0600 Subject: [PATCH 1/2] Update g4bnb versions & add back the bypassed version check --- sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl | 4 ++-- test/GENIE/check_genie_geom_scan.py | 8 ++++---- ups/product_deps | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl b/sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl index 61bddbc90..7e3d8fabc 100644 --- a/sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl +++ b/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 diff --git a/test/GENIE/check_genie_geom_scan.py b/test/GENIE/check_genie_geom_scan.py index 98e9ed199..7e3dd1697 100644 --- a/test/GENIE/check_genie_geom_scan.py +++ b/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}" diff --git a/ups/product_deps b/ups/product_deps index 8527c3080..43a3c3918 100644 --- a/ups/product_deps +++ b/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/v1.1.1/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) From fdf10976f63e0718a2cf870ac09350fc775964ca Mon Sep 17 00:00:00 2001 From: Linyan Wan Date: Thu, 11 Dec 2025 17:29:25 -0600 Subject: [PATCH 2/2] Fix path to the xml file --- ups/product_deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ups/product_deps b/ups/product_deps index 43a3c3918..1365298a1 100644 --- a/ups/product_deps +++ b/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.1/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)