Import Geant4 9.2.0 source tree

examples/novice/N03/exampleN03.cc

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: exampleN03.cc,v 1.33 2007/11/16 10:50:41 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// $Id: exampleN03.cc,v 1.36 2008/11/24 13:54:38 lgarnier Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -33,8 +33,6 @@
 
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
 
 #include "Randomize.hh"
 
@@ -50,18 +48,18 @@
 #include "G4VisExecutive.hh"
 #endif
 
-#ifdef G4UI_USE_XM
+#if defined(G4UI_USE_TCSH)
+#include "G4UIterminal.hh"
+#include "G4UItcsh.hh"
+#elif defined(G4UI_USE_XM)
 #include "G4UIXm.hh"
-#endif
-
-#ifdef G4UI_USE_WIN32
+#elif defined(G4UI_USE_WIN32)
 #include "G4UIWin32.hh"
-#endif
-
-#ifdef G4UI_USE_QT
+#elif defined(G4UI_USE_QT)
 #include "G4UIQt.hh"
 #include "G4Qt.hh"
-#include <qapplication.h>
+#else
+#include "G4UIterminal.hh"
 #endif
 
 
@@ -109,6 +107,13 @@ int main(int argc,char** argv)
   //
   runManager->Initialize();
   
+#ifdef G4VIS_USE
+  // Initialize visualization
+  //
+  G4VisManager* visManager = new G4VisExecutive;
+  visManager->Initialize();
+#endif
+  
   // Get the pointer to the User Interface manager
   //
   G4UImanager* UI = G4UImanager::GetUIpointer();      
@@ -121,11 +126,6 @@ int main(int argc,char** argv)
     }
   else           // interactive mode : define visualization UI terminal
     {
-#ifdef G4VIS_USE
-      G4VisManager* visManager = new G4VisExecutive;
-      visManager->Initialize();
-#endif
-
       G4UIsession* session = 0;
 #if defined(G4UI_USE_TCSH)
       session = new G4UIterminal(new G4UItcsh);      
@@ -141,20 +141,20 @@ int main(int argc,char** argv)
 #else
       session = new G4UIterminal();
 #endif
-
-      UI->ApplyCommand("/control/execute vis.mac");
+#ifdef G4VIS_USE
+      UI->ApplyCommand("/control/execute vis.mac");     
+#endif
       session->SessionStart();
       delete session;
-      
-#ifdef G4VIS_USE
-      delete visManager;
-#endif                
     }
 
   // Job termination
   // Free the store: user actions, physics_list and detector_description are
   //                 owned and deleted by the run manager, so they should not
   //                 be deleted in the main() program !
+#ifdef G4VIS_USE
+  delete visManager;
+#endif                
   delete runManager;
 
   return 0;