Smaller changes

[u/mrichter/AliRoot.git] / AliGeant4 / AliParticleGun.h

diff --git a/AliGeant4/AliParticleGun.h b/AliGeant4/AliParticleGun.h
index fd341b602da93c779f52f46a6e08500fa744509e..d438892c8d96059b812a00e4b5b68e984d1a57b4 100644 (file)
--- a/AliGeant4/AliParticleGun.h
+++ b/AliGeant4/AliParticleGun.h
@@ -1,24 +1,33 @@
 // $Id$
 // Category: event
 //
+// Author: I. Hrivnacova
+//
+// Class AliParticleGun
+// --------------------
 // Particle gun that can be interactively composed by a user.
 
 #ifndef ALI_PARTICLE_GUN_H
 #define ALI_PARTICLE_GUN_H
 
+#include "AliVerbose.h"
+#include "AliParticleGunMessenger.h"
+
 #include <G4VPrimaryGenerator.hh>
 #include <globals.hh>
+#include <g4std/vector>
 
-#include <g4rw/tpordvec.h>
 
 class AliGunParticle;
-class AliParticleGunMessenger;
 
 class G4Event;
 
-class AliParticleGun : public G4VPrimaryGenerator
+class AliParticleGun : public G4VPrimaryGenerator,
+                       public AliVerbose
 {
-  typedef G4RWTPtrOrderedVector<AliGunParticle>  AliGunParticleVector;
+  typedef G4std::vector<AliGunParticle*>    GunParticleVector;
+  typedef GunParticleVector::iterator       GunParticleIterator;
+  typedef GunParticleVector::const_iterator GunParticleConstIterator;
 
   public:
      AliParticleGun();
@@ -40,14 +49,14 @@ class AliParticleGun : public G4VPrimaryGenerator
   
   private:
      // data members
-     AliGunParticleVector      fGunParticlesVector; //vector of AliGunParticle
-     AliParticleGunMessenger*  fMessenger;          //messenger
+     GunParticleVector        fGunParticleVector; //vector of AliGunParticle
+     AliParticleGunMessenger  fMessenger;         //messenger
 };
 
 // inline methods
 
 inline G4int AliParticleGun::GetNofGunParticles() const
-{ return fGunParticlesVector.entries(); }
+{ return fGunParticleVector.size(); }
 
 #endif //ALI_PARTICLE_GUN_H