merging changes from HepMC 1.25

HepMC/HepMC/CBhepevt.icc

-// $Id: CBhepevt.icc,v 1.3 2003/10/10 15:56:34 garren Exp $
+// $Id: CBhepevt.icc,v 1.3.2.1 2004/05/11 22:18:57 garren Exp $
 // ----------------------------------------------------------------------
 // CBhepevt.icc
 // ----------------------------------------------------------------------
 // Author:  Lynn Garren, Marc Paterno,
 //
+#include <stdio.h>       // needed for formatted output using sprintf 
 
 namespace HepMC  {
 

HepMC/HepMC/CBherwig.icc

-// $Id: CBherwig.icc,v 1.1 2003/10/10 15:56:34 garren Exp $
+// $Id: CBherwig.icc,v 1.1.2.1 2004/05/11 22:18:58 garren Exp $
 // ----------------------------------------------------------------------
 // CBherwig.icc
 // ----------------------------------------------------------------------
 // Author:  Lynn Garren, Marc Paterno,
 //
+#include <stdio.h>       // needed for formatted output using sprintf 
+
 namespace HepMC  {
 
 CBherwig::CBherwig()

HepMC/HepMC/GenEvent.h

@@ -376,7 +376,7 @@ namespace HepMC {
     private: // data members
 	int                   m_signal_process_id;
 	int                   m_event_number;  
-	double                m_event_scale;// GeV, see hep-ph/0109068
+	double                m_event_scale;// energy scale, see hep-ph/0109068
 	double                m_alphaQCD;   // QCD coupling, see hep-ph/0109068
 	double                m_alphaQED;   // QED coupling, see hep-ph/0109068
 	GenVertex*            m_signal_process_vertex;

HepMC/HepMC/GenParticle.h

@@ -64,6 +64,7 @@ namespace HepMC {
         typedef  HepMCConfig::ParticleData   ParticleData;
         typedef  HepMCConfig::DecayData      DecayData;
 
+        GenParticle(void);
 	GenParticle( const CLHEP::HepLorentzVector& momentum, int pdg_id,
 		     int status = 0, const Flow& itsflow = Flow(),
 		     const Polarization& polar = Polarization(0,0) );
@@ -189,7 +190,7 @@ namespace HepMC {
 	void   set_barcode_( int the_bar_code ); // for use by GenEvent only
 
     private:
-	CLHEP::HepLorentzVector m_momentum;          // 4 vector in GeV
+	CLHEP::HepLorentzVector m_momentum;          // 4 vector
 	int              m_pdg_id;            // id according to PDG convention
 	int              m_status;            // As defined for HEPEVT
 	Flow             m_flow;
@@ -197,7 +198,7 @@ namespace HepMC {
 	GenVertex*       m_production_vertex; // null if vacuum or beam
 	GenVertex*       m_end_vertex;        // null if not-decayed
 	int              m_barcode;           // unique identifier in the event
-        double           itsGeneratedMass;    // (in GeV/c**2)
+        double           itsGeneratedMass;    // 
         int              itsCollisionNumber;  // for StdHep
 	ParticleData *   itsParticleData;	// should be null only if no 
 	                                        //    particle data is desired

HepMC/doc/ChangeLog

+	--------------------  CLHEP 1.9.0.2 ------------------
+
+2004-05-11  Lynn Garren  <garren@fnal.gov>
+        
+	integrating changes from HepMC 1.25 into CLHEP/HepMC
+	
+	note that CLHEP/HepMC was already using 
+	std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t>
+	#ifdefs used to retain compatibility with gcc 2.95.2
+	(gcc 2.95.2 compatibility only guaranteed for 1.9.x)
+
+	-------------------- HepMC 1.25 -------------
+
+2004-03-27  Matt Dobbs  <Matt.Dobbs@Cern.CH>
+
+        Removed the #define statements that allow backwards compatibility
+	with gcc 2.95, and specialized the 3.2 compliant iterators to be
+	forward iterators such that they work properly with std
+	algorithms.
+
+	Thanks to Ulrik Egede for pointing this out.
+	
+	* HepMC/GenVertex.h, .cxx HepMC/GenEvent.h, .cxx: changed 
+	std::forward_iterator<GenParticle*,ptrdiff_t>
+	to
+	std::iterator<std::forward_iterator_tag,GenParticle*,ptrdiff_t>
+	for standard
+	compliance, and removed #define statements.
+	
+	* HepMC/IO_Ascii.h,.cxx: changed open_mode to openmode for standard
+	compliance, and removed #define statements.
+	
+
+2003-12-17  David Rousseau  <droussea@lxplus072.cern.ch>
+
+	* cmt/requirements: remove HepMC_libraries
+
+2003-10-22  Matt Dobbs  <Matt.Dobbs@Cern.CH>
+
+	* src/GenEvent.cxx and lots of other files + latex documentation.
+	REmoved any mention of units--- GeV, MeV etc, since HepMC merely
+	accepts whatever is put in. I do this because, though HEPEVT has
+	used GeV/mm, ATLAS plans to use CLHEP units of MeV/mm.
+
+2003-10-15  Matt Dobbs  <Matt.Dobbs@Cern.CH>
+
+	* src/GenParticle.cxx (HepMC): added a default constructor for
+	GenParticle as requested by Giorgos S.
+
 
 	--------------------  CLHEP_1_900 --------------------
 

HepMC/src/GenEvent.cc

@@ -133,7 +133,7 @@ namespace HepMC {
 	      wgt != weights().end(); wgt++ ) { ostr << *wgt << " "; }
 	ostr << "\n";
 	ostr << " EventScale " << event_scale() 
-	     << " GeV \t alphaQCD=" << alphaQCD() 
+	     << " [energy] \t alphaQCD=" << alphaQCD() 
 	     << "\t alphaQED=" << alphaQED() << std::endl;
 	// print a legend to describe the particle info
 	char particle_legend[80];

HepMC/src/GenParticle.cc

@@ -11,6 +11,18 @@
 
 namespace HepMC {
 
+    GenParticle::GenParticle( void ) :
+	m_momentum(0), m_pdg_id(0), m_status(0), m_flow(this),
+        m_polarization(0), m_production_vertex(0), m_end_vertex(0),
+        m_barcode(0),
+        itsGeneratedMass( 0 ),
+	itsCollisionNumber(0),
+	itsParticleData( NULL ),
+	itsDecayData( NULL )
+    {
+	s_counter++;
+    }
+
     GenParticle::GenParticle( const CLHEP::HepLorentzVector& momentum, 
 			int pdg_id, int status, 
 			const Flow& itsflow,
@@ -208,7 +220,7 @@ namespace HepMC {
 		     part.momentum().px(),part.momentum().py(),
 		     part.momentum().pz(),part.momentum().e(),
 		     part.status(),
-		     part.end_vertex() );
+		     (void*)part.end_vertex() );
 	}
 	return ostr << outline;
     }

HepMC/src/GenVertex.cc

@@ -145,14 +145,14 @@ namespace HepMC {
 	    if ( position() != CLHEP::HepLorentzVector(0,0,0,0) ) {
 		sprintf( outline,
 			 "Vertex:%9p ID:%5d (X,cT)=%+9.2e,%+9.2e,%+9.2e,%+9.2e"
-			 ,this, id(),
+			 ,(void*)this, id(),
 			 position().x(),
 			 position().y(),
 			 position().z(),
 			 position().t() );
 	    } else {
 		sprintf( outline, "GenVertex:%9p ID:%5d (X,cT):0", 
-			 this, id() );
+			 (void*)this, id() );
 	    }
 	}