Import Geant4 9.4.0 source tree

examples/extended/runAndEvent/RE03/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.2 2008/11/24 17:34:46 asaim Exp $
+$Id: History,v 1.4 2010/11/08 20:14:41 allison Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,12 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
  
+Nov. 07, 2010 J.Allison (exampleRE03-V09-03-01)
+- Introduced G4UIExecutive.
+
+Apr. 06, 2010 M.Asai (exampleRE03-V09-03-00)
+- Replace G4MultipleScattering with G4eMultipleScattering, G4MuMultipleScattering and G4hMultipleScattring.
+
 Nov. 23, 08 M.Asai (exampleRE03-V09-01-00)
 - Add "run4.mac" with cylindrical scoring mesh.
 

examples/extended/runAndEvent/RE03/RE03.cc

@@ -24,23 +24,26 @@
 // ********************************************************************
 //
 //
-// $Id: RE03.cc,v 1.4 2007/11/17 01:26:01 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: RE03.cc,v 1.5 2010/11/08 20:14:41 allison Exp $
+// GEANT4 tag $Name: geant4-09-04 $
 //
 // 
 
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
 #include "G4ScoringManager.hh"
 
+#include "RE03DetectorConstruction.hh"
+#include "RE03PhysicsList.hh"
+#include "RE03PrimaryGeneratorAction.hh"
+
 #ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
 #endif
-#include "RE03DetectorConstruction.hh"
-#include "RE03PhysicsList.hh"
-#include "RE03PrimaryGeneratorAction.hh"
+
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
+#endif
 
 //====================================================================
 // Un-comment this line for user defined score writer
@@ -74,11 +77,9 @@ int main(int argc,char** argv)
  //
  G4VUserPrimaryGeneratorAction* gen_action = new RE03PrimaryGeneratorAction;
  runManager->SetUserAction(gen_action);
- //
   
 #ifdef G4VIS_USE
  // Visualization manager
- //
  G4VisManager* visManager = new G4VisExecutive;
  visManager->Initialize();
 #endif
@@ -89,30 +90,24 @@ int main(int argc,char** argv)
   
  // Get the pointer to the User Interface manager
  //
- G4UImanager* UI = G4UImanager::GetUIpointer();  
- UI->ApplyCommand("/control/execute vis.mac");    
+ G4UImanager* UImanager = G4UImanager::GetUIpointer();  
 
  if (argc==1)   // Define UI session for interactive mode
  {
-   G4UIsession* session=0;
-  
-   // G4UIterminal is a (dumb) terminal
-   //
-#ifdef G4UI_USE_TCSH
-   session = new G4UIterminal(new G4UItcsh);      
-#else
-   session = new G4UIterminal();
-#endif    
-      
-   session->SessionStart();
-
-   delete session;
+#ifdef G4UI_USE
+   G4UIExecutive* ui = new G4UIExecutive(argc, argv);
+#ifdef G4VIS_USE
+   UImanager->ApplyCommand("/control/execute vis.mac");    
+#endif
+   ui->SessionStart();
+   delete ui;
+#endif
  }
  else           // Batch mode
  { 
    G4String command = "/control/execute ";
    G4String fileName = argv[1];
-   UI->ApplyCommand(command+fileName);
+   UImanager->ApplyCommand(command+fileName);
  }
 
   // Job termination

examples/extended/runAndEvent/RE03/src/RE03PhysicsList.cc

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: RE03PhysicsList.cc,v 1.1 2007/11/13 19:55:43 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: RE03PhysicsList.cc,v 1.2 2010/04/07 01:30:07 asaim Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
 
@@ -120,16 +120,17 @@ void RE03PhysicsList::ConstructProcess()
 #include "G4GammaConversion.hh"
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
-
+#include "G4eMultipleScattering.hh"
 #include "G4eIonisation.hh"
 #include "G4eBremsstrahlung.hh"
 #include "G4eplusAnnihilation.hh"
 
+#include "G4MuMultipleScattering.hh"
 #include "G4MuIonisation.hh"
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
 
+#include "G4hMultipleScattering.hh"
 #include "G4hIonisation.hh"
 
 void RE03PhysicsList::ConstructEM()
@@ -148,13 +149,13 @@ void RE03PhysicsList::ConstructEM()
       
     } else if (particleName == "e-") {
       //electron
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);      
 
     } else if (particleName == "e+") {
       //positron
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+      pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);
@@ -162,7 +163,7 @@ void RE03PhysicsList::ConstructEM()
     } else if( particleName == "mu+" || 
                particleName == "mu-"    ) {
       //muon  
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
       pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
@@ -171,7 +172,7 @@ void RE03PhysicsList::ConstructEM()
 	       (particle->GetPDGCharge() != 0.0) && 
 	       (particle->GetParticleName() != "chargedgeantino")) {
       //all others charged particles except geantino
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
+      pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1);
       pmanager->AddProcess(new G4hIonisation,       -1, 2,2); 
     }
   }

examples/extended/runAndEvent/RE03/vis.mac

@@ -6,7 +6,7 @@
 # Create a scene handler for a specific graphics system
 # (Edit the next line(s) to choose another graphic system)
 #
-/vis/open OGLIX
+/vis/open OGL
 #
 # draw scene
 #