Merge branch 'develop' of https://github.com/DeepLearnPhysics/larcv2 into develop

francois-drielsma · francois-drielsma · commit 2785f067abdd · 2024-03-07T19:24:39.000-06:00
diff --git a/Makefile/GNUmakefile.CORE b/Makefile/GNUmakefile.CORE
@@ -65,7 +65,7 @@ $(DICT).cxx: $(HEADERS) LinkDef.h
 # if ROOTMAP defined, define rule for making it
 $(LARCV_LIBDIR)/$(ROOTMAP): $(OBJECTS) $(DICT).o
 	@echo "<< generating rootmap >>"
-	@rlibmap -f  -o $(LARCV_LIBDIR)/$(ROOTMAP) -l $(LARCV_LIBDIR)/liblarcv.so -c LinkDef.h
+	@rlibmap -f -shared  -o $(LARCV_LIBDIR)/$(ROOTMAP) -l $(LARCV_LIBDIR)/liblarcv.so -c LinkDef.h
 
 # install headers
 install_header: .depend #$(OBJECTS) $(DICT).o
diff --git a/bin/libarg.py b/bin/libarg.py
@@ -4,6 +4,7 @@
     import subprocess
     dirs=[]
     for d in os.listdir(os.environ['LARCV_BUILDDIR']):
+        if d==".DS_Store": continue
         if not len([x for x in os.listdir('%s/%s' % (os.environ['LARCV_BUILDDIR'],d)) if x.endswith('.o')]): continue
         dirs.append(d)
     libs=[x for x in subprocess.getoutput('larcv-config --libs').split() if not x.startswith('-llarcv')]
diff --git a/configure.sh b/configure.sh
@@ -23,13 +23,14 @@ if [[ -z $LARCV_BUILDDIR ]]; then
 fi
 
 # Check python version compatibility:
-export LARCV_PYTHON_CONFIG=python-config
 LARCV_PYVERSION=0
 if [ `command -v python3` ]; then
     export LARCV_PYTHON=`which python3`
+    export LARCV_PYTHON_CONFIG=`which python3-config`
     LARCV_PYVERSION=$($LARCV_PYTHON -c "import sys; print(sys.version_info.major)")
 else
     export LARCV_PYTHON=`which python`
+    export LARCV_PYTHON_CONFIG=`which python-config`
     LARCV_PYVERSION=$($LARCV_PYTHON -c "import sys; print(sys.version_info.major)")
 fi
 if [[ $LARCV_PYVERSION -gt 2 ]]
diff --git a/larcv/core/Base/LArCVTypes.h b/larcv/core/Base/LArCVTypes.h
@@ -33,6 +33,8 @@
 namespace larcv {
 
   /// Used as an invalid value identifier for long long
+  /// Used as an invalid value identifier for unsigned long long
+  const unsigned long      kINVALID_ULONG     = std::numeric_limits< unsigned long >::max();
   const long long          kINVALID_LONGLONG  = std::numeric_limits< long long          >::max();
   /// Used as an invalid value identifier for unsigned long long
   const unsigned long long kINVALID_ULONGLONG = std::numeric_limits< unsigned long long >::max();
diff --git a/larcv/core/CVUtil/CVUtil.cxx b/larcv/core/CVUtil/CVUtil.cxx
@@ -123,7 +123,7 @@ namespace larcv {
   Image2D imread(const std::string file_name)
   {
     ::cv::Mat image;
-    image = ::cv::imread(file_name.c_str(), CV_LOAD_IMAGE_COLOR);
+    image = ::cv::imread(file_name.c_str(), cv::IMREAD_COLOR);
 
     ImageMeta meta(image.cols,image.rows,image.cols, image.rows, 0., 0.);
     Image2D larcv_img(meta);
@@ -147,7 +147,7 @@ namespace larcv {
   Image2D imread_gray(const std::string file_name)
   {
     ::cv::Mat image;
-    image = ::cv::imread(file_name.c_str(), CV_LOAD_IMAGE_GRAYSCALE);
+    image = ::cv::imread(file_name.c_str(), cv::ImreadModes::IMREAD_GRAYSCALE);
 
     ImageMeta meta(image.cols,image.rows,image.cols, image.rows, 0., 0.);
     Image2D larcv_img(meta);
diff --git a/larcv/core/DataFormat/DataFormatTypes.h b/larcv/core/DataFormat/DataFormatTypes.h
@@ -19,9 +19,11 @@ namespace larcv {
   /// "ID" of MCTruth in terms of its index number in the collection std::vector
   typedef unsigned short MCTIndex_t;
   /// "ID" for a set of elements
-  typedef unsigned short InstanceID_t;
+  typedef unsigned long InstanceID_t;
   /// Invalid rep for InstanceID_t
-  static const unsigned short kINVALID_INSTANCEID = kINVALID_USHORT;
+  // yes, SIGNED long.  this is because numpy's int64 (which this will get converted to when used with mlreco3d)
+  // isn't big enough for the unsigned long long value, but it *is* big enough for this one
+  static const unsigned long kINVALID_INSTANCEID = kINVALID_LONGLONG;
   /// Invalid projection id
   static const ProjectionID_t kINVALID_PROJECTIONID = kINVALID_USHORT;
 
diff --git a/larcv/core/DataFormat/EventTrigger.cxx b/larcv/core/DataFormat/EventTrigger.cxx
@@ -0,0 +1,12 @@
+#ifndef EVENTTRIGGERCXX
+#define EVENTTRIGGERCXX
+
+#include "EventTrigger.h"
+
+namespace larcv{
+  /// Global larcv::SBClusterFactory to register ClusterAlgoFactory
+  static EventTriggerFactory __global_EventTriggerFactory__;
+
+}
+
+#endif
diff --git a/larcv/core/DataFormat/EventTrigger.h b/larcv/core/DataFormat/EventTrigger.h
@@ -0,0 +1,64 @@
+/**
+ * \file EventTrigger.h
+ *
+ * \ingroup DataFormat
+ *
+ * \brief Wrapper for making Trigger persistable
+ *
+ * @author J. Wolcott <jwolcott@fnal.gov
+ */
+
+/** \addtogroup DataFormat
+
+    @{*/
+#ifndef __LARCV_EVENTTRIGGER_H__
+#define __LARCV_EVENTTRIGGER_H__
+
+#include "EventBase.h"
+#include "Trigger.h"
+#include "DataProductFactory.h"
+
+namespace larcv {
+  /**
+    \class EventTrigger
+    Persistent storage for trigger-related data
+  */
+  class EventTrigger : public EventBase, public larcv::Trigger
+  {
+    public:
+
+      /// Data clear method
+      inline void clear()
+      { EventBase::clear(); Trigger::clear(); }
+
+  };
+}
+
+#include "IOManager.h"
+namespace larcv {
+
+  // Template instantiation for IO
+  template<> inline std::string product_unique_name<larcv::EventTrigger>() { return "trigger"; }
+  template EventTrigger& IOManager::get_data<larcv::EventTrigger>(const std::string&);
+  template EventTrigger& IOManager::get_data<larcv::EventTrigger>(const ProducerID_t);
+
+  /**
+     \class larcv::EventTriggerFactory
+     \brief A concrete factory class for larcv::EventTrigger
+  */
+  class EventTriggerFactory : public DataProductFactoryBase {
+  public:
+    /// ctor
+    EventTriggerFactory()
+    { DataProductFactory::get().add_factory(product_unique_name<larcv::EventTrigger>(),this); }
+    /// dtor
+    ~EventTriggerFactory() {}
+    /// create method
+    EventBase* create() { return new EventTrigger; }
+  };
+
+
+}
+
+#endif
+/** @} */ // end of doxygen group
diff --git a/larcv/core/DataFormat/LinkDef.h b/larcv/core/DataFormat/LinkDef.h
@@ -84,6 +84,9 @@
 #pragma link C++ class larcv::Meta+;
 #pragma link C++ class larcv::EventMeta+;
 
+#pragma link C++ class larcv::Trigger+;
+#pragma link C++ class larcv::EventTrigger+;
+
 #pragma link C++ class larcv::FlatTensorContents+;
 #pragma link C++ function larcv::as_image2d(const SparseTensor2D&)+;
 #pragma link C++ function larcv::as_image2d(const VoxelSet&, const ImageMeta&)+;
diff --git a/larcv/core/DataFormat/Particle.cxx b/larcv/core/DataFormat/Particle.cxx
@@ -26,7 +26,8 @@ namespace larcv {
 
     ss << buf.str() << "Vertex   (x, y, z, t) = (" << x() << "," << y() << "," << z() << "," << t() << ")" << std::endl
        << buf.str() << "Momentum (px, py, pz) = (" << px() << "," << py() << "," << pz() << ")" << std::endl
-       << buf.str() << "Inittial Energy  = " << energy_init() << std::endl
+       << buf.str() << "Final Momentum (end_px, end_py, end_pz) = (" << end_px() << "," << end_py() << "," << end_pz() << ")" << std::endl
+       << buf.str() << "Initial Energy  = " << energy_init() << std::endl
        << buf.str() << "Deposit  Energy  = " << energy_deposit() << std::endl
        << buf.str() << "Creation Process = " << creation_process() << std::endl
        << buf.str() << "Instance ID = " << id() << std::endl
diff --git a/larcv/core/DataFormat/Particle.h b/larcv/core/DataFormat/Particle.h
@@ -37,10 +37,14 @@ namespace larcv {
       , _current_type     (-1)
       , _interaction_type (-1)
       , _trackid          (kINVALID_UINT)
+      , _genid            (kINVALID_UINT)
       , _pdg              (0)
       , _px               (0.)
       , _py               (0.)
       , _pz               (0.)
+      , _end_px         (kINVALID_DOUBLE)
+      , _end_py         (kINVALID_DOUBLE)
+      , _end_pz         (kINVALID_DOUBLE)
       , _dist_travel      (-1)
       , _energy_init      (0.)
       , _energy_deposit   (0.)
@@ -70,11 +74,16 @@ namespace larcv {
     inline short nu_interaction_type () const { return _interaction_type; }
     // particle's info getter
     inline unsigned int track_id   () const { return _trackid;    }
+    inline unsigned int gen_id     () const { return _genid;      }
     inline int          pdg_code   () const { return _pdg;        }
     inline double       px         () const { return _px;         }
     inline double       py         () const { return _py;         }
     inline double       pz         () const { return _pz;         }
+    inline double       end_px   () const { return _end_px;   }
+    inline double       end_py   () const { return _end_py;   }
+    inline double       end_pz   () const { return _end_pz;   }
     inline double       p          () const { return sqrt(pow(_px,2)+pow(_py,2)+pow(_pz,2)); }
+    inline double       end_p    () const { return sqrt(pow(_end_px,2)+pow(_end_py,2)+pow(_end_pz,2)); }
     inline const larcv::Vertex& position() const { return _vtx;   }
     inline double       x          () const { return _vtx.x();    }
     inline double       y          () const { return _vtx.y();    }
@@ -130,8 +139,10 @@ namespace larcv {
     inline void nu_interaction_type (short itype) {_interaction_type = itype; }
     // particle's info setter
     inline void track_id        (unsigned int id )   { _trackid = id;       }
+    inline void gen_id          (unsigned int id )   { _genid = id;       }
     inline void pdg_code        (int code)           { _pdg = code;         }
     inline void momentum        (double px, double py, double pz) { _px = px; _py = py; _pz = pz; }
+    inline void end_momentum  (double end_px, double end_py, double end_pz) { _end_px = end_px; _end_py = end_py; _end_pz = end_pz; }
     inline void position        (const larcv::Vertex& vtx) { _vtx = vtx;    }
     inline void position        (double x, double y, double z, double t) { _vtx = Vertex(x,y,z,t); }
     inline void end_position    (const larcv::Vertex& vtx) { _end_pt = vtx; }
@@ -181,8 +192,10 @@ namespace larcv {
     short _interaction_type;   ///< if neutrino, shows interaction GENIE code. else kINVALID_USHORT
 
     unsigned int _trackid;     ///< Geant4 track id
+    unsigned int _genid;       ///< Original generator ID, if different from Geant4 one (e.g.: GENIE particle ID)
     int          _pdg;         ///< PDG code
     double       _px,_py,_pz;  ///< (x,y,z) component of particle's initial momentum
+    double       _end_px,_end_py,_end_pz;  ///< (x,y,z) component of particle's final momentum
     Vertex       _vtx;         ///< (x,y,z,t) of particle's vertex information
     Vertex       _end_pt;      ///< (x,y,z,t) at which particle disappeared from G4WorldVolume
     Vertex       _first_step;  ///< (x,y,z,t) of the first energy deposition point in the detector
diff --git a/larcv/core/DataFormat/Trigger.h b/larcv/core/DataFormat/Trigger.h
@@ -0,0 +1,56 @@
+/**
+ * \file Trigger.h
+ *
+ * \ingroup core_DataFormat
+ *
+ * \brief Storage for information about detector trigger that created this image
+ *
+ * @author J. Wolcott <jwolcott@fnal.gov>
+ */
+
+/** \addtogroup core_DataFormat
+
+    @{*/
+#ifndef __LARCV_TRIGGER_H__
+#define __LARCV_TRIGGER_H__
+
+#include "DataFormatTypes.h"
+#include <vector>
+
+namespace larcv {
+    /**
+       \class Trigger
+       \brief Storage for information about detector trigger that created this image
+    */
+    class Trigger {
+
+    public:
+        /// Default constructor
+        Trigger(InstanceID_t id=kINVALID_INSTANCEID, unsigned long long time_s=kINVALID_ULONGLONG, unsigned int time_ns=kINVALID_UINT, int type=kINVALID_INT)
+          : _id(id), _time_s(time_s), _time_ns(time_ns), _type(type)
+        {}
+
+        void clear()   { _id = kINVALID_INSTANCEID; _time_s = kINVALID_ULONGLONG; _time_ns = kINVALID_UINT; _type = kINVALID_INT; }
+
+        // accessors
+        InstanceID_t       id()      const { return _id; };
+        unsigned long long time_s()  const { return _time_s; }
+        unsigned int       time_ns() const { return _time_ns; }
+        int                type()    const { return _type; }
+
+        // setters
+        void id(InstanceID_t id)               { _id = id; };
+        void time_s(unsigned long long time_s) { _time_s = time_s; }
+        void time_ns(unsigned int time_ns)     { _time_ns = time_ns; }
+        void type(unsigned int typ)            { _type = typ; }
+
+     private:
+        InstanceID_t       _id;       ///< Trigger ID, if relevant
+        unsigned long long _time_s;   ///< Integer seconds part of UNIX time this trigger was initiated
+        unsigned int       _time_ns;  ///< Fractional part of UNIX time this trigger was initiated, measured in ns
+        int                _type;     ///< DAQ-specific trigger type
+    };
+}
+
+#endif // __LARCV_TRIGGER_H__
+/** @} */ // end of doxygen group
