Import Geant4 6.2.0 source tree

examples/extended/electromagnetic/TestEm6/include/RunAction.hh

@@ -21,8 +21,8 @@
 // ********************************************************************
 //
 //
-// $Id: RunAction.hh,v 1.5 2003/10/10 10:42:39 maire Exp $
-// GEANT4 tag $Name: geant4-06-00-patch-01 $
+// $Id: RunAction.hh,v 1.7 2004/03/31 16:33:35 maire Exp $
+// GEANT4 tag $Name: geant4-06-02 $
 //
 // 
 
@@ -39,13 +39,15 @@
 
 class G4Run;
 
-#ifdef G4ANALYSIS_USE
+#ifdef USE_AIDA
 namespace AIDA {
  class ITree;
  class IHistogram1D;
 } 
 #endif
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
 class RunAction : public G4UserRunAction
 {
   public:
@@ -56,19 +58,19 @@ class RunAction : public G4UserRunAction
     void BeginOfRunAction(const G4Run*);
     void   EndOfRunAction(const G4Run*);
     
-#ifdef G4ANALYSIS_USE
+#ifdef USE_AIDA
     AIDA::IHistogram1D* GetHisto(G4int id) {return histo[id];}
 #endif
-           
+
   private:  
     void bookHisto();
     void cleanHisto();
     
-#ifdef G4ANALYSIS_USE
   private:      
+#ifdef USE_AIDA   
     AIDA::ITree* tree;
     AIDA::IHistogram1D* histo[6];
-#endif                     
+#endif                      
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......