Merge branch 'release/SBN2025A' into lnguyen/frame_shift_pr_spring

Author: VCLanNguyen

CMakeLists.txt

@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnanaobj VERSION 10.00.04 LANGUAGES CXX)
+project(sbnanaobj VERSION 10.00.05 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbnanaobj/StandardRecord/SRBNBInfo.cxx

@@ -14,6 +14,8 @@ namespace caf
     LM875A(std::numeric_limits<float>::signaling_NaN()),
     LM875B(std::numeric_limits<float>::signaling_NaN()),
     LM875C(std::numeric_limits<float>::signaling_NaN()),
+    HP873(std::numeric_limits<float>::signaling_NaN()),
+    VP873(std::numeric_limits<float>::signaling_NaN()),
     HP875(std::numeric_limits<float>::signaling_NaN()),
     VP875(std::numeric_limits<float>::signaling_NaN()),
     HPTG1(std::numeric_limits<float>::signaling_NaN()),
@@ -22,6 +24,14 @@ namespace caf
     VPTG2(std::numeric_limits<float>::signaling_NaN()),
     BTJT2(std::numeric_limits<float>::signaling_NaN()),
     THCURR(std::numeric_limits<float>::signaling_NaN()),
+    M875HS(std::numeric_limits<float>::signaling_NaN()),
+    M875VS(std::numeric_limits<float>::signaling_NaN()),
+    M875HM(std::numeric_limits<float>::signaling_NaN()),
+    M875VM(std::numeric_limits<float>::signaling_NaN()),
+    M876HS(std::numeric_limits<float>::signaling_NaN()),
+    M876VS(std::numeric_limits<float>::signaling_NaN()),
+    M876HM(std::numeric_limits<float>::signaling_NaN()),
+    M876VM(std::numeric_limits<float>::signaling_NaN()),
     M875BB_spill_time_diff(std::numeric_limits<float>::signaling_NaN()),
     M876BB_spill_time_diff(std::numeric_limits<float>::signaling_NaN()),
     MMBTBB_spill_time_diff(std::numeric_limits<float>::signaling_NaN())
@@ -37,6 +47,8 @@ namespace caf
     LM875A = -999.0;
     LM875B = -999.0;
     LM875C = -999.0;
+    HP873 = -999.0;
+    VP873 = -999.0;
     HP875 = -999.0;
     VP875 = -999.0;
     HPTG1 = -999.0;
@@ -45,6 +57,14 @@ namespace caf
     VPTG2 = -999.0;
     BTJT2 = -999.0;
     THCURR = -999.0;
+    M875HS = -999.0;
+    M875VS = -999.0;
+    M875HM = -999.0;
+    M875VM = -999.0;
+    M876HS = -999.0;
+    M876VS = -999.0;
+    M876HM = -999.0;
+    M876VM = -999.0;
     M875BB_spill_time_diff = -999.0;
     M876BB_spill_time_diff = -999.0;
     MMBTBB_spill_time_diff = -999.0;

sbnanaobj/StandardRecord/SRBNBInfo.h

@@ -20,8 +20,10 @@ namespace caf
     float LM875A; //!< Loss Monitor before the RWM, unit R/s
     float LM875B; //!< Loss Monitor after the RWM, unit R/s
     float LM875C; //!< Loss Monitor after the RWM, unit R/s
+    float HP873; //!< Horizontal Position Monitor after Mag 873, units mm
+    float VP873; //!< Vertical Position Monitor after Mag 873, units mm
     float HP875; //!< Horizontal Position Monitor after Mag 875, units mm
-    float VP875; //!< Verticle Position Monitor after Mag 875, units mm
+    float VP875; //!< Vertical Position Monitor after Mag 875, units mm
 
     float HPTG1; //!< Horizontal Position Monitor at Target Station 1, units mm 
     float VPTG1; //!< Horizontal Position Monitor at Target Station 1, units mm
@@ -32,7 +34,16 @@ namespace caf
     float BTJT2; //!< Temperature of air exiting target, units Deg C
 
     float THCURR; //!< Current applied to Horn, units kiloAmperes 
-    
+
+    float M875HS; //!< Multiwire station before Mag 875 fit horizontal sigma...?
+    float M875VS; //!< Multiwire station before Mag 875 fit vertical sigma...?
+    float M875HM; //!< Multiwire station before Mag 875 fit horizontal mean...?
+    float M875VM; //!< Multiwire station before Mag 875 fit vertical mean...?
+    float M876HS; //!< Multiwire station before Mag 876 fit horizontal sigma...?
+    float M876VS; //!< Multiwire station before Mag 876 fit vertical sigma...?
+    float M876HM; //!< Multiwire station before Mag 876 fit horizontal mean...?
+    float M876VM; //!< Multiwire station before Mag 876 fit vertical mean...?
+
     // https://cdcvs.fnal.gov/redmine/projects/ubraw/repository/revisions/master/entry/ubraw/BeamDAQ/MWRData.cpp
     std::vector< int > M875BB; //!< Multiwire station before Mag 875...?
     std::vector< int > M876BB; //!< Multiwire station after Mag 875...?

sbnanaobj/StandardRecord/SREnums.h

@@ -239,7 +239,7 @@ namespace caf
   //==== This should be synchronized to rwtype in sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
   enum ReweightType_t{
     kDefault = -1,
-    kMultiSim = 0,
+    kMultisim = 0,
     kPMNSigma = 1,
     kFixed = 2,
     kMultiSigma = 3

sbnanaobj/StandardRecord/classes_def.xml

@@ -280,7 +280,8 @@
    <version ClassVersion="10" checksum="3379238512"/>
   </class>
 
-  <class name="caf::SRBNBInfo" ClassVersion="10">
+  <class name="caf::SRBNBInfo" ClassVersion="11">
+   <version ClassVersion="11" checksum="4021053031"/>
    <version ClassVersion="10" checksum="2143749817"/>
   </class>