Import Geant4 10.5.0.beta source tree

examples/extended/exoticphysics/dmparticle/History

@@ -15,6 +15,14 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+17-05-18 J.Allison (dmparticle-V10-04-01)
+- RunAction.cc: Remove vis commands.
+
+17-05-18 J.Allison (dmparticle-V10-04-00)
+- Add #include "G4Types.hh"
+- Remove G4UI_USE and G4VIS_USE.
+- Move instantiation of G4UIExecutive to start of main.
+
 20-06-17 V.Ivanchenko (dmparticle-V10-03-04)
 - Run - V.Grichine fixed typo in printout
 

examples/extended/exoticphysics/dmparticle/dmparticle.cc

@@ -31,6 +31,8 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+#include "G4Types.hh"
+
 #include "G4RunManager.hh"
 #include "G4MTRunManager.hh"
 #include "G4UImanager.hh"
@@ -41,16 +43,19 @@
 #include "PhysicsList.hh"
 #include "ActionInitialization.hh"
 
-#ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
-#endif
-
 #include "G4UIExecutive.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 int main(int argc,char** argv) 
 {
+  // Instantiate G4UIExecutive if interactive mode
+  G4UIExecutive* ui = nullptr;
+  if ( argc == 1 ) {
+    ui = new G4UIExecutive(argc, argv);
+  }
+
   //choose the Random engine
   CLHEP::HepRandom::setTheEngine(new CLHEP::Ranlux64Engine);
 
@@ -87,8 +92,10 @@ int main(int argc,char** argv)
   // set user action classes
   runManager->SetUserInitialization( new ActionInitialization(det));
 
+  G4VisManager* visManager = new G4VisExecutive;
+  visManager->Initialize();
 
-  if (argc > 1)   // batch mode  
+  if (!ui)   // batch mode
     {
       G4String command = "/control/execute ";
       G4String fileName = argv[1];
@@ -96,22 +103,11 @@ int main(int argc,char** argv)
     }
   else           //define visualization and UI terminal for interactive mode
     { 
-#ifdef G4VIS_USE
-      G4VisManager* visManager = new G4VisExecutive;
-      visManager->Initialize();
-#endif    
-     
-#ifdef G4UI_USE
-      G4UIExecutive * ui = new G4UIExecutive(argc,argv);      
       ui->SessionStart();
       delete ui;
-#endif
-     
-#ifdef G4VIS_USE
-      delete visManager;
-#endif     
     } 
   // job termination
+  delete visManager;
   delete runManager;
   return 0;
 }

examples/extended/exoticphysics/dmparticle/src/RunAction.cc

@@ -45,8 +45,6 @@
 #include "TestParameters.hh"
 #include "G4Run.hh"
 #include "G4RunManager.hh"
-#include "G4UImanager.hh"
-#include "G4VVisManager.hh"
 #include "G4SystemOfUnits.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -121,12 +119,6 @@ void RunAction::EndOfRunAction(const G4Run*)
     fAnalysisManager->CloseFile();
   }
   //delete fAnalysisManager;
-
-#ifdef G4VIS_USE
-  if (G4VVisManager::GetConcreteInstance()) {
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
-  }
-#endif
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......