Merge pull request #144 from SBNSoftware/feature/acastill_tpcpmtbfm_upgrade

Feature/acastill tpcpmtbfm upgrade

Author: kjplows

sbnobj/Common/Reco/TPCPMTBarycenterMatch.h

@@ -47,6 +47,9 @@ 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        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)
   float        overlapY           { fDefault };                     ///< Spatial overlap of flash and charge centroids in Y [>0] OR distance apart if no overlap [<0] (cm)
   float        overlapZ           { fDefault };                     ///< Spatial overlap of flash and charge centroids in Z [>0] OR distance apart if no overlap [<0] (cm)

sbnobj/Common/Reco/classes_def.xml

@@ -266,7 +266,9 @@
   <class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::PFParticle>>" />
   <class name="art::Wrapper<art::Assns<sbn::MVAPID, recob::PFParticle, recob::Track>>" />
 
-  <class name="sbn::TPCPMTBarycenterMatch" ClassVersion="10">
+  <class name="sbn::TPCPMTBarycenterMatch" ClassVersion="12">
+   <version ClassVersion="12" checksum="2061481769"/>
+   <version ClassVersion="11" checksum="2756550975"/>
    <version ClassVersion="10" checksum="3504890228"/>
   </class>
   <class name="std::vector<sbn::TPCPMTBarycenterMatch>" />