Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (14 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/examples/extended/electromagnetic/TestEm0
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm0/DirectAccess.cc

    r1230 r1337  
    2626//
    2727// $Id: DirectAccess.cc,v 1.2 2006/06/29 16:35:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/examples/extended/electromagnetic/TestEm0/History

    r807 r1337  
    1 $Id: History,v 1.12 2007/06/21 17:30:53 maire Exp $
     1$Id: History,v 1.22 2010/05/17 20:37:52 maire Exp $
    22-------------------------------------------------------------------
    33
    … …  
    66     =========================================================
    77
    8                     TestEm1 History file
     8                    TestEm0 History file
    99                    --------------------
    1010This file should be used by the G4 example coordinator to briefly
    … …  
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17     
     1817-05-10 mma (testem0-V09-03-04)
     19- TestEm0.cc : introduction of G4UIExecutive
     20   
     2110-05-10 mma (testem0-V09-03-03)
     22- RunAction - reverse order: ComputeCrossSection, then GetCrossSection
     23
     2406-04-10 V.Ivant (testem0-V09-03-02)
     25- RunAction - printout both GetCrossSection and ComputeCrossSection
     26     
     2729-03-10 mma (testem0-V09-03-01)
     28- RunAction - come back to  "Get.." methods
     29
     3023-03-10 V.Ivant (testem0-V09-03-00)
     31- new PhysicsLists : emstandard_opt0,1,2,3
     32- RunAction - use calculator methods "Compute.." instead of "Get.."
     33     
     3417-11-09 mma (testem0-V09-02-01)
     35- new PhysicsLists : livermore, penelope
     36  remove runManger->Initialize() from TestEm0.cc
     37     
     3814-11-09 mma (testem0-V09-02-00)
     39- PhysListEmStandard : replace obsolete G4MultipleScattering
     40     
     4117-11-08 mma (testem0-V09-01-01)
     42- Em options : 20 bins/decade
     43     
     4417-12-07 mma (testem0-V09-01-00)
     45- compute max energy transferable
     46     
     4726-06-07 mma
     48- G4ProductionCutsTable::SetEnergyRange(100*eV, 1*GeV)
    1749     
    185021-06-07 mma (testem0-V08-03-00)

  • trunk/examples/extended/electromagnetic/TestEm0/README

    r807 r1337  
    1 $Id: README,v 1.2 2006/03/20 11:54:02 maire Exp $
     1$Id: README,v 1.3 2009/11/17 22:48:26 maire Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2525        % TestEm0
    2626        ....
     27        Idle> /run/initialize
     28        ....   
    2729        Idle> /testem/det/setMat Silicon
    2830        Idle> /testem/phys/setCuts 100 um       

  • trunk/examples/extended/electromagnetic/TestEm0/TestEm0.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: TestEm0.cc,v 1.5 2009/11/17 22:48:26 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: TestEm0.cc,v 1.6 2010/05/17 20:37:52 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4040#include "PrimaryGeneratorAction.hh"
    4141#include "RunAction.hh"
     42
     43#ifdef G4UI_USE
     44#include "G4UIExecutive.hh"
     45#endif
    4246
    4347//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    6771  else           // define UI terminal for interactive mode
    6872    {
    69      G4UIsession * session = 0;
    70 #ifdef G4UI_USE_TCSH
    71       session = new G4UIterminal(new G4UItcsh);     
    72 #else
    73       session = new G4UIterminal();
    74 #endif     
    75      session->SessionStart();
    76      delete session;
     73#ifdef G4UI_USE
     74      G4UIExecutive * ui = new G4UIExecutive(argc,argv);     
     75      ui->SessionStart();
     76      delete ui;
     77#endif
    7778    }
    78 
    7979  // job termination
    8080  //

  • trunk/examples/extended/electromagnetic/TestEm0/TestEm0.in

    r807 r1337  
    1 # $Id: TestEm0.in,v 1.2 2006/08/17 16:06:02 maire Exp $
     1# $Id: TestEm0.in,v 1.4 2010/03/23 09:17:42 vnivanch Exp $
    22#
    33# Macro file for "TestEm0.cc"
    … …  
    55/control/verbose 0
    66/run/verbose 0
     7#
     8/testem/phys/addPhysics emstandard_opt0
     9/run/initialize
    710#
    811/testem/det/setMat Germanium

  • trunk/examples/extended/electromagnetic/TestEm0/TestEm0.out

    r807 r1337  
     1
     2        ############################################
     3        !!! WARNING - FPE detection is activated !!!
     4        ############################################
    15
    26*************************************************************
    3  Geant4 version Name: global-V09-00-03    (9-May-2008)
     7 Geant4 version Name: geant4-09-03-ref-06    (25-June-2010)
    48                      Copyright : Geant4 Collaboration
    59                      Reference : NIM A 506 (2003), 250-303
    … …  
    812
    913
    10 ***** Table : Nb of materials = 15 *****
     14***** Table : Nb of materials = 16 *****
    1115
    12  Material:      Air     density:  1.290 mg/cm3  RadL: 285.161 m    Imean:  85.684 eV   temperature: 273.15 K  pressure:   1.00 atm
     16 Material:      Air     density:  1.290 mg/cm3  RadL: 285.161 m    Nucl.Int.Length: 662.680 m    Imean:  85.703 eV   temperature: 273.15 K  pressure:   1.00 atm
    1317   --->  Element: Nitrogen (N)   Z =  7.0   N =  14.0   A =  14.01 g/mole  ElmMassFraction:  70.00 %  ElmAbundance  72.71 %
    1418   --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  30.00 %  ElmAbundance  27.29 %
    1519
    16  Material: H2liquid     density: 70.800 mg/cm3  RadL:   8.923 m    Imean:  21.800 eV
     20 Material: H2liquid     density: 70.800 mg/cm3  RadL:   8.923 m    Nucl.Int.Length:   4.960 m    Imean:  19.200 eV
    1721   --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    1822
    19  Material:    Water     density:  1.000 g/cm3   RadL:  36.092 cm   Imean:  75.000 eV
     23 Material:    Water     density:  1.000 g/cm3   RadL:  36.092 cm   Nucl.Int.Length:  75.416 cm   Imean:  75.000 eV
    2024   --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:  11.21 %  ElmAbundance  66.67 %
    2125   --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  88.79 %  ElmAbundance  33.33 %
    2226
    23  Material: WaterSteam     density:  1.000 mg/cm3  RadL: 360.925 m    Imean:  71.600 eV   temperature: 273.15 K  pressure:   1.00 atm
     27 Material: WaterSteam     density:  1.000 mg/cm3  RadL: 360.924 m    Nucl.Int.Length: 754.163 m    Imean:  71.600 eV   temperature: 273.15 K  pressure:   1.00 atm
    2428   --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:  11.21 %  ElmAbundance  66.67 %
    2529   --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  88.79 %  ElmAbundance  33.33 %
    2630
    27  Material:      BGO     density:  7.100 g/cm3   RadL:   1.123 cm   Imean: 469.142 eV
     31 Material:      BGO     density:  7.100 g/cm3   RadL:   1.123 cm   Nucl.Int.Length:  22.806 cm   Imean: 473.785 eV
    2832   --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  15.41 %  ElmAbundance  63.16 %
    2933   --->  Element: Germanium (Ge)   Z = 32.0   N =  72.6   A =  72.59 g/mole  ElmMassFraction:  17.48 %  ElmAbundance  15.79 %
    3034   --->  Element: Bismuth (Bi)   Z = 83.0   N = 209.0   A = 208.98 g/mole  ElmMassFraction:  67.10 %  ElmAbundance  21.05 %
    3135
    32  Material: Aluminium     density:  2.700 g/cm3   RadL:   8.893 cm   Imean: 166.400 eV
     36 Material: Aluminium     density:  2.700 g/cm3   RadL:   8.893 cm   Nucl.Int.Length:  38.879 cm   Imean: 166.000 eV
    3337   --->  Element: Aluminium ( )   Z = 13.0   N =  27.0   A =  26.98 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    3438
    35  Material:  Silicon     density:  2.330 g/cm3   RadL:   9.368 cm   Imean: 173.600 eV
     39 Material:  Silicon     density:  2.330 g/cm3   RadL:   9.368 cm   Nucl.Int.Length:  45.663 cm   Imean: 173.000 eV
    3640   --->  Element: Silicon ( )   Z = 14.0   N =  28.1   A =  28.09 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    3741
    38  Material: liquidArgon     density:  1.390 g/cm3   RadL:  14.065 cm   Imean: 187.200 eV
     42 Material: liquidArgon     density:  1.390 g/cm3   RadL:  14.065 cm   Nucl.Int.Length:  86.078 cm   Imean: 188.000 eV
    3943   --->  Element: liquidArgon ( )   Z = 18.0   N =  40.0   A =  39.95 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    4044
    41  Material:     Iron     density:  7.870 g/cm3   RadL:   1.759 cm   Imean: 286.000 eV
    42    --->  Element: Iron ( )   Z = 26.0   N =  55.9   A =  55.85 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
     45 Material:     Iron     density:  7.870 g/cm3   RadL:   1.759 cm   Nucl.Int.Length:  16.999 cm   Imean: 286.000 eV
     46   --->  Element: Iron ( )   Z = 26.0   N =  55.8   A =  55.85 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    4347
    44  Material:   Copper     density:  8.960 g/cm3   RadL:   1.436 cm   Imean: 321.900 eV
     48 Material:   Copper     density:  8.960 g/cm3   RadL:   1.436 cm   Nucl.Int.Length:  15.588 cm   Imean: 322.000 eV
    4549   --->  Element: Copper ( )   Z = 29.0   N =  63.5   A =  63.55 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    4650
    47  Material: Germanium     density:  5.323 g/cm3   RadL:   2.301 cm   Imean: 332.800 eV
     51 Material: Germanium     density:  5.323 g/cm3   RadL:   2.301 cm   Nucl.Int.Length:  27.431 cm   Imean: 350.000 eV
    4852   --->  Element: Germanium ( )   Z = 32.0   N =  72.6   A =  72.61 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    4953
    50  Material:   Silver     density: 10.500 g/cm3   RadL:   8.543 mm   Imean: 470.000 eV
     54 Material:   Silver     density: 10.500 g/cm3   RadL:   8.543 mm   Nucl.Int.Length:  15.868 cm   Imean: 470.000 eV
    5155   --->  Element: Silver ( )   Z = 47.0   N = 107.9   A = 107.87 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    5256
    53  Material: Tungsten     density: 19.300 g/cm3   RadL:   3.504 mm   Imean: 725.200 eV
     57 Material: Tungsten     density: 19.300 g/cm3   RadL:   3.504 mm   Nucl.Int.Length:  10.312 cm   Imean: 727.000 eV
    5458   --->  Element: Tungsten ( )   Z = 74.0   N = 183.8   A = 183.85 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    5559
    56  Material:     Lead     density: 11.350 g/cm3   RadL:   5.612 mm   Imean: 820.000 eV
     60 Material:     Lead     density: 11.350 g/cm3   RadL:   5.612 mm   Nucl.Int.Length:  18.247 cm   Imean: 823.000 eV
    5761   --->  Element: Lead ( )   Z = 82.0   N = 207.2   A = 207.19 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    5862
    59  Material:  Uranium     density: 18.950 g/cm3   RadL:   3.166 mm   Imean: 892.400 eV
     63 Material:  Uranium     density: 18.950 g/cm3   RadL:   3.166 mm   Nucl.Int.Length:  11.446 cm   Imean: 890.000 eV
    6064   --->  Element: Uranium ( )   Z = 92.0   N = 238.0   A = 238.03 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    6165
     66 Material:      ams     density:  7.409 g/cm3   RadL:   8.996 mm   Nucl.Int.Length:  25.517 cm   Imean: 691.183 eV
     67   --->  Element: Lead (Pb)   Z = 82.0   N = 207.2   A = 207.19 g/mole  ElmMassFraction:  94.81 %  ElmAbundance  36.54 %
     68   --->  Element: Carbon (C)   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction:   4.79 %  ElmAbundance  31.84 %
     69   --->  Element: Hydrogen (H)   Z =  1.0   N =   1.0   A =   1.01 g/mole  ElmMassFraction:   0.40 %  ElmAbundance  31.62 %
    6270
     71
     72PhysicsList::AddPhysicsList: <emstandard_opt0>
    6373
    6474========= Table of registered couples ==============================
    … …  
    6676Index : 0     used in the geometry : Yes     recalculation needed : No
    6777 Material : Germanium
    68  Range cuts        :  gamma 1 mm     e- 1 mm     e+ 1 mm
    69  Energy thresholds :  gamma 20.6936 keV    e- 863.242 keV    e+ 821.764 keV
     78 Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 0 fm
     79 Energy thresholds :  gamma  20.7332 keV    e-  870.964 keV    e+  825.404 keV proton 0 eV
    7080 Region(s) which use this couple :
    7181    DefaultRegionForTheWorld
    … …  
    7888  processes :                            phot                   compt                    conv                   total
    7989 
    80   cross section per atom   :          1.71686 barn            11.0976 barn                  0 pbarn           12.8145 barn 
     90  cross section per atom    :         1.71686 barn            11.0976 barn                  0 pbarn           12.8145 barn 
    8191
    8292 
    83   cross section per volume :         0.075796 cm^-1          0.490629 cm^-1                 0 cm^-1          0.566426 cm^-1
    84   cross section per mass   :        0.0142393 cm2/g         0.0921716 cm2/g                 0 cm2/g          0.106411 cm2/g
     93  compCrossSectionPerVolume :        0.075796 cm^-1          0.489937 cm^-1                 0 cm^-1          0.565733 cm^-1
     94  cross section per volume :                0 cm^-1          0.489922 cm^-1                 0 cm^-1          0.489922 cm^-1
     95  cross section per mass   :                0 cm2/g         0.0920387 cm2/g                 0 cm2/g         0.0920387 cm2/g
    8596 
    86   mean free path           :          13.1933 cm               2.0382 cm         5.82593e+288 pc              1.76546 cm
    87         (g/cm2)            :           70.228 g/cm2           10.8493 g/cm2      2.88022e+285 kg/cm2          9.39753 g/cm2
     97  mean free path           :     5.82593e+288 pc              2.04114 cm         5.82593e+288 pc              2.04114 cm
     98        (g/cm2)            :     2.88022e+285 kg/cm2           10.865 g/cm2      2.88022e+285 kg/cm2           10.865 g/cm2
    8899
    89100-------------------------------------------------------------
    90101
    91102
    92  e- (10 MeV) in Water (density: 1 g/cm3 ;   radiation length: 36.0925 cm )
     103 e- (10 MeV) in Water (density: 1 g/cm3 ;   radiation length: 36.0924 cm )
    93104
    94105  Range cuts :   gamma      100 um       e-      100 um
    95  Energy cuts :   gamma  1.09571 keV      e-  84.2696 keV
     106 Energy cuts :   gamma  1.11344 keV      e-  85.1138 keV
     107
     108  Max_energy _transferable  : 10 MeV (4.90425 cm )
    96109
    97110  processes :                           eIoni                   eBrem                   total
    98111 
    99   cross section per volume :          1.00476 cm^-1          0.349696 cm^-1           1.35446 cm^-1
    100   cross section per mass   :          1.00476 cm2/g          0.349696 cm2/g           1.35446 cm2/g
     112  compCrossSectionPerVolume :        0.994761 cm^-1          0.342573 cm^-1           1.33733 cm^-1
     113  cross section per volume :         0.994761 cm^-1          0.342573 cm^-1           1.33733 cm^-1
     114  cross section per mass   :         0.994761 cm2/g          0.342573 cm2/g           1.33733 cm2/g
    101115 
    102   mean free path           :          9.95258 mm              2.85962 cm              7.38301 mm
    103         (g/cm2)            :          995.258 mg/cm2          2.85962 g/cm2           738.301 mg/cm2
     116  mean free path           :          1.00527 cm              2.91908 cm              7.47756 mm
     117        (g/cm2)            :          1.00527 g/cm2           2.91908 g/cm2           747.756 mg/cm2
    104118
    105119 
    106   restricted dE/dx         :          1.61451 MeV/cm          21.1997 eV/cm           1.61454 MeV/cm
    107       (MeV/g/cm2)          :          1.61451 MeV*cm2/g       21.1997  eV*cm2/g       1.61454 MeV*cm2/g
     120  restricted dE/dx         :          1.61536 MeV/cm          12.5324 eV/cm           1.61538 MeV/cm
     121      (MeV/g/cm2)          :          1.61536 MeV*cm2/g       12.5324  eV*cm2/g       1.61538 MeV*cm2/g
    108122 
    109   range from restrict dE/dx:     6.06069 cm  ( 6.06069 g/cm2 )
    110   range from full dE/dx    :     4.90255 cm  ( 4.90255 g/cm2 )
     123  range from restrict dE/dx:     6.05865 cm  ( 6.05865 g/cm2 )
     124  range from full dE/dx    :     4.90425 cm  ( 4.90425 g/cm2 )
    111125 
    112126  transport mean free path :     27.9107 cm  ( 27.9107 g/cm2 )
    … …  
    116130-------------------------------------------------------------
    117131
     132

  • trunk/examples/extended/electromagnetic/TestEm0/include/DetectorConstruction.hh

    r1230 r1337  
    2626//
    2727// $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:35:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm0/include/DetectorMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:35:31 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/include/PhysListEmStandard.hh

    r1230 r1337  
    2626//
    2727// $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:35:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/include/PhysicsList.hh

    r1230 r1337  
    2626//
    2727// $Id: PhysicsList.hh,v 1.2 2006/06/29 16:35:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/include/PhysicsListMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:35:37 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/include/PrimaryGeneratorAction.hh

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:35:40 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/include/RunAction.hh

    r1230 r1337  
    2525//
    2626// $Id: RunAction.hh,v 1.3 2006/06/29 16:35:43 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc

    r1230 r1337  
    2727//
    2828// $Id: DetectorConstruction.cc,v 1.10 2009/11/14 18:04:20 maire Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3030//
    3131//

  • trunk/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:35:48 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc

    r1230 r1337  
    2626//
    2727// $Id: PhysListEmStandard.cc,v 1.3 2009/11/14 18:04:20 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysicsList.cc,v 1.8 2009/11/17 22:48:26 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysicsList.cc,v 1.9 2010/03/21 19:07:53 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3535 
    3636#include "PhysListEmStandard.hh"
     37#include "G4EmStandardPhysics.hh"
     38#include "G4EmStandardPhysics_option1.hh"
     39#include "G4EmStandardPhysics_option2.hh"
     40#include "G4EmStandardPhysics_option3.hh"
    3741#include "G4EmLivermorePhysics.hh"
    3842#include "G4EmPenelopePhysics.hh"
    … …  
    5862
    5963  // EM physics
    60   emName = G4String("standard");
     64  emName = G4String("local");
    6165  emPhysicsList = new PhysListEmStandard(emName);
    6266
    … …  
    189193  //physics tables
    190194  //
    191   emOptions.SetMinEnergy(100*eV);       //default   
    192   emOptions.SetMaxEnergy(100*TeV);      //default 
    193   emOptions.SetDEDXBinning(12*20);      //default=12*7 
    194   emOptions.SetLambdaBinning(12*20);    //default=12*7
     195  //emOptions.SetMinEnergy(100*eV);     //default   
     196  //emOptions.SetMaxEnergy(100*TeV);    //default 
     197  //emOptions.SetDEDXBinning(12*20);    //default=12*7 
     198  //emOptions.SetLambdaBinning(12*20);  //default=12*7
    195199
    196200  emOptions.SetBuildCSDARange(true);     
    197   emOptions.SetMaxEnergyForCSDARange(100*TeV);
    198   emOptions.SetDEDXBinningForCSDARange(12*20);
    199  
    200   emOptions.SetSplineFlag(true);        //default
     201  //emOptions.SetMaxEnergyForCSDARange(100*TeV);
     202  //emOptions.SetDEDXBinningForCSDARange(12*20);
     203 
     204  //emOptions.SetSplineFlag(true);      //default
    201205     
    202206  emOptions.SetVerbose(0); 
    … …  
    213217  if (name == emName) return;
    214218
    215   if (name == "standard") {
     219  if (name == "local") {
    216220
    217221    emName = name;
    … …  
    219223    emPhysicsList = new PhysListEmStandard(name);
    220224
    221   } else if (name == "penelope"){
     225  } else if (name == "emstandard_opt0"){
     226    emName = name;
     227    delete emPhysicsList;
     228    emPhysicsList = new G4EmStandardPhysics();
     229
     230  } else if (name == "emstandard_opt1"){
     231    emName = name;
     232    delete emPhysicsList;
     233    emPhysicsList = new G4EmStandardPhysics_option1();
     234
     235  } else if (name == "emstandard_opt2"){
     236    emName = name;
     237    delete emPhysicsList;
     238    emPhysicsList = new G4EmStandardPhysics_option2();
     239
     240  } else if (name == "emstandard_opt3"){
     241    emName = name;
     242    delete emPhysicsList;
     243    emPhysicsList = new G4EmStandardPhysics_option3();
     244
     245  } else if (name == "empenelope"){
    222246    emName = name;
    223247    delete emPhysicsList;
    224248    emPhysicsList = new G4EmPenelopePhysics();
    225249
    226   } else if (name == "livermore"){
     250  } else if (name == "emlivermore"){
    227251    emName = name;
    228252    delete emPhysicsList;

  • trunk/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:35:55 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:35:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm0/src/RunAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.10 2007/12/17 17:22:44 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: RunAction.cc,v 1.15 2010/05/10 13:45:49 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    104104  G4double range = emCal.GetCSDARange(Tmax,G4Electron::Electron(),material);
    105105 
    106   G4cout << "\n Max_energy _transferable : " << G4BestUnit(Tmax,"Energy")
     106  G4cout << "\n  Max_energy _transferable : " << G4BestUnit(Tmax,"Energy")
    107107         << " (" << G4BestUnit(range,"Length") << ")" << G4endl;           
    108108  }
    … …  
    148148    sigma0.push_back(sigtot);
    149149
    150     G4cout << "\n \n  cross section per atom   : ";
     150    G4cout << "\n \n  cross section per atom    : ";
    151151    for (size_t j=0; j<sigma0.size();j++) {         
    152152      G4cout << "\t" << std::setw(13) << G4BestUnit(sigma0[j], "Surface");
    … …  
    156156   
    157157  //get cross section per volume
     158  std::vector<G4double> sigma0;
    158159  std::vector<G4double> sigma1;
    159   std::vector<G4double> sigma2; 
    160   G4double Sig, Sigtot = 0.;
     160  std::vector<G4double> sigma2;
     161  G4double Sig, SigtotComp = 0., Sigtot = 0.;
    161162
    162163  for (size_t j=0; j<emName.size();j++) {
    163     Sig = emCal.GetCrossSectionPerVolume(energy,particle,emName[j],material);
    164     if (Sig == 0.) Sig = emCal.ComputeCrossSectionPerVolume
    165                      (energy,particle,emName[j],material,enerCut[j]);
    166     Sigtot += Sig;                           
     164    Sig = emCal.ComputeCrossSectionPerVolume
     165      (energy,particle,emName[j],material,enerCut[j]); 
     166    SigtotComp += Sig;   
     167    sigma0.push_back(Sig);
     168    Sig = emCal.GetCrossSectionPerVolume(energy,particle,emName[j],material);     
     169    Sigtot += Sig;   
    167170    sigma1.push_back(Sig);
    168171    sigma2.push_back(Sig/density);                     
    169172  }
     173  sigma0.push_back(SigtotComp);
    170174  sigma1.push_back(Sigtot);
    171175  sigma2.push_back(Sigtot/density);       
    172176   
    173177  //print cross sections
    174   G4cout << "\n \n  cross section per volume : ";
     178  G4cout << "\n \n  compCrossSectionPerVolume : ";
     179  for (size_t j=0; j<sigma0.size();j++) {           
     180    G4cout << "\t" << std::setw(13) << sigma0[j]*cm << " cm^-1";
     181  }
     182  G4cout << "\n  cross section per volume : ";
    175183  for (size_t j=0; j<sigma1.size();j++) {           
    176184    G4cout << "\t" << std::setw(13) << sigma1[j]*cm << " cm^-1";
    … …  
    179187  G4cout << "\n  cross section per mass   : ";
    180188  for (size_t j=0; j<sigma2.size();j++) {
    181     G4cout << "\t" << std::setw(13) << G4BestUnit(sigma2[j], "Surface/Mass");
     189    G4cout << "\t" << std::setw(13)
     190           << G4BestUnit(sigma2[j], "Surface/Mass");
    182191  }
    183192   
Note: See TracChangeset for help on using the changeset viewer.