Merge branch 'feature/lynnt_lightcalorimetry'

Author: hgreenlee

sbnanaobj/StandardRecord/SRLightCalo.h

@@ -0,0 +1,27 @@
+/**
+ * @file   sbnanaobj/StandardRecord/SRLightCalo.h
+ * @brief  Defines data structures to store light calorimetry info (header only).
+ * @author Lynn Tung
+ * @date   November 19, 2025
+ */
+
+#ifndef SBNANAOBJ_STANDARDRECORD_SRLIGHTCALO_H
+#define SBNANAOBJ_STANDARDRECORD_SRLIGHTCALO_H
+
+#include "sbnanaobj/StandardRecord/SRConstants.h"
+
+namespace caf {
+
+  /**
+   * @brief A struct to store the reconstructed visible energy, light, and charge in a recob::Slice.
+   * 
+   */
+  struct SRLightCalo {
+    float charge  = caf::kSignalingNaN;      ///< the total charge in the slice (on bestplane) [# electrons]
+    float light   = caf::kSignalingNaN;      ///< the reconstructed total number of photons  [# photons]
+    float energy  = caf::kSignalingNaN;      ///< (charge+light)*scaling, [GeV]
+    int bestplane = caf::kUninitializedInt;  ///< plane with most number of hits 
+};
+}
+
+#endif

sbnanaobj/StandardRecord/SRSlice.h

@@ -19,6 +19,7 @@
 #include "sbnanaobj/StandardRecord/SRNuID.h"
 #include "sbnanaobj/StandardRecord/SRConstants.h"
 #include "sbnanaobj/StandardRecord/SRCVNScore.h"
+#include "sbnanaobj/StandardRecord/SRLightCalo.h"
 
 #include <climits>
 
@@ -54,6 +55,8 @@ namespace caf
 
       SRCorrectedOpFlash correctedOpFlash; //!< OpFlash corrected with using tpc information matched to this slice
 
+      SRLightCalo  lightcalo; // !< Reconstructed visible energy, light, and charge
+
       SRFakeReco fake_reco;
 
       bool is_clear_cosmic { false };         //!< Whether pandora marks the slice as a "clear" cosmic

sbnanaobj/StandardRecord/SRTrueDeposit.h

@@ -0,0 +1,26 @@
+/**
+ * @file   sbnanaobj/StandardRecord/SrTrueDeposit.h
+ * @brief  Defines data structures to store summed SimEnergyDeposits (header only).
+ * @author Lynn Tung
+ * @date   November 18, 2025
+ */
+
+#ifndef SBNANAOBJ_STANDARDRECORD_SRTRUEDEPOSIT_H
+#define SBNANAOBJ_STANDARDRECORD_SRTRUEDEPOSIT_H
+
+#include "sbnanaobj/StandardRecord/SRConstants.h"
+
+namespace caf {
+
+  /**
+   * @brief A struct to store total true deposited energy, charge, and photons for each MCTruth interaction.
+   * 
+   */
+  struct SRTrueDeposit {
+    float electrons = caf::kSignalingNaN; ///< total # of electrons from the sites of energy deposition, summed per nu interaction (after recombination, before drift)
+    float photons   = caf::kSignalingNaN; ///< total # of photons from the sites of energy deposition, summed per nu interaction   (after recombination, before propagation) 
+    float energy    = caf::kSignalingNaN; ///< total **deposited energy**, summed per nu interaction [GeV]
+  };
+}
+
+#endif

sbnanaobj/StandardRecord/SRTruthBranch.h

@@ -5,6 +5,7 @@
 #define SRTRUTHBRANCH_H
 
 #include "sbnanaobj/StandardRecord/SRTrueInteraction.h"
+#include "sbnanaobj/StandardRecord/SRTrueDeposit.h"
 #include "sbnanaobj/StandardRecord/SRMeVPrtl.h"
 
 #include <vector>
@@ -19,6 +20,7 @@ namespace caf
     ~SRTruthBranch();
 
     std::vector<SRTrueInteraction> nu;   ///< Vector of true nu or cosmic
+    std::vector<SRTrueDeposit>    dep;   ///< Vector of true energy deposits (summed), same size as nu
     size_t                        nnu;   ///< Number of true nu or cosmic
 
     std::vector<SRMeVPrtl>       prtl;   ///< If present -- information on decay of MeV "Portal" particle

sbnanaobj/StandardRecord/classes_def.xml

@@ -97,7 +97,13 @@
    <version ClassVersion="11" checksum="1429601394"/>
   </class>
 
-  <class name="caf::SROpT0Finder" />
+  <class name="caf::SROpT0Finder" ClassVersion="10">
+   <version ClassVersion="10" checksum="1191492245"/>
+  </class>
+
+  <class name="caf::SRLightCalo" ClassVersion="10">
+   <version ClassVersion="10" checksum="1494722949"/>
+  </class>
 
   <class name="caf::SRSliceRecoBranch" ClassVersion="13">
    <version ClassVersion="13" checksum="4211357366"/>
@@ -182,6 +188,10 @@
    <version ClassVersion="10" checksum="4056415501"/>
   </class>
 
+  <class name="caf::SRTrueDeposit" ClassVersion="10">
+   <version ClassVersion="10" checksum="916262743"/>
+  </class>
+
   <class name="caf::SRTrueParticlePlaneInfo" ClassVersion="11">
    <version ClassVersion="11" checksum="317847253"/>
    <version ClassVersion="10" checksum="1689803547"/>
@@ -223,7 +233,8 @@
    <version ClassVersion="10" checksum="1609299342"/>
   </class>
 
-  <class name="caf::SRTruthBranch" ClassVersion="11">
+  <class name="caf::SRTruthBranch" ClassVersion="12">
+   <version ClassVersion="12" checksum="3925767433"/>
    <version ClassVersion="11" checksum="1553456992"/>
    <version ClassVersion="10" checksum="2608785459"/>
   </class>
@@ -358,6 +369,7 @@
   <class name="std::vector<caf::SRTrueInteraction>" />
   <class name="std::vector<caf::SRMultiverse>" />
   <class name="std::vector<caf::SRTrueParticle>" />
+  <class name="std::vector<caf::SRTrueDeposit>" />
   <class name="std::vector<caf::SRParticleMatch>" />
   <class name="std::vector<caf::SRTrueCaloPoint>" />
   <class name="std::vector<caf::SRCaloPoint>" />