From 1f1bd2ad6aa51af5599d3064a286cb92c7341ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1nchez=20Castillo?=
 <asanchezcastillo@ugr.es>
Date: Fri, 26 Sep 2025 05:56:41 -0500
Subject: [PATCH 1/3] Fix CorrectedOpFlash attributes

---
 sbnanaobj/StandardRecord/SRCorrectedOpFlash.cxx | 8 +++-----
 sbnanaobj/StandardRecord/SRCorrectedOpFlash.h   | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.cxx b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.cxx
index e6a24163..b89f1c7f 100644
--- a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.cxx
+++ b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.cxx
@@ -14,11 +14,9 @@ namespace caf
   void SRCorrectedOpFlash::setDefault()
   {
     OpFlashT0             =                             -9999.;
-    UpstreamTime_lightonly =                             -9999.;
-    UpstreamTime_tpczcorr  =                             -9999.;
-    UpstreamTime_propcorr_tpczcorr =                     -9999.;
-    SliceNuScore          =                             -9999.;
-    FMScore               =                             -9999.;
+    NuToFLight            =                             -9999.;
+    NuToFCharge           =                             -9999.;
+    OpFlashT0Corrected    =                             -9999.;
   }
 
 } // end namespace caf
diff --git a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
index 76252c6d..7bb5085e 100644
--- a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
+++ b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
@@ -18,11 +18,9 @@ namespace caf
     /// @name Data members related to the opflash corrected time
     /// @{
     float        OpFlashT0             { -9999. };                   ///< | OpFlash Time wrt RWM time | (ns)
-    float        UpstreamTime_lightonly             {  -9999.  };      ///< | Nu upstream wall time reconstructed using light only | (ns)
-    float        UpstreamTime_tpczcorr             {  -9999.  };       ///< | Nu upstream wall time reconstructed using light and Z from tpc vertex | (ns)
-    float        UpstreamTime_propcorr_tpczcorr    {  -9999.  };       ///< | Nu upstream wall time reconstructed using light propagation correction from tpc information and z correction from tpc vertex | (ns)
-    float        SliceNuScore             {  -9999.  };                   ///< | Slice Nu Score |
-    float        FMScore             {  -9999.  };                   ///< | Flash Match Score |
+    float        NuToFLight             {  -9999.  };      ///< | Nu ToF using light only | (ns)
+    float        NuToFCharge             {  -9999.  };       ///< | Nu ToF Z from tpc vertex | (ns)
+    float        OpFlashT0Corrected    {  -9999.  };       ///< | OpFlash Time wrt RWM time after light propagation corrections | (ns)
     /// @}
 
     void setDefault();

From f63e19ebf2b539d4207eeea27cc48ba42d570947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1nchez=20Castillo?=
 <121103809+asanchezcastillo@users.noreply.github.com>
Date: Wed, 1 Oct 2025 17:17:51 +0200
Subject: [PATCH 2/3] Change time units from ns to us

---
 sbnanaobj/StandardRecord/SRCorrectedOpFlash.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
index 7bb5085e..0a2fb52b 100644
--- a/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
+++ b/sbnanaobj/StandardRecord/SRCorrectedOpFlash.h
@@ -17,10 +17,10 @@ namespace caf
 
     /// @name Data members related to the opflash corrected time
     /// @{
-    float        OpFlashT0             { -9999. };                   ///< | OpFlash Time wrt RWM time | (ns)
-    float        NuToFLight             {  -9999.  };      ///< | Nu ToF using light only | (ns)
-    float        NuToFCharge             {  -9999.  };       ///< | Nu ToF Z from tpc vertex | (ns)
-    float        OpFlashT0Corrected    {  -9999.  };       ///< | OpFlash Time wrt RWM time after light propagation corrections | (ns)
+    float        OpFlashT0             { -9999. };                   ///< | OpFlash Time wrt RWM time | (us)
+    float        NuToFLight             {  -9999.  };      ///< | Nu ToF using light only | (us)
+    float        NuToFCharge             {  -9999.  };       ///< | Nu ToF Z from tpc vertex | (us)
+    float        OpFlashT0Corrected    {  -9999.  };       ///< | OpFlash Time wrt RWM time after light propagation corrections | (us)
     /// @}
 
     void setDefault();

From fa071d3d5975e2e39fd4241f207154334ca0cca6 Mon Sep 17 00:00:00 2001
From: kjplows <kom.plows@gmail.com>
Date: Tue, 4 Nov 2025 13:03:48 -0600
Subject: [PATCH 3/3] Update classes_def.xml

---
 sbnanaobj/StandardRecord/classes_def.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml
index 9b6f8fb2..86bb4cee 100644
--- a/sbnanaobj/StandardRecord/classes_def.xml
+++ b/sbnanaobj/StandardRecord/classes_def.xml
@@ -376,7 +376,8 @@
    <version ClassVersion="10" checksum="2672302824"/>
   </class>
 
-  <class name="caf::SRCorrectedOpFlash" ClassVersion="13">
+  <class name="caf::SRCorrectedOpFlash" ClassVersion="14">
+   <version ClassVersion="14" checksum="2247699110"/>
    <version ClassVersion="13" checksum="3257300089"/>
    <version ClassVersion="12" checksum="1558889595"/>
    <version ClassVersion="11" checksum="755718921"/>