Merge pull request #108 from SBNSoftware/feature/munjung-cnn_hit_clas…

…s_michel cnnscore in SR
SBNSoftware · Jan 23, 2024 · ff6d390 · ff6d390
2 parents 08a445a + f1ac0aa
commit ff6d390
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/sbnanaobj/StandardRecord/SRCNNScore.cxx b/sbnanaobj/StandardRecord/SRCNNScore.cxx
@@ -0,0 +1,15 @@
+#include "sbnanaobj/StandardRecord/SRCNNScore.h"
+#include <limits>
+
+namespace caf
+{
+  SRCNNScore::SRCNNScore() :
+    track(std::numeric_limits<float>::signaling_NaN()),
+    shower(std::numeric_limits<float>::signaling_NaN()),
+    noise(std::numeric_limits<float>::signaling_NaN()),
+    michel(std::numeric_limits<float>::signaling_NaN()),
+    endmichel(std::numeric_limits<float>::signaling_NaN()),
+    nclusters(std::numeric_limits<int>::signaling_NaN())
+  {
+  }
+}
diff --git a/sbnanaobj/StandardRecord/SRCNNScore.h b/sbnanaobj/StandardRecord/SRCNNScore.h
@@ -0,0 +1,23 @@
+////////////////////////////////////////////////////////////////////////
+// \file    SRCNNScore.h
+////////////////////////////////////////////////////////////////////////
+#ifndef SRCNNSCORE_H
+#define SRCNNSCORE_H
+
+namespace caf {
+
+  class SRCNNScore {
+  public:
+    SRCNNScore();
+    ~SRCNNScore() {}
+
+    float track; 
+    float shower; 
+    float noise; 
+    float michel;
+    float endmichel;
+    int nclusters; 
+  };
+}
+
+#endif
diff --git a/sbnanaobj/StandardRecord/SRPFP.h b/sbnanaobj/StandardRecord/SRPFP.h
@@ -7,6 +7,7 @@
 #include "sbnanaobj/StandardRecord/SRPFOChar.h"
 #include "sbnanaobj/StandardRecord/SRTrack.h"
 #include "sbnanaobj/StandardRecord/SRShower.h"
+#include "sbnanaobj/StandardRecord/SRCNNScore.h"
 
 #include <vector>
 
@@ -27,6 +28,8 @@ class SRPFP {
   float trackScore;  ///< The MVA score that determines how track/shower like a PFP is
   SRPFOChar pfochar; ///< The MVA inputs (features) in determination of the track score (PFO Characterisation)
 
+  SRCNNScore cnnscore; // CNN scores for this PFP
+
   int slcID; // ID of the slice that this PFP belongs to
   float t0; // T0 assigned by TPC reco, if any
 

diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml
@@ -32,6 +32,11 @@
    <version ClassVersion="10" checksum="1756876186"/>
   </class>
 
+  <class name="caf::SRCNNScore" ClassVersion="11" >
+   <version ClassVersion="11" checksum="769924360"/>
+   <version ClassVersion="10" checksum="3242119722"/>
+  </class>
+
   <class name="caf::SRHit" ClassVersion="10">
    <version ClassVersion="10" checksum="1494967532"/>
   </class>
@@ -227,7 +232,8 @@
    <version ClassVersion="10" checksum="839301601"/>
   </class>
 
-  <class name="caf::SRPFP" ClassVersion="13">
+  <class name="caf::SRPFP" ClassVersion="14">
+   <version ClassVersion="14" checksum="635023057"/>
    <version ClassVersion="13" checksum="2132348118"/>
    <version ClassVersion="12" checksum="2470467174"/>
    <version ClassVersion="11" checksum="1837341006"/>