Skip to content
Snippets Groups Projects

ISFTruthIncident / ISF_Fatras - Improve robustness + fix warnings

Merged ISFTruthIncident / ISF_Fatras - Improve robustness + fix warnings
jchapman/athena:FixISFTruthIncident_main into main
Merged John Derek Chapman requested to merge jchapman/athena:FixISFTruthIncident_main into main

The changes in this merge request should finally fix the many warnings seen when running simulation using ISF_Fatras. There are two main sets of changes:

  1. ISFTruthIncident: Add methods to properly update ISFParticles after the Truth Incident has been registered with the TruthSvc. The ISFTruthIncident::updateHepMCTruthParticle() method was changed to only update the ISF::TruthBinding of the ISFParticle in question. This is because a valid (GenParticle::)id value and hence a valid HepMcParticleLink can only be obtained after a new GenParticle has been added to the GenEvent - this occurs within the TruthSvc, not within the ISFTruthIncident. Instead ISFTruthIncident::updateParentAfterIncidentProperties() and ISFTruthIncident::updateChildParticleProperties() can be called to sync up the ISFParticle properties after the call to TruthSvc::registerTruthIncident(). These handle all cases except the case where the parent particle survives the interaction, but is not recorded to the GenEvent (for a follow-up MR).
  2. Updates to ISF_Fatras classes (+ FastCaloSimV2Tool). All ISFParticles for secondaries created by Fatras should not have barcode/id/truthBinding/particleLink set initially. These should be set by the calls to TruthSvc::registerTruthIncident(), ISFTruthIncident::updateParentAfterIncidentProperties() and ISFTruthIncident::updateChildParticleProperties(). These calls should all be made before any particles are passed back to the ParticleBroker. No TruthBinding for secondaries should be set directly by the ISF_Fatras code. (NB For the special case of particles being returned to the ParticleBroker having not interacted, then the returned ISFParticle should have the same barcode/id/truthBinding/particleLink as the initial ISFParticle - this has to be set manually in the McMaterialEffectsUpdator code.

(Note to review shifters - it's probably best to review this with whitespace changes switched off. The ISF_Fatras classes need a larger clean-up, but that is beyond the scope of this merge request.)

Edited by John Derek Chapman

Merge request reports

Pipeline #7402394 passed

Stage: external

    Pipeline passed for 4d256831 on jchapman:FixISFTruthIncident_main

    Approval is optional

    All merge request dependencies have been merged (1 merged)

    Merged by Tadej NovakTadej Novak 10 months ago (May 17, 2024 2:34pm UTC)

    Merge details

    • Changes merged into main with 8cf6243e (commits were squashed).
    • Deleted the source branch.

    Activity

    Filter activity
    • Approvals
    • Assignees & reviewers
    • Comments (from bots)
    • Comments (from users)
    • Commits & branches
    • Edits
    • Labels
    • Lock status
    • Mentions
    • Merge request status
    • Tracking
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash bf6fd2ed)

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    tests :o: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 9692] (remote access info)

  • John Derek Chapman added 14 commits

    added 14 commits

    • bf6fd2ed...cf502a7a - 4 commits from branch atlas:main
    • 1692dfb6 - ISF_Fatras: fix status values for secondaries produced by ISF_Fatras
    • 9ecf2e29 - ISFTruthIncident: Improvements to properly update ISFParticles after the Truth...
    • b7b57d1d - Use new ISFTruthIncident methods in clients
    • b5b874f0 - ISF_Fatras - attempt to fix registration of TruthIncidents
    • cc1da682 - Only update parent ISFParticle properties if it survives the TruthIncident
    • d3f396e8 - fix compilation issues
    • 28325e15 - Add new TruthBinding::childTruthBinding method to simplify creating...
    • fede7573 - G4ParticleDecayHelper - do not add TruthBindings to child particles before...
    • f573d92d - Debugging changes
    • 1531bb26 - More debugging changes

    Compare with previous version

    Toggle commit list
  • John Derek Chapman
    John Derek Chapman @jchapman ·
    Author Owner

    Jenkins please retry a build

  • John Derek Chapman added 17 commits

    added 17 commits

    • 1531bb26...4c7dc894 - 8 commits from branch atlas:main
    • cacab74c - ISFTruthIncident: Improvements to properly update ISFParticles after the Truth...
    • 07a5d4bf - Use new ISFTruthIncident methods in clients
    • 57539f07 - ISF_Fatras - attempt to fix registration of TruthIncidents
    • b3c90eb8 - Only update parent ISFParticle properties if it survives the TruthIncident
    • 2ada1650 - fix compilation issues
    • 71c45fee - Add new TruthBinding::childTruthBinding method to simplify creating...
    • 0ecff346 - G4ParticleDecayHelper - do not add TruthBindings to child particles before...
    • a84fdbb1 - Debugging changes
    • 0b017e20 - More debugging changes

    Compare with previous version

    Toggle commit list
  • John Derek Chapman
    John Derek Chapman @jchapman ·
    Author Owner

    Jenkins please retry a build

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 5 packages:

    • Simulation/ISF/ISF_Core/ISF_Event
    • Simulation/ISF/ISF_Core/ISF_Services
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices
    • Simulation/ISF/ISF_Fatras/ISF_FatrasTools
    • Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4

    Affected files list will not be printed in this case

    Adding @lmijovic ,@tadej ,@jchapman ,@zhangr ,@tcuhadar ,@schaarsc ,@jbeirer as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: :scissors: CI integration tests for projects Athena,AthSimulation are cancelled because of compilation error(s)

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 0b017e20)

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :o:
    tests :o: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :o: Athena: number of compilation errors 1, warnings 2
    :o: AthSimulation: number of compilation errors 1, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 9702] (remote access info)

  • John Derek Chapman added 5 commits

    added 5 commits

    • 587b14ba - Add new TruthBinding::childTruthBinding method to simplify creating...
    • 2154d4eb - Use new TruthBinding::childTruthBinding method in ISF_Fatras classes
    • 70656351 - G4ParticleDecayHelper - do not add TruthBindings to child particles before...
    • 0f01abc7 - Debugging changes
    • 9a3c4534 - More debugging changes

    Compare with previous version

    Toggle commit list
  • John Derek Chapman added 10 commits

    added 10 commits

    • deb9b84c - Add new TruthBinding::childTruthBinding method to simplify creating...
    • e7615fd7 - ISFTruthIncident: Improvements to properly update ISFParticles after the Truth...
    • f5e16c72 - Use new ISFTruthIncident methods in clients
    • e1965b14 - ISF_Fatras - attempt to fix registration of TruthIncidents
    • 9e92f1e7 - Only update parent ISFParticle properties if it survives the TruthIncident
    • 91583b2d - fix compilation issues
    • 67c7eb30 - Use new TruthBinding::childTruthBinding method in ISF_Fatras classes
    • 0a820abf - G4ParticleDecayHelper - do not add TruthBindings to child particles before...
    • c5b42d05 - Debugging changes
    • 7192b01c - More debugging changes

    Compare with previous version

    Toggle commit list
  • John Derek Chapman removed Run3-AF3-output-changed label

    removed Run3-AF3-output-changed label

  • John Derek Chapman
    John Derek Chapman @jchapman ·
    Author Owner

    Jenkins please retry a build

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
    • Please register or sign in to reply