Skip to content

Update g4bnb versions & add back the bypassed version check #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nathanielerowe merged 5 commits into from
Dec 18, 2025
Merged

Update g4bnb versions & add back the bypassed version check #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cafa64
Update g4bnb versions & add back the bypassed version check
linyan-w Dec 3, 2025
2dad843
Merge branch 'develop' into bugfix/linyan_g4bnb_v1_1_1
nathanielerowe Dec 11, 2025
fdf1097
Fix path to the xml file
linyan-w Dec 11, 2025
49bb776
Merge branch 'bugfix/linyan_g4bnb_v1_1_1' of github.com:SBNSoftware/s…
linyan-w Dec 11, 2025
8c17663
Merge branch 'develop' into bugfix/linyan_g4bnb_v1_1_1
nathanielerowe Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sbndcode/LArSoftConfigurations/gen/genie_sbnd.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/GENIE/check_genie_geom_scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion ups/product_deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down