hepmc - Diff between revs 403 and 432

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 403 Rev 432
Line 21... Line 21...
21 #define NEED_SOLARIS_FRIEND_FEATURE 21 #define NEED_SOLARIS_FRIEND_FEATURE
22 #endif // Platform 22 #endif // Platform
23 23
24 #include "HepMC/WeightContainer.h" 24 #include "HepMC/WeightContainer.h"
25 #include "HepMC/SimpleVector.h" 25 #include "HepMC/SimpleVector.h"
-   26 #include "HepMC/IteratorRange.h"
26 #include <iostream> 27 #include <iostream>
27 #include <iterator> 28 #include <iterator>
28 #include <vector> 29 #include <vector>
29 #include <set> 30 #include <set>
30 #include <algorithm> 31 #include <algorithm>
31 32
32 namespace HepMC { 33 namespace HepMC {
33 34
34     /// type of iteration -  
35     enum IteratorRange { parents, children, family, -  
36                          ancestors, descendants, relatives }; -  
-   35     class GenVertexParticleRange;
-   36     class ConstGenVertexParticleRange;
-   37     class GenParticleProductionRange;
-   38     class ConstGenParticleProductionRange;
-   39     class GenParticleEndRange;
-   40     class ConstGenParticleEndRange;
-   41
37     class GenParticle; 42     class GenParticle;
38     class GenEvent; 43     class GenEvent;
39 44
40     //! GenVertex contains information about decay vertices. 45     //! GenVertex contains information about decay vertices.
41 46
Line 124... Line 129...
124         129        
125         /// direct access to the weights container is allowed. 130         /// direct access to the weights container is allowed.
126         WeightContainer&        weights(); 131         WeightContainer&        weights();
127         /// const direct access to the weights container 132         /// const direct access to the weights container
128         const WeightContainer&  weights() const; 133         const WeightContainer&  weights() const;
-   134
-   135         /// particle range
-   136         GenVertexParticleRange particles( IteratorRange range = relatives );
-   137         /// particle range
-   138         ConstGenVertexParticleRange particles( IteratorRange range = relatives ) const;
-   139         /// incoming particle range
-   140         GenParticleProductionRange particles_in( GenParticle&, IteratorRange range = relatives );
-   141         /// incoming particle range
-   142         ConstGenParticleProductionRange particles_in( GenParticle const &, IteratorRange range = relatives ) const;
-   143         /// outgoing particle range
-   144         GenParticleEndRange particles_out( GenParticle&, IteratorRange range = relatives );
-   145         /// outgoing particle range
-   146         ConstGenParticleEndRange particles_out( GenParticle const &, IteratorRange range = relatives ) const;
129 147
130         //////////////////// 148         ////////////////////
131         // Iterators      // users should use prefer to use particle_iterator 149         // Iterators      // users should use prefer to use particle_iterator
132         ////////////////////     150         ////////////////////    
133 151