CAFMaker changes to accomodate for Pandora track/shower discrimination changes

[rtriozzi]

This PR changes the CAFMaker (particularly, FillPFPVars) to accomodate for changes to the track/shower discrimination scheme. In the updated Pandora track/shower discrimination module, the ConeChargeFeatureTool_ICARUS and ThreeDChargeFeatureTool_ICARUS tools are introduced. The names of the corresponding BDT tools in the CAFMaker need to be updated to pick up the right variables.

---

Dependency

This PR depends on icaruscode PR #840, which updates the Pandora XML and introduces the two new track/shower discrimination tools. The corresponding icaruscode PR contains all the information on the change.

---

Review

Tagging for review:

• @brucehoward-physics and @cerati as reconstruction experts and shower reconstruction task force conveners, and reviewers of the corresponding icaruscode PR;
• @PetrilloAtWork to approve of CAF changes.

Also tagging @acampani as assignee.

Thanks!

[PetrilloAtWork]

One more problem. 😳

[PetrilloAtWork]

Good to go from my side.

[kjplows]

Hi @rtriozzi, could you please merge in develop to your feature branch and check the merge preserves the features you want? Thanks.

@brucehoward-physics, is the PR good to go from your side?

[brucehoward-physics]

This looks pretty good to me, I think just some of the default names need to be modified. Just a check: has someone verified that this works as expected with SBND?

[brucehoward-physics]

Thanks Riccardo, this looks good now! Only remaining question is if this was tested in both SBND and ICARUS workflows, but maybe CI will be able to test this before merging? If so then I'll approve.

[kjplows]

trigger build ci_ref=v10_06_02 LArSoft/lar*@LARSOFT_SUITE_v10_09_00 SBNSoftware/icaruscode#840

[FNALbuild]

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

[FNALbuild]

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

[FNALbuild]

❌ 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]

❌ 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]

⚠️ CI build for SBND Warning at phase ci_tests SBND on slf7 for e26:prof - ignored warnings for build -- details available through the CI dashboard

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

parent CI build details are available through the CI dashboard

[FNALbuild]

❌ CI build for ICARUS Failed at phase ci_tests ICARUS on slf7 for e26:prof - ignored warnings for build -- 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

[kjplows]

@brucehoward-physics , from what I can tell (arguably running slightly outdated SBND CI refs) the SBND side is happy with the trigger build. ICARUS CI is broken for the time being so you can ignore failures on ICARUS e26:prof.

[kjplows]

Also @cerati would you have any time to look over this if you can? Thanks!

[kjplows]

trigger build

[FNALbuild]

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

[FNALbuild]

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

[FNALbuild]

❌ 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]

❌ 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]

❌ CI build for ICARUS Failed at phase ci_tests ICARUS on slf7 for e26:prof - ignored warnings for build -- 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]

⚠️ CI build for SBND Warning at phase ci_tests SBND on slf7 for e26:prof - ignored warnings for build -- details available through the CI dashboard

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

parent CI build details are available through the CI dashboard

[brucehoward-physics]

Since @kjplows reports the SBND CI passes and @rtriozzi reported testing the ICARUS side, I will hit approve!