michel score for pfp itself

Author: Mun Jung Jung

sbnobj/Common/Reco/CNNScore.cc

@@ -1,9 +1,10 @@
 #include "sbnobj/Common/Reco/CNNScore.h"
 
-sbn::PFPCNNScore::PFPCNNScore(float pfpTrackScore, float pfpShowerScore, float pfpNoiseScore, float pfpEndMichelScore, int nClusters)
+sbn::PFPCNNScore::PFPCNNScore(float pfpTrackScore, float pfpShowerScore, float pfpNoiseScore, float pfpMichelScore, float pfpEndMichelScore, int nClusters)
   : pfpTrackScore(pfpTrackScore)
   , pfpShowerScore(pfpShowerScore)
   , pfpNoiseScore(pfpNoiseScore)
+  , pfpMichelScore(pfpMichelScore)
   , pfpEndMichelScore(pfpEndMichelScore)
   , nClusters(nClusters)
 {

sbnobj/Common/Reco/CNNScore.h

@@ -9,12 +9,13 @@ namespace sbn {
 
   class PFPCNNScore {
   public:
-    PFPCNNScore(float pfpTrackScore = nan_float, float pfpShowerScore = nan_float, float pfpNoiseScore = nan_float, float pfpEndMichelScore = nan_float, int nClusters = 0);
+    PFPCNNScore(float pfpTrackScore = nan_float, float pfpShowerScore = nan_float, float pfpNoiseScore = nan_float, float pfpMichelScore = nan_float, float pfpEndMichelScore = nan_float, int nClusters = 0);
 
     float pfpTrackScore; //!< shower score for PFP, average over all associated hits
     float pfpShowerScore; //!< shower score for PFP, average over all associated hits
     float pfpNoiseScore; //!< shower score for PFP, average over all associated hits
-    float pfpEndMichelScore; //!< michel score for PFP, average over 48*48 area around the endpoint
+    float pfpMichelScore; //!< michel score for PFP, average over all associated hits
+    float pfpEndMichelScore; //!< end michel score for PFP, average over defined area around the endpoint
     int nClusters; //!< number of clusters used for calculating average score
   };    
 }