Skip to content
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.

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

Refactor reco2 workflow, and promote standard_reco2_sbnd.fcl back to the main workflow again #528

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from

Conversation

absolution1
Copy link
Contributor

Description

This PR refactors reco2, reusing the fcl organisation defined in PR: #460
This PR

  • Cleans up the reco2 fcls
  • Promotes standard_reco2_sbnd.fcl back to the main workflow
  • Removes reco2_sce.fcl entirely and updates any dependencies to point to standard_reco2_sbnd.fcl

The original and reorganised fcls have been diff'd to check nothing has substantially changed. There is a minor change in the number of dropped products (more are dropped now). These are earlier stage products already dropped by reco1, so this is a benign change. All other diffs are fcl-bookkeeping that should not affect the output (e.g. sequence names changing from reco2_sce to reco2. I have attached the diffs, for completeness.

I've picked an assortment of reviewers, I'm not anticipating/expecting everyone actually looks.

Checklist

  • Added at least 1 label from available labels.
  • Assigned at least 1 reviewer under Reviewers,
  • Assigned all contributers including yourself under Assignees
  • Linked any relevant issues under Developement
  • Does this PR affect CAF data format? If so, please assign a CAF maintainer (PetrilloAtWork or JosiePaton) as additional reviewer.
  • Does this affect the standard workflow?

reco2_data_diff.txt
reco2_diff.txt

Copy link
Member

@marcodeltutto marcodeltutto left a comment

Choose a reason for hiding this comment

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

Looks great, thanks @absolution1!

One thing we should probably pay attention to is to make sure that all our fcls end with _sbnd.fcl to make sure there's no conflict if there's a similar fcl in sbncode or even icaruscode in case people set up icaruscode in parallel.

Copy link
Member

@henrylay97 henrylay97 left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thank you so much for doing this work @absolution1!

, fmatcharaSCE
, fmatchoparaSCE
, opt0finderSCE
]
Copy link
Member

Choose a reason for hiding this comment

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

I'm just going to mention here that we've often talked about moving a lot of the producers currently run in the CAF stage into reco2 (CRUMBS, stubs, the MCS tool, the PID BDTs etc).

This shouldn't be part of this PR as this is meant to reorganise whilst maintaining behaviour. But now that this workflow fcl is nice & clean, we should look at doing this soon.

Comment on lines +16 to +20
# FIXME The following services are temporarily included here to test tht the workflow is unchanged
LArFFT: @local::sbnd_larfft
SignalShapingServiceSBND: @local::sbnd_signalshapingservice
BackTrackerService: @local::sbnd_backtrackerservice
ParticleInventoryService: @local::sbnd_particleinventoryservice
Copy link
Member

Choose a reason for hiding this comment

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

And the longer term plan would be to move these into a table?

Copy link
Contributor

@bear-is-asleep bear-is-asleep left a comment

Choose a reason for hiding this comment

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

Looks good, we all appreciate your hard work doing this! My only comment was to follow the naming convention in the commissioning folder established by the previous reco1 refactor PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

As with the reco1 changes, the name should be reco2_comm.fcl

@@ -1,8 +1,11 @@
# SBND Core FHiCL Files

4th October 2024 (Dom Brailsford)
`standard_reco2_sbnd.fcl` has been promoted back to an up-to-date fcl and has rejoined the standard workflow
Copy link
Contributor

Choose a reason for hiding this comment

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

Might be good to explicitly mention that sce is now included in standard_reco2_sbnd.fcl for completion/documentation sake here!

outputs.out1.dataTier: "reconstructed"
outputs.out1.outputCommands: [@sequence::outputs.out1.outputCommands, @sequence::sbnd_reco2_drops]

#FIXME permanently enable SCE in a service rather than override specific params in this way...
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe we can delete this #FIXME line now since it looks like enabling SCE is through a service?

Copy link
Member

Choose a reason for hiding this comment

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

I think Dom just means make it the default right? Rather than overrides at the bottom?

Copy link
Contributor

@lynnt20 lynnt20 left a comment

Choose a reason for hiding this comment

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

thank you @absolution1!! this looks great 😄 just left some very minor comments!

This was referenced Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants