hepmc

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/trunk/HepMC @ 13  →  /trunk/HepMC/ @ 14
/trunk/HepMC/GenParticle.h
@@ -37,7 +37,6 @@
 
#include "HepMC/Flow.h"
#include "HepMC/Polarization.h"
#include "HepMC/HeavyIon.h"
#include "CLHEP/Vector/LorentzVector.h"
#include <iostream>
 
@@ -82,7 +81,6 @@
GenVertex* production_vertex() const;
GenVertex* end_vertex() const;
GenEvent* parent_event() const;
HeavyIon* heavy_ion() const;
 
//
// The barcode is the particle's reference number, every vertex in the
@@ -101,7 +99,6 @@
void set_flow( int code_index, int code = 0 );
void set_polarization( const Polarization& polarization =
Polarization(0,0) );
void set_heavy_ion( HeavyIon* ion );
 
protected: // for internal use only by friend GenVertex class
 
@@ -119,7 +116,6 @@
Polarization m_polarization;
GenVertex* m_production_vertex; // null if vacuum or beam
GenVertex* m_end_vertex; // null if not-decayed
HeavyIon* m_heavy_ion; // null by default
int m_barcode; // unique identifier in the event
 
static unsigned int s_counter;
@@ -142,9 +138,6 @@
inline GenVertex* GenParticle::production_vertex() const
{ return m_production_vertex; }
 
inline HeavyIon* GenParticle::heavy_ion() const
{ return m_heavy_ion; }
 
inline GenVertex* GenParticle::end_vertex() const { return m_end_vertex; }
 
inline Flow GenParticle::flow() const { return m_flow; }
@@ -176,9 +169,6 @@
inline void GenParticle::set_polarization( const Polarization& polar )
{ m_polarization = polar; }
 
inline void GenParticle::set_heavy_ion( HeavyIon* ion )
{ m_heavy_ion = ion; }
 
inline int GenParticle::barcode() const { return m_barcode; }
 
inline void GenParticle::set_barcode_( int bc ) { m_barcode = bc; }
/trunk/HepMC/GenEvent.h
@@ -113,6 +113,7 @@
#include "HepMC/GenVertex.h"
#include "HepMC/GenParticle.h"
#include "HepMC/WeightContainer.h"
#include "HepMC/HeavyIon.h"
#include <map>
#include <vector>
#include <algorithm>
@@ -157,6 +158,8 @@
WeightContainer& weights();
const WeightContainer& weights() const;
 
HeavyIon* heavy_ion() const;
 
std::vector<long int> random_states() const;
 
void set_signal_process_id( int id );
@@ -167,6 +170,8 @@
void set_signal_process_vertex( GenVertex* );
void set_random_states( const std::vector<long int>& randomstates );
 
void set_heavy_ion( HeavyIon* ion );
 
int particles_size() const;
bool particles_empty() const;
int vertices_size() const;
@@ -364,6 +369,7 @@
 
std::map< int,GenVertex*,std::greater<int> > m_vertex_barcodes;
std::map< int,GenParticle*,std::less<int> > m_particle_barcodes;
HeavyIon* m_heavy_ion; // undefined by default
 
static unsigned int s_counter;
};
@@ -393,6 +399,9 @@
inline const WeightContainer& GenEvent::weights() const
{ return m_weights; }
 
inline HeavyIon* GenEvent::heavy_ion() const
{ return m_heavy_ion; }
 
inline std::vector<long int> GenEvent::random_states() const
{ return m_random_states; }
 
@@ -414,6 +423,9 @@
if ( m_signal_process_vertex ) add_vertex( m_signal_process_vertex );
}
 
inline void GenEvent::set_heavy_ion( HeavyIon* ion )
{ m_heavy_ion = ion; }
 
inline void GenEvent::set_random_states( const std::vector<long int>&
randomstates )
{ m_random_states = randomstates; }
/trunk/HepMC/HeavyIon.h
@@ -112,7 +112,7 @@
m_Nwounded_Nwounded_collisions(orig.m_Nwounded_Nwounded_collisions),
m_spectator_neutrons(orig.m_spectator_neutrons),
m_spectator_protons(orig.m_spectator_protons),
m_impact_parameter(orig.m_impact_parameter)
m_impact_parameter(orig.m_impact_parameter),
m_event_plane_angle(orig.m_event_plane_angle)
{}