Merge tag '09_15_01' into develop

sbnobj 09_15_01

Author: miquelnebot

CMakeLists.txt

@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnobj VERSION 09.15.00 LANGUAGES CXX)
+project(sbnobj VERSION 09.15.01 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

sbnobj/Common/Reco/SimpleFlashMatchVars.h

@@ -11,15 +11,19 @@ namespace sbn
     struct Charge {
       double q;        //!< charge in slc
       TVector3 center; //!< Weighted center position [cm]
-      Charge(double q_ = -1., TVector3 center_ = TVector3(-999, -999, -999)) :
-        q(q_), center(center_)
+      TVector3 width;  //!< Weighted width [cm]
+      Charge(double q_ = -1., TVector3 center_ = TVector3(-999, -999, -999),
+             TVector3 width_ = TVector3(-999, -999, -999)) :
+        q(q_), center(center_), width(width_)
         {}
     };
     struct Flash {
       double pe;       //!< photo-electrons on flash
       TVector3 center; //!< Weighted center position [cm]
-      Flash(double pe_ = -1., TVector3 center_ = TVector3(-999, -999, -999)) :
-        pe(pe_), center(center_)
+      TVector3 width;  //!< Weighted width [cm]
+      Flash(double pe_ = -1., TVector3 center_ = TVector3(-999, -999, -999),
+            TVector3 width_ = TVector3(-999, -999, -999)) :
+        pe(pe_), center(center_), width(width_)
         {}
     };
     struct Score {
@@ -28,14 +32,19 @@ namespace sbn
       double z;     //!< score for z metric
       double rr;    //!< score for rr metric
       double ratio; //!< score for ratio metric
+      double slope; //!< score for z/y slope metric
+      double petoq; //!< score for light/charge quotient metric
       Score (
         double total_ = -1.,
         double y_ = -1., double z_ = -1.,
-        double rr_ = -1., double ratio_ = -1.) :
-        total(total_), y(y_), z(z_), rr(rr_), ratio(ratio_)
+        double rr_ = -1., double ratio_ = -1.,
+        double slope_ = -1., double petoq_ = -1.) :
+        total(total_), y(y_), z(z_), rr(rr_), ratio(ratio_),
+        slope(slope_), petoq(petoq_)
         {}
       Score (int no_score) : // for no match fill all with the code
-        total(no_score), y(no_score), z(no_score), rr(no_score), ratio(no_score)
+        total(no_score), y(no_score), z(no_score), rr(no_score), ratio(no_score),
+        slope(no_score), petoq(no_score)
         {}
     };
 

sbnobj/Common/Reco/classes_def.xml

@@ -34,13 +34,16 @@
   <class name="sbn::SimpleFlashMatch" ClassVersion="11">
    <version ClassVersion="11" checksum="27328003"/>
   </class>
-  <class name="sbn::SimpleFlashMatch::Charge" ClassVersion="11">
+  <class name="sbn::SimpleFlashMatch::Charge" ClassVersion="12">
+   <version ClassVersion="12" checksum="3766218077"/>
    <version ClassVersion="11" checksum="4057441913"/>
   </class>
-  <class name="sbn::SimpleFlashMatch::Flash" ClassVersion="11">
+  <class name="sbn::SimpleFlashMatch::Flash" ClassVersion="12">
+   <version ClassVersion="12" checksum="3025111821"/>
    <version ClassVersion="11" checksum="3396465673"/>
   </class>
-  <class name="sbn::SimpleFlashMatch::Score" ClassVersion="11">
+  <class name="sbn::SimpleFlashMatch::Score" ClassVersion="12">
+   <version ClassVersion="12" checksum="3706842367"/>
    <version ClassVersion="11" checksum="3697420401"/>
   </class>
   <class name="std::vector<sbn::SimpleFlashMatch>" />

sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx

@@ -109,6 +109,18 @@ void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
   }
 }
 
+void EventWeightParameterSet::FillKnobValues() {
+
+  for (auto& it : fParameterMap) {
+    const EventWeightParameter& p = it.first;
+    for(auto width: p.fWidths)
+      it.second.push_back(p.fMean + width);
+  }
+
+}
+
+
+
   }  // namespace evwgh
 }  // namespace sbn
 

sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h

@@ -113,6 +113,8 @@ class EventWeightParameterSet {
   void AddParameter(std::string name, float width, float mean=0, size_t covIndex=0);
   void AddParameter(std::string name, std::vector<float> widths, float mean=0, size_t covIndex=0);
 
+  void FillKnobValues();
+
   /**
    * Specify a covariance matrix for correlated throws.
    *