Merge pull request #50 from sindhu-ku/neutrino_info

Modify neutrino class to add flow variables

Author: francois-drielsma

larcv/core/DataFormat/Neutrino.cxx

@@ -13,7 +13,7 @@ namespace larcv {
   {
     std::stringstream ss;
     std::stringstream buf;
-    ss  << "      \033[95m" << "Neutrino " << " (PdgCode,TrackID) = (" << pdg_code() << "," << nu_track_id() << ")\033[00m " << std::endl;
+    ss  << "      \033[95m" << "Neutrino " << " (PdgCode,TrackID) = (" << pdg_code() << "," << track_id() << ")\033[00m " << std::endl;
     buf << "      ";
 
     ss << buf.str() << "Vertex   (x, y, z, t) = (" << x() << "," << y() << "," << z() << "," << t() << ")" << std::endl

larcv/core/DataFormat/Neutrino.h

@@ -30,10 +30,11 @@ namespace larcv {
 
     /// Default constructor
     Neutrino()
-      : _id         (kINVALID_INDEX)
+      : _id               (kINVALID_INDEX) 
+      , _genid            (kINVALID_INDEX)  
       , _mcst_index (kINVALID_INDEX)
       , _mct_index  (kINVALID_INDEX)
-			, _nu_trackid       (kINVALID_UINT)
+			, _trackid       (kINVALID_UINT)
 			, _lepton_trackid   (kINVALID_UINT)
 			, _current_type     (-1)
 			, _interaction_mode (-1)
@@ -45,12 +46,16 @@ namespace larcv {
 			, _x                (0.)
 			, _y                (0.)
 			, _qsqr             (0.)
+			, _q0               (0.)
+			, _q3               (0.)
 			//, _pt               (0.)
 			, _theta            (0.)
       , _pdg              (0)
+      , _lepton_pdg       (0)
       , _px               (0.)
       , _py               (0.)
       , _pz               (0.)
+      , _lepton_p         (0.)
       , _dist_travel      (-1)
       , _energy_init      (0.)
       , _energy_deposit   (0.)
@@ -61,7 +66,9 @@ namespace larcv {
     /// Default destructor
     ~Neutrino(){}
     /// particle's ID getter
-    inline InstanceID_t id         () const { return _id;         }
+    inline InstanceID_t id               () const { return _id;         } 
+    inline InstanceID_t gen_id        () const { return _genid;         }
+    
     // origin/generator info getter
     inline MCSTIndex_t  mcst_index () const { return _mcst_index; }
     inline MCTIndex_t   mct_index  () const { return _mct_index;  }
@@ -72,18 +79,22 @@ namespace larcv {
 		inline int    nucleon          () const { return _nucleon; }
 		inline int    quark            () const { return _quark; }
 		inline double momentum_transfer () const { return _qsqr; }
+		inline double momentum_transfer_mag () const { return _q3; }
+		inline double energy_transfer () const { return _q0; }
 		inline double bjorken_x         () const { return _x; }
 		inline double hadronic_invariant_mass () const { return _w; }
 		inline double inelasticity     () const { return _y; }
 		inline double theta            () const { return _theta; }
 
     // particle's info getter
-    inline unsigned int nu_track_id   () const { return _nu_trackid;    }
+    inline unsigned int track_id   () const { return _trackid;    }
     inline unsigned int lepton_track_id   () const { return _lepton_trackid;    }
     inline int          pdg_code   () const { return _pdg;        }
+    inline int          lepton_pdg_code   () const { return _lepton_pdg;        }  
     inline double       px         () const { return _px;         }
     inline double       py         () const { return _py;         }
     inline double       pz         () const { return _pz;         }
+    inline double       lepton_p   () const { return _lepton_p;     }
     //inline double       pt         () const { return _pt;         }
     inline double       p          () const { return sqrt(pow(_px,2)+pow(_py,2)+pow(_pz,2)); }
     inline const larcv::Vertex& position() const { return _vtx;   }
@@ -110,7 +121,8 @@ namespace larcv {
     // Setters
     //
     // generator/origin info setter
-    inline void id              (InstanceID_t id  )  { _id = id;         }
+    inline void id        (InstanceID_t id  )  { _id = id;         }
+    inline void gen_id     (InstanceID_t genid )  { _genid = genid;       }
     inline void mcst_index      (MCSTIndex_t id )    { _mcst_index = id;    }
     inline void mct_index       (MCTIndex_t id )     { _mct_index = id;     }
     inline void current_type (short curr) {_current_type = curr; }
@@ -120,19 +132,23 @@ namespace larcv {
 		inline void nucleon      (int nucleon)     { _nucleon = nucleon; }
 		inline void quark        (int quark)       { _quark = quark; }
 		inline void momentum_transfer (double q2)  { _qsqr = q2; }
+		inline void momentum_transfer_mag (double q3)  { _q3 = q3; }
+		inline void energy_transfer (double q0)  { _q0 = q0; }
 		inline void bjorken_x    (double x)        { _x = x; }
 		inline void hadronic_invariant_mass (double w) { _w = w; }
 		inline void inelasticity (double y)        { _y = y; }
 		inline void theta (double theta)           { _theta = theta; }
 
 		// particle's info setter
-    inline void nu_track_id        (unsigned int id )   { _nu_trackid = id;       }
-    inline void lepton_track_id        (unsigned int id )   { _nu_trackid = id;       }
+    inline void track_id        (unsigned int id )   { _trackid = id;       }
+    inline void lepton_track_id (unsigned int id )   { _lepton_trackid = id;       }
     inline void pdg_code        (int code)           { _pdg = code;         }
+    inline void lepton_pdg_code (int code)           { _lepton_pdg = code;         }
     inline void momentum        (double px, double py, double pz) { _px = px; _py = py; _pz = pz; }
+    inline void lepton_p        (double lepton_p) {_lepton_p = lepton_p; }
     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 distance_travel ( double dist ) { _dist_travel = dist; }
+    inline void distance_travel (double dist ) { _dist_travel = dist; }
     inline void energy_init     (double e)           { _energy_init = e;    }
     inline void energy_deposit  (double e)           { _energy_deposit = e; }
     inline void creation_process (const std::string& proc) { _process = proc; }
@@ -150,13 +166,13 @@ namespace larcv {
     std::string dump() const;
 
   private:
-
-    InstanceID_t   _id; ///< "ID" of this particle in ParticleSet collection
+    InstanceID_t   _id; ///< "ID" of interaction, unique inside the file
+    InstanceID_t   _genid; ///Original generator ID, if different from Geant4 one (e.g.: GENIE particle ID)
     /// index number in the origin MCShower/MCTrack container array (kINVALID_USHORT if neither)
     MCSTIndex_t  _mcst_index;
     ///< index number in the origin MCTruth container array (kINVALID_USHORT if MCShower/MCTrack)
     MCTIndex_t   _mct_index;
-    unsigned int _nu_trackid;     ///< Geant4 track id
+    unsigned int _trackid;     ///< Geant4 track id
 		unsigned int _lepton_trackid;
     short _current_type;       ///< if neutrino, shows interaction GENIE current type. else kINVALID_USHORT
 		short _interaction_mode;   ///< if neutrino, shows interaction GENIE mode (QE / 1-pi / DIS / ...)
@@ -167,12 +183,16 @@ namespace larcv {
 		double _w;
 		double _x;         ///< if neutrino, Bjorken variable x
 		double _y;
-		double _qsqr; ///< if neutrino, momentum transfer Q^2
+		double _qsqr; ///< if neutrino, momentum transfer Q^2 [MeV]
+		double _q3; ///< Maginitude of momentum transfer [MeV]
+		double _q0; ///< Energy transfer [MeV]
 		double _theta;
 		//double _pt;
 
     int          _pdg;         ///< PDG code
+    int          _lepton_pdg;         ///< PDG code of the outgoing lepton
     double       _px,_py,_pz;  ///< (x,y,z) component of particle's initial momentum
+    double       _lepton_p;  // outgoing lepton momentum
     Vertex       _vtx;         ///< (x,y,z,t) of particle's vertex information
     double       _dist_travel; ///< filled only if MCTrack origin: distance measured along the trajectory
     double       _energy_init; ///< initial energy of the particle