Fix problem in ParticleGun spotted by Andre

DD4hep.config

+// ADD PREDEFINED MACROS HERE!

DD4hep.creator

+[General]

DD4hep.includes

+DDAlign/include/DDAlign
+DDCond/include/DDCond
+DDCore/include/DD4hep
+DDCore/include/DD4hep/objects
+DDCore/include/ROOT
+DDCore/include/XML
+DDCore/src
+DDCore/src/parsers
+DDCore/src/plugins
+DDCore/src/XML
+DDEve/include/DDEve
+DDEve/lcio
+DDG4/include/DDG4
+DDG4/include/DDG4Python
+DDG4/lcio
+DDG4/plugins
+DDG4/src/python
+DDRec/include/DDRec
+DDRec/include/DDRec/API
+DDRec/include/DDRec/Extensions
+DDSegmentation/include/DDSegmentation
+DDSurfaces/include/DDSurfaces
+DDTest/include/DD4hep
+doc/doxygen
+examples/ClientTests/src
+GaudiPluginService/Gaudi
+GaudiPluginService/Gaudi/Details
+GaudiPluginService/src
+UtilityApps/src
\ No newline at end of file

DDG4/include/DDG4/Geant4ParticleGenerator.h

@@ -26,6 +26,10 @@ namespace DD4hep {
 
   /// Namespace for the Geant4 based simulation part of the AIDA detector description toolkit
   namespace Simulation {
+
+    // Forward declarations
+    class Geant4PrimaryInteraction;
+
     /// Generate particles isotrop in space around origine (0,0,0)
     /**
      *  \author  M.Frank
@@ -34,9 +38,6 @@ namespace DD4hep {
      */
     class Geant4ParticleGenerator: public Geant4GeneratorAction {
     public:
-      enum { FIRST_INTERACTION =   0UL,
-             LAST_INTERACTION  =  ~0UL
-      };
     protected:
       /// Property: Shooting direction of the gun
       ROOT::Math::XYZVector m_direction;
@@ -65,8 +66,10 @@ namespace DD4hep {
       */
       virtual void getParticleDirection(int num, ROOT::Math::XYZVector& direction, double& momentum) const;
 
-      /// Print single particle interaction identified by sequence number in primary event. Default: last one 
-      virtual void printInteraction(size_t which=LAST_INTERACTION)  const;
+      /// Print single particle interaction identified by its mask
+      virtual void printInteraction(int mask)  const;
+      /// Print single particle interaction identified by it's reference
+      virtual void printInteraction(Geant4PrimaryInteraction* inter)  const;
     
 
     public:

DDG4/include/DDG4/Geant4ParticleGun.h

@@ -51,6 +51,8 @@ namespace DD4hep {
       bool m_isotrop;
       /// Property: Standalone mode: includes interaction merging and primary generation
       bool m_standalone;
+      /// Property: Enable printout
+      bool m_print;
       /// Shot number in sequence
       int m_shotNo;
       /// Particle modification. Caller presets defaults to: ( direction = m_direction, momentum = m_energy)

DDG4/plugins/Geant4SDActions.cpp

@@ -62,11 +62,11 @@ namespace DD4hep {
         hit->cellID        = volumeID( step ) ;
         except("+++ Invalid CELL ID for hit!");
       }
-      print("%s> Hit with deposit:%f  Pos:%f %f %f ID=%016X",
-            c_name(),step->GetTotalEnergyDeposit(),position.X(),position.Y(),position.Z(),
+      print("Hit with deposit:%f  Pos:%f %f %f ID=%016X",
+            step->GetTotalEnergyDeposit(),position.X(),position.Y(),position.Z(),
             (void*)hit->cellID);
       Geant4TouchableHandler handler(step);
-      print("%s>     Geant4 path:%s",c_name(),handler.path().c_str());
+      print("    Geant4 path:%s",handler.path().c_str());
       return true;
     }
     typedef Geant4SensitiveAction<Geant4Tracker> Geant4TrackerAction;
@@ -227,8 +227,8 @@ namespace DD4hep {
         hit = new Hit(global);
         hit->cellID = cell;
         coll->add(hit);
-        printM2("%s> CREATE hit with deposit:%e MeV  Pos:%8.2f %8.2f %8.2f  %s",
-                c_name(),contrib.deposit,pos.X,pos.Y,pos.Z,handler.path().c_str());
+        printM2("CREATE hit with deposit:%e MeV  Pos:%8.2f %8.2f %8.2f  %s",
+                contrib.deposit,pos.X,pos.Y,pos.Z,handler.path().c_str());
         if ( 0 == hit->cellID )  { // for debugging only!
           hit->cellID = cellID(step);
           except("+++ Invalid CELL ID for hit!");

DDG4/src/Geant4ParticleGenerator.cpp

@@ -59,29 +59,38 @@ void Geant4ParticleGenerator::getParticleMultiplicity(int& ) const   {
 void Geant4ParticleGenerator::getVertexPosition(ROOT::Math::XYZVector& ) const   {
 }
 
-/// Print single particle interaction identified by sequence number in primary event
-void Geant4ParticleGenerator::printInteraction(size_t which)  const  {
+/// Print single particle interaction identified by it's mask
+void Geant4ParticleGenerator::printInteraction(int mask)  const  {
+  Geant4PrimaryEvent* prim = context()->event().extension<Geant4PrimaryEvent>();
+  if ( !prim )   {
+    warning("printInteraction: Bad primary event [NULL-Pointer].");
+    return;
+  }
+  Geant4PrimaryInteraction* inter = prim->get(mask);
+  if ( !inter )   {
+    warning("printInteraction: Bad interaction identifier 0x%08X [Unknown Mask].",mask);
+    return;
+  }
+  printInteraction(inter);
+}
+
+/// Print single particle interaction identified by it's reference
+void Geant4ParticleGenerator::printInteraction(Geant4PrimaryInteraction* inter)  const  {
   typedef Geant4PrimaryInteraction::VertexMap _V;
   int count = 0;
-  Geant4Event& evt = context()->event();
-  Geant4PrimaryEvent* prim = evt.extension<Geant4PrimaryEvent>();
-
-  if ( which == LAST_INTERACTION && prim->size() > 0 )
-    which = prim->size()-1;
-  if ( which >= prim->size() )
-    except("printInteraction: Bad interaction identifier %d must be [0,%d].",
-           which, prim->size());
-
-  Geant4PrimaryInteraction* inter = prim->get(which);
+  if ( !inter )   {
+    warning("printInteraction: Invalid interaction pointer [NULL-Pointer].");
+    return;
+  }
   for(_V::const_iterator iv=inter->vertices.begin(); iv!=inter->vertices.end(); ++iv)  {
     Geant4Vertex* v = (*iv).second;
-    printM1("+-> Interaction [%d] %.3f GeV %s pos:(%.3f %.3f %.3f)[mm]",
+    print("+-> Interaction [%d] %.3f GeV %s pos:(%.3f %.3f %.3f)[mm]",
              count, m_energy/CLHEP::GeV, m_particleName.c_str(),
              v->x/CLHEP::mm, v->y/CLHEP::mm, v->z/CLHEP::mm);
     ++count;
     for(set<int>::const_iterator i=v->out.begin(); i!=v->out.end(); ++i)  {
       Geant4ParticleHandle p = inter->particles[*i];
-      p.dumpWithVertex(outputLevel()-1,name(),"  +->");
+      p.dumpWithVertex(outputLevel(),name(),"  +->");
     }
   }
 }

DDG4/src/Geant4ParticleGun.cpp

@@ -41,6 +41,7 @@ Geant4ParticleGun::Geant4ParticleGun(Geant4Context* ctxt, const string& nam)
   declareProperty("energy",       m_energy);
   declareProperty("particle",     m_particleName);
   declareProperty("multiplicity", m_multiplicity);
+  declareProperty("print",        m_print = true);
 }
 
 /// Default destructor
@@ -69,8 +70,9 @@ void Geant4ParticleGun::operator()(G4Event* event)   {
         m_shotNo, m_energy/CLHEP::GeV, m_particleName.c_str(),
         m_position.X()/CLHEP::mm, m_position.Y()/CLHEP::mm, m_position.Z()/CLHEP::mm,
         m_direction.X(),m_direction.Y(), m_direction.Z());
-
-  this->Geant4ParticleGenerator::printInteraction();
+  if ( m_print )   {
+    this->Geant4ParticleGenerator::printInteraction(m_mask);
+  }
   ++m_shotNo;
   if ( m_standalone ) {
     mergeInteractions(this,context());