Changeset 1230 for trunk/examples/extended/electromagnetic/TestEm4

Timestamp:

Jan 8, 2010, 3:02:48 PM (15 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/extended/electromagnetic/TestEm4

Files:

• GNUmakefile (modified) (2 diffs)
• TestEm4.cc (modified) (1 diff)
• include/DetectorConstruction.hh (modified) (1 diff)
• include/EventAction.hh (modified) (1 diff)
• include/EventActionMessenger.hh (modified) (1 diff)
• include/PhysicsList.hh (modified) (1 diff)
• include/PrimaryGeneratorAction.hh (modified) (1 diff)
• include/RunAction.hh (modified) (1 diff)
• include/SteppingAction.hh (modified) (1 diff)
• include/SteppingVerbose.hh (modified) (1 diff)
• src/DetectorConstruction.cc (modified) (1 diff)
• src/EventAction.cc (modified) (1 diff)
• src/EventActionMessenger.cc (modified) (1 diff)
• src/PhysicsList.cc (modified) (3 diffs)
• src/PrimaryGeneratorAction.cc (modified) (1 diff)
• src/RunAction.cc (modified) (2 diffs)
• src/SteppingAction.cc (modified) (1 diff)
• src/SteppingVerbose.cc (modified) (1 diff)

trunk/examples/extended/electromagnetic/TestEm4/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.14 2006/10/20 16:38:15 maire Exp $
+# $Id: GNUmakefile,v 1.15 2008/06/11 22:15:20 maire Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
@@ -17 +17 @@
 #### G4ANALYSIS_USE := true
 
-ifdef G4ANALYSIS_USE
-  CPPFLAGS += -DG4ANALYSIS_USE
-endif
-
 include $(G4INSTALL)/config/architecture.gmk
-
-ifdef G4ANALYSIS_USE
-  # for the aida-config command see the README file
-  CPPFLAGS += `aida-config --include`
-  LOADLIBS += `aida-config --lib`
-endif
 
 include $(G4INSTALL)/config/binmake.gmk

trunk/examples/extended/electromagnetic/TestEm4/TestEm4.cc

@@ -26 +26 @@
 //
 // $Id: TestEm4.cc,v 1.12 2007/06/22 09:55:22 maire Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....

trunk/examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh

@@ -26 +26 @@
 //
 // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:53:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 

trunk/examples/extended/electromagnetic/TestEm4/include/EventAction.hh

@@ -26 +26 @@
 //
 // $Id: EventAction.hh,v 1.2 2006/06/29 16:53:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh

@@ -26 +26 @@
 //
 // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:53:35 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

trunk/examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh

@@ -26 +26 @@
 //
 // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:53:37 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh

@@ -26 +26 @@
 //
 // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:53:40 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/include/RunAction.hh

@@ -25 +25 @@
 //
 // $Id: RunAction.hh,v 1.7 2006/06/29 16:53:43 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh

@@ -26 +26 @@
 //
 // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:53:45 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh

@@ -26 +26 @@
 //
 // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:53:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 

trunk/examples/extended/electromagnetic/TestEm4/src/DetectorConstruction.cc

@@ -26 +26 @@
 //
 // $Id: DetectorConstruction.cc,v 1.3 2006/06/29 16:53:51 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

trunk/examples/extended/electromagnetic/TestEm4/src/EventAction.cc

@@ -25 +25 @@
 //
 // $Id: EventAction.cc,v 1.7 2006/06/29 16:53:57 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

trunk/examples/extended/electromagnetic/TestEm4/src/EventActionMessenger.cc

@@ -26 +26 @@
 //
 // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:54:15 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/src/PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: PhysicsList.cc,v 1.6 2006/06/29 16:54:17 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: PhysicsList.cc,v 1.7 2008/04/07 13:09:43 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 
@@ -95 +95 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -121 +121 @@
     //electron
 
-      pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
-      pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);      
+      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 G4eIonisation,       -1, 2,2);
-      pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
-      pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);      
+      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);      
     }
   }

trunk/examples/extended/electromagnetic/TestEm4/src/PrimaryGeneratorAction.cc

@@ -26 +26 @@
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:54:19 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/src/RunAction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.10 2006/06/29 16:54:21 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: RunAction.cc,v 1.11 2008/09/12 18:46:14 maire Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -59 +59 @@
    G4bool readOnly  = false;
    G4bool createNew = true;
-   G4String options =  "--noErrors uncompress";
-   tree = tf->create("testem4.hbook","hbook",readOnly,createNew, options);
-   //tree = tf->create("testem4.root","root",readOnly,createNew, options);
+   G4String options =  "--noErrors export=root uncompress";
+   //tree = tf->create("testem4.hbook","hbook",readOnly,createNew, options);
+   tree = tf->create("testem4.root","root",readOnly,createNew, options);
    //tree = tf->create("testem4.XML" ,"XML" ,readOnly,createNew, options);
    delete tf;

trunk/examples/extended/electromagnetic/TestEm4/src/SteppingAction.cc

@@ -26 +26 @@
 //
 // $Id: SteppingAction.cc,v 1.2 2006/06/29 16:54:23 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/electromagnetic/TestEm4/src/SteppingVerbose.cc

@@ -26 +26 @@
 //
 // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:54:26 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......