--- PamVMC/include/PamVMCApplication.h	2009/02/19 16:50:35	1.1
+++ PamVMC/include/PamVMCApplication.h	2009/06/12 18:39:16	1.5
@@ -10,18 +10,20 @@
 #define PAMVMC_APPLICATION_H
 
 #include <TVirtualMCApplication.h>
-#include "TMCVerbose.h"
+#include <TMCVerbose.h>
+#include <TRandom.h>
 
 #include "PamVMCDetectorSD.h"
 
+#include "PamVMCPrimaryGenerator.h"
 #include "PamVMCDetector.h"
 #include "PamVMCDetPamela.h"
+#include "PamVMCFieldMgr.h"
 
 #include "PamRootManager.h"
 #include "PamVMCDetectorHit.h"
 #include <TMap.h>
 
-//#include "PamVMCDetector.h"
 
 #ifdef PAMFIELD
 #include "TrkParams.h"
@@ -39,8 +41,8 @@
 class PamVMCApplication : public TVirtualMCApplication
 {
   public:
-    PamVMCApplication(const char* name,  const char *title);
-    PamVMCApplication();
+    PamVMCApplication(const char* name,  const char *title, const char* filename="pamtest", Int_t seed=0);
+ 
     virtual ~PamVMCApplication();
   
     // static access method
@@ -62,8 +64,9 @@
     virtual void FinishPrimary();
     virtual void FinishEvent();
     virtual void FinishRun();
+#if ROOT_VERSION_CODE < 333572
     virtual void Field(const Double_t* x, Double_t* b) const;
-    
+#endif
     // set methods
     void  SetVerboseLevel(Int_t verboseLevel);
  
@@ -74,16 +77,17 @@
  
   private:
 
+    Bool_t IsInsideCavity();
 
     // data members
     Int_t                     fEventNo;
     TMCVerbose                fVerbose;
     PamVMCStack*              fStack;
-    PamVMCDetPamela       *fdetector;
-    PamVMCPrimaryGenerator*     fPrimaryGenerator;
-    PamRootManager             fRootManager;
- 
-    fin fdstatus;
+    PamVMCDetPamela*          fdetector;
+    PamVMCPrimaryGenerator*   fPrimaryGenerator;
+    PamRootManager            fRootManager;
+    TRandom3*                  frandom;
+    fin                       fdstatus;