hepmc - Diff between revs 173 and 179

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 173 Rev 179
Line 17... Line 17...
17 17
18     GenEvent::GenEvent( int signal_process_id, 18     GenEvent::GenEvent( int signal_process_id,
19                         int event_number, 19                         int event_number,
20                         GenVertex* signal_vertex, 20                         GenVertex* signal_vertex,
21                         const WeightContainer& weights, 21                         const WeightContainer& weights,
22                         const std::vector<long int>& random_states ) : -  
-   22                         const std::vector<long>& random_states ) :
23         m_signal_process_id(signal_process_id), 23         m_signal_process_id(signal_process_id),
24         m_event_number(event_number), 24         m_event_number(event_number),
25         m_mpi(-1), 25         m_mpi(-1),
26         m_event_scale(-1), 26         m_event_scale(-1),
27         m_alphaQCD(-1), 27         m_alphaQCD(-1),
Line 44... Line 44...
44     } 44     }
45 45
46     GenEvent::GenEvent( int signal_process_id, int event_number, 46     GenEvent::GenEvent( int signal_process_id, int event_number,
47                         GenVertex* signal_vertex, 47                         GenVertex* signal_vertex,
48                         const WeightContainer& weights, 48                         const WeightContainer& weights,
49                         const std::vector<long int>& random_states, -  
-   49                         const std::vector<long>& random_states,
50                         const HeavyIon& ion, 50                         const HeavyIon& ion,
51                         const PdfInfo& pdf ) : 51                         const PdfInfo& pdf ) :
52         m_signal_process_id(signal_process_id), 52         m_signal_process_id(signal_process_id),
53         m_event_number(event_number), 53         m_event_number(event_number),
54         m_mpi(-1), 54         m_mpi(-1),
Line 505... Line 505...
505         return false; 505         return false;
506     } 506     }
507 507
508     /// construct the beam particle information using a std::pair of pointers to GenParticle 508     /// construct the beam particle information using a std::pair of pointers to GenParticle
509     /// returns false if either GenParticle* is null 509     /// returns false if either GenParticle* is null
510     bool  GenEvent::set_beam_particles(std::pair<GenParticle*, GenParticle*> const & bp) { -  
-   510     bool  GenEvent::set_beam_particles(std::pair<HepMC::GenParticle*, HepMC::GenParticle*> const & bp) {
511         return set_beam_particles(bp.first,bp.second); 511         return set_beam_particles(bp.first,bp.second);
512     } 512     }
513 513
514     ///////////// 514     /////////////
515     // Static  // 515     // Static  //
516     ///////////// 516     /////////////
517     unsigned int GenEvent::counter() { return s_counter; } 517     unsigned int GenEvent::counter() { return s_counter; }
518     unsigned int GenEvent::s_counter = 0; 518     unsigned int GenEvent::s_counter = 0;
519 519
520 } // HepMC 520 } // HepMC
521 -  
522 -  
523 521