hepmc

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/trunk/ @ 101  →  /trunk/ @ 100
/trunk/test/testHepMC.sh.in
@@ -11,18 +11,17 @@
case "$OS" in
CYGWIN*)
#don't compare these on Windows (hopelessly different default output)
sed 's/e+00/e+0/g' testHepMC.out | \
@DIFF_Q@ - @srcdir@/testHepMC.dat
;;
Darwin*)
# MacOSX fix
sed 's/e-00/e+00/g' @srcdir@/testHepMCParticle.output | \
@DIFF_Q@ - testHepMCParticle.out
@DIFF_Q@ testHepMC.out @srcdir@/testHepMC.dat
@DIFF_Q@ testHepMCExtended.out @srcdir@/testHepMCExtended.dat
;;
*)
@DIFF_Q@ testHepMCParticle.out @srcdir@/testHepMCParticle.output
@DIFF_Q@ testHepMC.out @srcdir@/testHepMC.dat
@DIFF_Q@ testHepMCExtended.out @srcdir@/testHepMCExtended.dat
esac
 
# perform the following comparisons by hand
# Particles within a vertex are not written in a defined order
@DIFF_Q@ testHepMC.out @srcdir@/testHepMC.dat
@DIFF_Q@ testHepMCExtended.out @srcdir@/testHepMCExtended.dat
/trunk/ChangeLog
@@ -1,8 +1,3 @@
 
2007-06-19 Lynn Garren
 
* HepMC/GenParticle.h: use uint64_t for the serial number counter
 
-------------------------- HepMC-2.01.00 --------------------------
 
2007-06-08 Lynn Garren
/trunk/src/GenParticle.cc
@@ -163,10 +163,10 @@
// Static //
/////////////
unsigned int GenParticle::counter() { return s_counter; }
unsigned int GenParticle::s_counter = 0U;
unsigned int GenParticle::s_counter = 0;
 
uint64_t GenParticle::serialnumber() const { return m_serialnumber; }
uint64_t GenParticle::s_serialize = 0U;
unsigned int GenParticle::serialnumber() const { return m_serialnumber; }
unsigned int GenParticle::s_serialize = 0U;
 
/////////////
// Friends //
/trunk/HepMC/GenParticle.h
@@ -30,7 +30,6 @@
#include "HepMC/Polarization.h"
#include "HepMC/SimpleVector.h"
#include <iostream>
#include <stdint.h> // for uint64_t
 
namespace HepMC {
 
@@ -116,7 +115,7 @@
/// vertex barcodes are negative numbers.
int barcode() const; //!< particle barcode
 
uint64_t serialnumber() const; //!< used by GenParticleComparison
unsigned int serialnumber() const; //!< used by GenParticleComparison
 
/// In general there is no reason to "suggest_barcode"
bool suggest_barcode( int the_bar_code );
@@ -156,10 +155,10 @@
GenVertex* m_end_vertex; // null if not-decayed
int m_barcode; // unique identifier in the event
double m_generated_mass; // mass of this particle when it was generated
uint64_t m_serialnumber; // unique ID for set comparator
unsigned int m_serialnumber; // unique ID for set comparator
 
static unsigned int s_counter;
static uint64_t s_serialize;
static unsigned int s_serialize;
};
 
//////////////