hepmc - Diff between revs 2 and 14

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 2 Rev 14
Line 111... Line 111...
111 // 111 //
112 112
113 #include "HepMC/GenVertex.h" 113 #include "HepMC/GenVertex.h"
114 #include "HepMC/GenParticle.h" 114 #include "HepMC/GenParticle.h"
115 #include "HepMC/WeightContainer.h" 115 #include "HepMC/WeightContainer.h"
-   116 #include "HepMC/HeavyIon.h"
116 #include <map> 117 #include <map>
117 #include <vector> 118 #include <vector>
118 #include <algorithm> 119 #include <algorithm>
119 #include <iostream> 120 #include <iostream>
120 121
Line 154... Line 155...
154         // to access element 2 of the weights. 155         // to access element 2 of the weights.
155         // or use myevt.weights().push_back( mywgt ); to add an element. 156         // or use myevt.weights().push_back( mywgt ); to add an element.
156         // and you can set the weights with myevt.weights() = myvector; 157         // and you can set the weights with myevt.weights() = myvector;
157         WeightContainer&        weights(); 158         WeightContainer&        weights();
158         const WeightContainer&  weights() const; 159         const WeightContainer&  weights() const;
-   160
-   161         HeavyIon*            heavy_ion() const;
159 162
160         std::vector<long int> random_states() const; 163         std::vector<long int> random_states() const;
161 164
162         void set_signal_process_id( int id ); 165         void set_signal_process_id( int id );
163         void set_event_number( int eventno ); 166         void set_event_number( int eventno );
164         void set_event_scale( double scale ); 167         void set_event_scale( double scale );
165         void set_alphaQCD( double a ); 168         void set_alphaQCD( double a );
166         void set_alphaQED( double a ); 169         void set_alphaQED( double a );
167         void set_signal_process_vertex( GenVertex* ); 170         void set_signal_process_vertex( GenVertex* );
168         void set_random_states( const std::vector<long int>& randomstates ); 171         void set_random_states( const std::vector<long int>& randomstates );
-   172
-   173         void set_heavy_ion( HeavyIon* ion );
169 174
170         int     particles_size() const; 175         int     particles_size() const;
171         bool    particles_empty() const; 176         bool    particles_empty() const;
172         int     vertices_size() const; 177         int     vertices_size() const;
173         bool    vertices_empty() const; 178         bool    vertices_empty() const;
Line 362... Line 367...
362         std::vector<long int> m_random_states; // container of rndm num 367         std::vector<long int> m_random_states; // container of rndm num
363                                                // generator states 368                                                // generator states
364 369
365         std::map< int,GenVertex*,std::greater<int> >   m_vertex_barcodes; 370         std::map< int,GenVertex*,std::greater<int> >   m_vertex_barcodes;
366         std::map< int,GenParticle*,std::less<int> >    m_particle_barcodes; 371         std::map< int,GenParticle*,std::less<int> >    m_particle_barcodes;
-   372         HeavyIon*        m_heavy_ion;         // undefined by default
367 373
368         static unsigned int   s_counter; 374         static unsigned int   s_counter;
369     }; 375     };
370 376
371     /////////////////////////// 377     ///////////////////////////
Line 390... Line 396...
390 396
391     inline WeightContainer& GenEvent::weights() { return m_weights; } 397     inline WeightContainer& GenEvent::weights() { return m_weights; }
392 398
393     inline const WeightContainer& GenEvent::weights() const 399     inline const WeightContainer& GenEvent::weights() const
394     { return m_weights; } 400     { return m_weights; }
-   401
-   402     inline HeavyIon* GenEvent::heavy_ion() const
-   403     { return m_heavy_ion; }
395 404
396     inline std::vector<long int> GenEvent::random_states() const 405     inline std::vector<long int> GenEvent::random_states() const
397     { return m_random_states; } 406     { return m_random_states; }
398 407
399     inline void GenEvent::set_signal_process_id( int id ) 408     inline void GenEvent::set_signal_process_id( int id )
Line 411... Line 420...
411 420
412     inline void GenEvent::set_signal_process_vertex( GenVertex* vtx ) { 421     inline void GenEvent::set_signal_process_vertex( GenVertex* vtx ) {
413         m_signal_process_vertex = vtx; 422         m_signal_process_vertex = vtx;
414         if ( m_signal_process_vertex ) add_vertex( m_signal_process_vertex ); 423         if ( m_signal_process_vertex ) add_vertex( m_signal_process_vertex );
415     } 424     }
-   425
-   426     inline void GenEvent::set_heavy_ion( HeavyIon* ion )
-   427     { m_heavy_ion = ion; }
416 428
417     inline void GenEvent::set_random_states( const std::vector<long int>& 429     inline void GenEvent::set_random_states( const std::vector<long int>&
418                                              randomstates ) 430                                              randomstates )
419     { m_random_states = randomstates; } 431     { m_random_states = randomstates; }
420 432