Skip to content

Conversation

@brucehoward-physics
Copy link
Contributor

@brucehoward-physics brucehoward-physics commented Feb 18, 2024

Cherry-picking in what I think are the relevant commits from Gray's feature branch used in the reprocessing.

A few minor edits where necessary to resolve a cherry-pick conflict may be present.

NOTES

FROM SBNCODE, pulling in Gray’s updates that took one from v09_72_00_03 -> feature/gputnam-configs EXCEPT:

  • The various merge commits themselves
  • The commits related to JZennamo and JLarkin features which only changed BeamRetriever (those should already be on the _06 release…)
  • The commits related to JKim feature which is included in another PR made against 2023A_NuMI: Also skipping e2a5cd8 which just updates systematicstools and nusystematics versions
  • The other merge on this feature is the following, which seems to bring in g4 (should compare to what’s in that issue marked elsewhere):


commit 7a40e9e
Merge: cbc6213 192a028
Author: gputnam {redacted}
Date: Sat Oct 21 20:47:52 2023 -0500

Merge branch 'gray_g4rwgt' into feature/gputnam-configs

  • The updated set captures the changes on top of the original v09_72_00_03 including g4 stuff, bumping sbndata up to v01_05, stub change, MCS updates, MeV Prtl stuff, calibration ntuples thing, using the T0s info when possible (I think for cosmics IIRC, update by Guadalupe in Gray’s area), filling trigger info… NOTE: the trigger info commit says “Allow time shift in trigger to IFBeam timing. Skip first event in stream in each run.” —> However, this commit seems to just add some extra fields getting filled in the CAFs more than changing anything. :

CMakeLists.txt
fcl/caf/cafmaker_common_defs.fcl
sbncode/CAFMaker/CAFMaker_module.cc
sbncode/CAFMaker/FillTrigger.cxx
sbncode/Calibration/TrackCaloSkimmer_module.cc
sbncode/EventGenerator/MeVPrtl/Tools/ALP/Meson2ALP_tool.cc
sbncode/LArRecoProducer/LArReco/TrajectoryMCSFitter.cxx
sbncode/LArRecoProducer/LArReco/TrajectoryMCSFitter.h
sbncode/LArRecoProducer/mcsproducer.fcl
sbncode/LArRecoProducer/mcsproducer_icarus.fcl
sbncode/SBNEventWeight/App/CMakeLists.txt
sbncode/SBNEventWeight/CMakeLists.txt
sbncode/SBNEventWeight/Calculators/CMakeLists.txt
sbncode/SBNEventWeight/Calculators/Geant4/BetheBlochForG4ReweightValid.h
sbncode/SBNEventWeight/Calculators/Geant4/CMakeLists.txt
sbncode/SBNEventWeight/Calculators/Geant4/Geant4WeightCalc.cxx
sbncode/SBNEventWeight/jobs/CMakeLists.txt
sbncode/SBNEventWeight/jobs/geant4/CMakeLists.txt
sbncode/SBNEventWeight/jobs/geant4/eventweight_geant4_sbn.fcl
sbncode/SBNEventWeight/jobs/geant4/piminus_reweight_parameters.fcl
sbncode/SBNEventWeight/jobs/geant4/piplus_reweight_parameters.fcl
sbncode/SBNEventWeight/jobs/geant4/proton_reweight_parameters.fcl
sbncode/TPCReco/VertexStub/config/sbn_stub_merge_tools.fcl
ups/product_deps

jedori0228 and others added 20 commits June 2, 2023 12:25
SBNEventWeight differences. Also make some adjustments to get it to build
against geant4reweight v01_00_03e -q e20:s117:prof
* Placeholder for sampled parameter storage, for CAF compatibility.
* Renamed fcl for consistency
…pdate_v09_72_00_03' into feature/howard_forNuMI2023A_from_gputnam-configs
@brucehoward-physics
Copy link
Contributor Author

Merged Jaesung's feature branch into this -- this will facilitate testing and makes it slightly easier/fewer things.

…mInCAFsForG4Study_v09_72_00_06' into feature/howard_forNuMI2023A_from_gputnam-configs
@brucehoward-physics
Copy link
Contributor Author

And merged Jaesung's saving of all true particles from the interaction in interaction truth not just the main primaries to G4...

Comment on lines +473 to +475
//if(part.start_process == caf::kG4primary) srneutrino.prim.push_back(part);
// Feb. 15th 2024, Jaesung Kim: Saving non-primaries for G4Reweight study
srneutrino.prim.push_back(part);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve this change :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @brucehoward-physics.
Isn't this going to add on every neutrino event the whole GEANT4 history of particles, from the lepton the neutrino turned into down to the last electron of a showering pion?

Copy link
Member

@PetrilloAtWork PetrilloAtWork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure the question about the dependency version was sorted, but I let that to the release managers, since I am sure I don't know all it's needed to positively contribute.
The rest is good, provided that it stays in special branches (I am thinking mostly of the potential increase in CAF data volume, which we would need to discuss before bringing to the generic production).

@miquelnebot
Copy link
Contributor

trigger build

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for c14:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase build ICARUS on slf7 for c14:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e26:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase build ICARUS on slf7 for e26:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase build ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build ICARUS phase logs

parent CI build details are available through the CI dashboard

@brucehoward-physics
Copy link
Contributor Author

Sorry for the complexity here @miquelnebot :( -- This will depend on

SBNSoftware/sbnobj#105 (Calo Skimmer stuff)

as well as

SBNSoftware/sbnanaobj#126 (SRTrigger updates)

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase build ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase build ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase ci_tests ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the ci_tests ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for ICARUS Failed at phase ci_tests ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the ci_tests ICARUS phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

✔️ CI build for LArSoft Succeeded on slf7 for e20:prof -- details available through the CI dashboard

@FNALbuild
Copy link

❌ CI build for SBND Failed at phase build SBND on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the failed phase, check the build SBND phase logs

parent CI build details are available through the CI dashboard

@FNALbuild
Copy link

⚠️ CI build for ICARUS Warning at phase ci_tests ICARUS on slf7 for e20:prof -- details available through the CI dashboard

🚨 For more details about the warning phase, check the ci_tests ICARUS phase logs

parent CI build details are available through the CI dashboard

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

NuMI XSec 2024 Updated Production Patch: Updated MCS NuMI XSec 2024 Analysis: Geant4Reweight old release availability with an e20 build

9 participants