Merge branch 'release/v10_00_05'

Author: kjplows

CMakeLists.txt

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

sbnobj/Common/Analysis/TPCChannelInfo.hh

@@ -0,0 +1,27 @@
+/**
+ * \class TPCChannelInfo
+ *
+ * \ingroup anab
+ *
+ * \brief TPCChannel Analysis Info
+ *
+ */
+
+#ifndef TPCChannelInfo_hh_
+#define TPCChannelInfo_hh_
+
+
+namespace anab {
+
+  struct TPCChannelInfo{
+    unsigned channel; //!< Channel number 
+    float baseline; //!< Channel baseline
+    float rms; //!< Channel RMS
+    float even_fraction; //!< Fraction of even samples in waveform
+    float xbad_fraction; //!< Fraction of samples equal to 0xBAD in the waveform
+  };
+
+}
+
+
+#endif

sbnobj/Common/Analysis/classes.h

@@ -1,4 +1,5 @@
 #include "canvas/Persistency/Common/Wrapper.h"
 #include "canvas/Persistency/Common/Assns.h"
 #include "sbnobj/Common/Analysis/TPCPurityInfo.hh"
+#include "sbnobj/Common/Analysis/TPCChannelInfo.hh"
 #include <vector>

sbnobj/Common/Analysis/classes_def.xml

@@ -1,5 +1,12 @@
 <lcgdict>
 
+  <class name="anab::TPCChannelInfo" ClassVersion="10">
+   <version ClassVersion="10" checksum="3801257877"/>
+  </class>
+  <class name="std::vector<anab::TPCChannelInfo>"/>
+  <class name="art::Wrapper< anab::TPCChannelInfo>"/>
+  <class name="art::Wrapper< std::vector<anab::TPCChannelInfo>>"/>
+
   <class name="anab::TPCPurityInfo" ClassVersion="12">
    <version ClassVersion="12" checksum="2429165902"/>
    <version ClassVersion="11" checksum="3124295666"/>

sbnobj/SBND/Timing/DAQTimestamp.cxx

@@ -10,20 +10,46 @@ namespace sbnd::timing {
     , fTimestamp(0)
     , fOffset(0)
     , fName("")
+    , fTimestampPs(0)
   {}
 
+  //For decoding with sbndcode <= v10_04_??
   DAQTimestamp::DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::string name)
     : fChannel(channel)
     , fTimestamp(timestamp)
     , fOffset(offset)
     , fName(name)
+    , fTimestampPs(0)
   {}
 
+  //For decoding with sbndcode <= v10_04_??
   DAQTimestamp::DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::array<char, 8> name)
     : fChannel(channel)
     , fTimestamp(timestamp)
     , fOffset(offset)
     , fName("")
+    , fTimestampPs(0)
+  {
+    for(auto const& c : name)
+      fName.push_back(c);
+  }
+
+  //New addition for sbndcode version > v10_04_??
+  DAQTimestamp::DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::string name, uint64_t timestampPs)
+    : fChannel(channel)
+    , fTimestamp(timestamp)
+    , fOffset(offset)
+    , fName(name)
+    , fTimestampPs(timestampPs)
+  {}
+
+  //New addition for sbndcode version > v10_04_??
+  DAQTimestamp::DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::array<char, 8> name, uint64_t timestampPs)
+    : fChannel(channel)
+    , fTimestamp(timestamp)
+    , fOffset(offset)
+    , fName("")
+    , fTimestampPs(timestampPs)
   {
     for(auto const& c : name)
       fName.push_back(c);
@@ -51,6 +77,11 @@ namespace sbnd::timing {
     return fName;
   }
 
+  uint64_t DAQTimestamp::TimestampPs() const
+  {
+    return fTimestampPs;
+  }
+
   void DAQTimestamp::SetChannel(uint32_t channel)
   {
     fChannel = channel;
@@ -70,6 +101,11 @@ namespace sbnd::timing {
   {
     fName = name;
   }
+
+  void DAQTimestamp::SetTimestampPs(uint64_t timestamp)
+  {
+    fTimestampPs = timestamp;
+  }
 }
 
 #endif

sbnobj/SBND/Timing/DAQTimestamp.hh

@@ -21,6 +21,9 @@ namespace sbnd::timing {
     uint64_t fTimestamp; ///< Timestamp of signal [ns]
     uint64_t fOffset;    ///< Channel specific offset [ns]
     std::string fName;   ///< Name of channel input
+    
+    //New addition for sbndcode version > v10_04_??
+    uint64_t fTimestampPs; ///< Timestamp of signal [ps]
 
    public:
 
@@ -30,24 +33,28 @@ namespace sbnd::timing {
     DAQTimestamp();
 
     /**
-     * Constructor to set all parameters
+     * Constructor to set 4 parameters but timestamp ps
+     * For decoding with sbndcode <= v10_04_??
      *
      * @param channel    Hardware channel
-     * @param timestamp  Timestamp of signal [ns]
+     * @param timestamp  Timestamp of signal [ns] in UTC format
      * @param offset     Channel specific offset [ns]
      * @param name       Name of channel input
      */
     DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::string name);
+    DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::array<char, 8> name);
 
     /**
-     * Constructor to set all parameters, using array for name
+     * Constructor to set all parameters 
+     * For decoding with sbndcode > v10_04_??
      *
      * @param channel    Hardware channel
-     * @param timestamp  Timestamp of signal [ns]
+     * @param timestamp  Timestamp of signal [ns] in UTC format
      * @param offset     Channel specific offset [ns]
      * @param name       Name of channel input
      */
-    DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::array<char, 8> name);
+    DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::string name, uint64_t timestampPs);
+    DAQTimestamp(uint32_t channel, uint64_t timestamp, uint64_t offset, std::array<char, 8> name, uint64_t timestampPs);
 
     /**
      * Destructor
@@ -61,6 +68,9 @@ namespace sbnd::timing {
     uint64_t    Timestamp() const;
     uint64_t    Offset() const;
     std::string Name() const;
+    
+    //New addition for sbndcode version > v10_04_??
+    uint64_t    TimestampPs() const;
 
     /**
      * Setters
@@ -69,6 +79,9 @@ namespace sbnd::timing {
     void SetTimestamp(uint64_t timestamp);
     void SetOffset(uint64_t offset);
     void SetName(std::string name);
+
+    //New addition for sbndcode version > v10_04_??
+    void SetTimestampPs(uint64_t timestamp);
   };
 }
 

sbnobj/SBND/Timing/classes_def.xml

@@ -1,5 +1,6 @@
 <lcgdict>
-  <class name="sbnd::timing::DAQTimestamp" ClassVersion="10">
+  <class name="sbnd::timing::DAQTimestamp" ClassVersion="11">
+   <version ClassVersion="11" checksum="2804806845"/>
     <version ClassVersion="10" checksum="810700615"/>
   </class>
   <class name="std::vector<sbnd::timing::DAQTimestamp>"/>