Changeset 1337 for trunk/examples/extended/eventgenerator/HepMC/HepMCEx02/src

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

Location:

trunk/examples/extended/eventgenerator/HepMC/HepMCEx02/src

Files:

• HepMCG4AsciiReader.cc (modified) (3 diffs)
• HepMCG4Interface.cc (modified) (3 diffs)
• HepMCG4PythiaInterface.cc (modified) (2 diffs)

trunk/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4AsciiReader.cc

@@ -27 +27 @@
 //
 //   HepMCG4AsciiReader.cc
-//   $Id: HepMCG4AsciiReader.cc,v 1.5 2006/06/29 17:12:09 gunter Exp $
+//   $Id: HepMCG4AsciiReader.cc,v 1.6 2010/05/24 05:29:44 kmura Exp $
 //
 // ====================================================================
@@ -41 +41 @@
 ////////////////////////////////////////
 {
-  asciiInput= new HepMC::IO_Ascii(filename.c_str(), std::ios::in);
+  asciiInput= new HepMC::IO_AsciiParticles(filename.c_str(), std::ios::in);
 
   messenger= new HepMCG4AsciiReaderMessenger(this);
@@ -60 +60 @@
   delete asciiInput;
 
-  asciiInput= new HepMC::IO_Ascii(filename.c_str(), std::ios::in);
+  asciiInput= new HepMC::IO_AsciiParticles(filename.c_str(), std::ios::in);
   asciiInput-> print();
 }

trunk/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4Interface.cc

@@ -27 +27 @@
 //
 //   HepMCG4Interface.cc
-//   $Id: HepMCG4Interface.cc,v 1.4 2006/06/29 17:12:24 gunter Exp $
+//   $Id: HepMCG4Interface.cc,v 1.5 2010/05/24 05:29:44 kmura Exp $
 //
 // ====================================================================
@@ -91 +91 @@
 
     // check world boundary
-    G4LorentzVector xvtx= (*vitr)-> position();
+    HepMC::FourVector pos= (*vitr)-> position(); 
+    G4LorentzVector xvtx(pos.x(), pos.y(), pos.z(), pos.t());
     if (! CheckVertexInsideWorld(xvtx.vect()*mm)) continue;
 
@@ -106 +107 @@
 
       G4int pdgcode= (*vpitr)-> pdg_id();
-      G4LorentzVector p= (*vpitr)-> momentum();
+      pos= (*vpitr)-> momentum();
+      G4LorentzVector p(pos.px(), pos.py(), pos.pz(), pos.e());
       G4PrimaryParticle* g4prim= 
         new G4PrimaryParticle(pdgcode, p.x()*GeV, p.y()*GeV, p.z()*GeV);

trunk/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaInterface.cc

@@ -27 +27 @@
 //
 //   HepMCG4PythiaInterface.cc
-//   $Id: HepMCG4PythiaInterface.cc,v 1.6 2006/07/05 12:04:13 gcosmo Exp $
+//   $Id: HepMCG4PythiaInterface.cc,v 1.7 2010/05/24 05:29:44 kmura Exp $
 //
 // ====================================================================
@@ -37 +37 @@
 
 #include "HepMC/GenEvent.h" 
-#include "HepMC/PythiaWrapper6_152.h" 
+#include "HepMC/PythiaWrapper6_4.h" 
 
 // additional pythia calls