Merge pull request #147 from SBNSoftware/feature/acastill_lightpropagationfixes

Update CorrectedOpFlash attributes

Author: kjplows

sbnobj/Common/Reco/CorrectedOpFlashTiming.h

@@ -23,25 +23,12 @@ namespace sbn {
 
   /// @name Corrected OpFlash Times
   /// @{
-  float        OpFlashT0             { fDefault };                   ///< | OpFlash Time wrt RWM time | (ns)
-  float        UpstreamTime_lightonly             { fDefault };      ///< | Nu upstream wall time reconstructed using light only | (ns)
-  float        UpstreamTime_tpczcorr             { fDefault };       ///< | Nu upstream wall time reconstructed using light and Z from tpc vertex | (ns)
-  float        UpstreamTime_propcorr_tpczcorr    { fDefault };       ///< | Nu upstream wall time reconstructed using light propagation correction from tpc information and z correction from tpc vertex | (ns)
-  
-  /// @}
-
-  /// @name Data members related to the slice-flash match
-  /// @{
-  float        FMScore             { fDefault };                   ///< | OpFlash Time wrt RWM time | (ns)
-
+  float        OpFlashT0             { fDefault };                   ///< | OpFlash Time wrt RWM time | (us)
+  float        NuToFLight             { fDefault };      ///< | Nu ToF using light only | (us)
+  float        NuToFCharge             { fDefault };       ///< | Nu ToF Z from tpc vertex | (us)
+  float        OpFlashT0Corrected    { fDefault };       ///< | OpFlash Time wrt RWM time after light propagation corrections | (us)
   /// @}
-
-  /// @name Data members related to the slice match
-  /// @{
-  float        SliceNuScore             { fDefault };                   ///< | OpFlash Time wrt RWM time | (ns)
-
-  /// @}
-
+  
   };
 }
 

sbnobj/Common/Reco/TPCPMTBarycenterMatch.h

@@ -47,7 +47,7 @@ namespace sbn {
   float        deltaY             { fDefault };                     ///< | Matched flash Y center - charge Y center | (cm)
   float        deltaZ             { fDefault };                     ///< | Matched flash Z center - charge Z center | (cm)
   float        radius             { fDefault };                     ///< Hypotenuse of DeltaY and DeltaZ (cm)
-  float        angle              { fDefault };                     ///< | Angle between charge PCA and light PCA | (us)
+  float        angle              { fDefault };                     ///< | Angle between charge PCA and light PCA | (deg)
   float        chi2               { fDefault };                     ///< | Chi2 to be minimised when matching flash to slice | (dimensionless)
   float        score               { fDefault };                     ///< | Score to be maximised when matching flash to slice | (dimensionless)
   float        deltaT             { fDefault };                     ///< | Matched flash time - anab::T0 | when available (us)

sbnobj/Common/Reco/classes_def.xml

@@ -292,7 +292,8 @@
 
   <class name="std::vector<geo::PlaneID>"/>
 
-  <class name="sbn::CorrectedOpFlashTiming" ClassVersion="15">
+  <class name="sbn::CorrectedOpFlashTiming" ClassVersion="16">
+   <version ClassVersion="16" checksum="1734226620"/>
    <version ClassVersion="15" checksum="2401924061"/>
    <version ClassVersion="14" checksum="2635318722"/>
    <version ClassVersion="13" checksum="328467396"/>