From 164c7842874d320417bf69efeec8f2016bab7221 Mon Sep 17 00:00:00 2001
From: Riccardo Triozzi <riccardo.triozzi@gmail.com>
Date: Wed, 2 Jul 2025 05:24:20 -0500
Subject: [PATCH 1/3] changed Pandora XML to accomodate for track/shower
 changes

---
 .../scripts/PandoraSettings_Neutrino_ICARUS.xml     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
index f10f4226a..1b8fd8b22 100644
--- a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
+++ b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
@@ -331,8 +331,9 @@
     <ShowerPfoListName>ShowerParticles3D</ShowerPfoListName>
     <UseThreeDInformation>true</UseThreeDInformation>
     <PersistFeatures>true</PersistFeatures>
-    <MvaFileName>PandoraBdt_v09_72_01_ICARUS_pfochar_bnb.xml</MvaFileName>
-    <MvaName>PfoCharBDT</MvaName>
+    <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+    <MvaFileName>PFOCharBDT_v09_84_00_03_20250508_ICARUSCollection.xml</MvaFileName>
+    <MvaName>PFOCharBDT_v09_84_00_03_20250508_ICARUSCollection</MvaName>
     <MvaFileNameNoChargeInfo>PandoraBdt_v09_72_01_ICARUS_pfochar_bnb.xml</MvaFileNameNoChargeInfo>
     <MvaNameNoChargeInfo>PfoCharBDTNoChargeInfo</MvaNameNoChargeInfo>
     <FeatureTools>
@@ -340,8 +341,12 @@
       <tool type = "LArThreeDVertexDistanceFeatureTool"/>
       <tool type = "LArThreeDPCAFeatureTool"/>
       <tool type = "LArThreeDOpeningAngleFeatureTool"/>
-      <tool type = "LArThreeDChargeFeatureTool"/>
-      <tool type = "LArConeChargeFeatureTool"/>
+      <tool type = "LArThreeDChargeFeatureTool">
+        <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+      </tool>
+      <tool type = "LArConeChargeFeatureTool">
+        <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
+      </tool>
     </FeatureTools>
     <FeatureToolsNoChargeInfo>
       <tool type = "LArThreeDLinearFitFeatureTool"/>

From 8f917f8b5a094548fb69e8ea2e9df95c19ed88c5 Mon Sep 17 00:00:00 2001
From: Riccardo Triozzi <riccardo.triozzi@gmail.com>
Date: Tue, 22 Jul 2025 19:11:18 +0200
Subject: [PATCH 2/3] changed tool name according to PandoraPFA/LArContent
 changes, updated BDT names

---
 .../scripts/PandoraSettings_Neutrino_ICARUS.xml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
index 1b8fd8b22..05ad25d9f 100644
--- a/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
+++ b/icaruscode/TPC/Tracking/ICARUSPandora/scripts/PandoraSettings_Neutrino_ICARUS.xml
@@ -332,19 +332,19 @@
     <UseThreeDInformation>true</UseThreeDInformation>
     <PersistFeatures>true</PersistFeatures>
     <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
-    <MvaFileName>PFOCharBDT_v09_84_00_03_20250508_ICARUSCollection.xml</MvaFileName>
-    <MvaName>PFOCharBDT_v09_84_00_03_20250508_ICARUSCollection</MvaName>
-    <MvaFileNameNoChargeInfo>PandoraBdt_v09_72_01_ICARUS_pfochar_bnb.xml</MvaFileNameNoChargeInfo>
-    <MvaNameNoChargeInfo>PfoCharBDTNoChargeInfo</MvaNameNoChargeInfo>
+    <MvaFileName>PFOCharBDT_v09_84_00_03_20250718_ICARUSCollection.xml</MvaFileName>
+    <MvaName>PFOCharBDT_v09_84_00_03_20250718_ICARUSCollection</MvaName>
+    <MvaFileNameNoChargeInfo>PFOCharBDT_v09_84_00_03_20250718_NoCharge.xml</MvaFileNameNoChargeInfo>
+    <MvaNameNoChargeInfo>PFOCharBDT_v09_84_00_03_20250718_NoCharge</MvaNameNoChargeInfo>
     <FeatureTools>
       <tool type = "LArThreeDLinearFitFeatureTool"/>
       <tool type = "LArThreeDVertexDistanceFeatureTool"/>
       <tool type = "LArThreeDPCAFeatureTool"/>
       <tool type = "LArThreeDOpeningAngleFeatureTool"/>
-      <tool type = "LArThreeDChargeFeatureTool">
+      <tool type = "LArThreeDChargeFeatureTool_ICARUS">
         <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
       </tool>
-      <tool type = "LArConeChargeFeatureTool">
+      <tool type = "LArConeChargeFeatureTool_ICARUS">
         <UseICARUSCollectionPlane>true</UseICARUSCollectionPlane>
       </tool>
     </FeatureTools>

From 44452ed949c29cc715020398cd41b852cc86e54a Mon Sep 17 00:00:00 2001
From: Riccardo Triozzi <riccardo.triozzi@gmail.com>
Date: Thu, 31 Jul 2025 18:47:01 +0200
Subject: [PATCH 3/3] updated CAFMaker configuration to handle BDT tool names

---
 fcl/caf/cafmaker_defs.fcl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
index 6c676dc26..dac16b31e 100644
--- a/fcl/caf/cafmaker_defs.fcl
+++ b/fcl/caf/cafmaker_defs.fcl
@@ -334,6 +334,11 @@ cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]
 cafmaker.SaveGENIEEventRecord: true # save GENIE event record by default. Turn this off for data cafmaker fcl
 cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatch"
 cafmaker.TrackHitFillRREndCut: 30 # include entire PID region
+cafmaker.PFOCharLabels.EndFractionName: "LArThreeDChargeFeatureTool_ICARUS_EndFraction" # override with some ICARUS-specific tool names
+cafmaker.PFOCharLabels.FractionalSpreadName: "LArThreeDChargeFeatureTool_ICARUS_FractionalSpread"
+cafmaker.PFOCharLabels.HaloTotalRatioName: "LArConeChargeFeatureTool_ICARUS_HaloTotalRatio"
+cafmaker.PFOCharLabels.ConcentrationName: "LArConeChargeFeatureTool_ICARUS_Concentration"
+cafmaker.PFOCharLabels.ConicalnessName: "LArConeChargeFeatureTool_ICARUS_Conicalness"
 
 # Add CAFMaker to the list of producers
 caf_preprocess_producers.cafmaker: @local::cafmaker