Changeset 572 in svn for trunk/Utilities/HepMC/interface/GenVertex.h

Timestamp:

Nov 2, 2011, 5:39:26 PM (13 years ago)

Author:

cp3-support

Message:

upgrade HepMC to version 2.06.05

File:

• trunk/Utilities/HepMC/interface/GenVertex.h (modified) (6 diffs)

trunk/Utilities/HepMC/interface/GenVertex.h

@@ -24 +24 @@
 #include "WeightContainer.h"
 #include "SimpleVector.h"
+#include "IteratorRange.h"
 #include <iostream>
 #include <iterator>
@@ -29 +30 @@
 #include <set>
 #include <algorithm>
+#include <cstddef>
 
 namespace HepMC {
 
-    /// type of iteration
-    enum IteratorRange { parents, children, family, 
-                         ancestors, descendants, relatives };
+    class GenVertexParticleRange;
+    class GenParticleProductionRange;
+    class ConstGenParticleProductionRange;
+    class GenParticleEndRange;
+    class ConstGenParticleEndRange;
+
     class GenParticle;
     class GenEvent;
@@ -110 +115 @@
         ///
         /// The barcode is the vertex's reference number, every vertex in the
-        ///  event has a unique barcode. Vertex barcodes are negative numbers,
-        ///  particle barcodes are positive numbers.
+        /// event has a unique barcode. Vertex barcodes are negative numbers,
+        /// particle barcodes are positive numbers.
+        /// 
+        /// Please note that the barcodes are intended for internal use within 
+        /// HepMC as a unique identifier for the particles and vertices.
+        /// Using the barcode to encode extra information is an abuse of 
+        /// the barcode data member and causes confusion among users. 
+        /// 
         int                     barcode() const; //!< unique identifier
 
@@ -121 +132 @@
         /// const direct access to the weights container
         const WeightContainer&  weights() const;
+
+        /// particle range
+        GenVertexParticleRange particles( IteratorRange range = relatives );
+        /// incoming particle range
+        GenParticleProductionRange particles_in( GenParticle&, IteratorRange range = relatives );
+        /// incoming particle range
+        ConstGenParticleProductionRange particles_in( GenParticle const &, IteratorRange range = relatives ) const;
+        /// outgoing particle range
+        GenParticleEndRange particles_out( GenParticle&, IteratorRange range = relatives );
+        /// outgoing particle range
+        ConstGenParticleEndRange particles_out( GenParticle const &, IteratorRange range = relatives ) const;
 
         ////////////////////
@@ -197 +219 @@
             /// root vertex of this iteration
             const GenVertex*  vertex_root() const;
+        private:
+            /// Pre-fix increment -- is not allowed
+            edge_iterator& operator--(void);
+            /// Post-fix increment -- is not allowed
+            edge_iterator  operator--(int);
         private:
             const GenVertex*  m_vertex;
@@ -275 +302 @@
                                               recursive_v_iter );
         private:
+            /// Pre-fix increment -- is not allowed 
+            vertex_iterator&    operator--(void);
+            /// Post-fix increment -- is not allowed 
+            vertex_iterator     operator--(int);
+
+        private:
             GenVertex*       m_vertex;   // the vertex associated to this iter
             IteratorRange    m_range;