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/TestEm14
Files:
36 edited

Legend:

Unmodified
Added
Removed
  • trunk/examples/extended/electromagnetic/TestEm14/History

    r807 r1337  
    1 $Id: History,v 1.12 2007/11/13 12:13:32 maire Exp $
     1$Id: History,v 1.22 2010/06/07 05:40:46 perl Exp $
    22-------------------------------------------------------------------
    33
     
    1616     ----------------------------------------------------------
    1717     
     1806-06-10 J.Perl (testem14-V09-03-03)
     19- Remove unused variable in EventAction
     20
     2103-06-10 J.Perl (testem14-V09-03-02)
     22- Updated vis usage
     23
     2405-04-10 mma (testem14-V09-03-01)
     25- PhysicsList: remove non pertinent EmOptions
     26- RunAction: replace ProcessCount by map<string, int>
     27       
     2802-04-10 mma (testem14-V09-03-00)
     29- PhysicsList: extend ProductionCuts down to 100 eV
     30- PhysListEmStandard, Livermore, Penelope:
     31      all processes registered as discrete -> no continuous Eloss
     32- cleanup SteppingAction
     33- remove SteppingMessenger
     34- TestEm14.cc : introduction of G4UIExecutive     
     35- update README
     36       
     3719-11-09 mma (testem14-V09-02-01)
     38- add new livermore and penelope physics lists
     39     
     4025-09-09 mma (testem14-V09-02-00)
     41- Remove old livermore and penelope physics lists
     42
     4324-09-08 mma (testem14-V09-01-03)
     44- HistoManager : root as default format
     45
     4612-06-08 mma (testem14-V09-01-02)
     47- Remove AIDA from GNUmakefile
     48     
     4907-05-08 mma (testem14-V09-01-01)
     50- README : update Aida informations     
     51     
     5208-01-08 mma (testem14-V09-01-00)
     53- HistoManager : ascii[0] = flag to control creation of .ascii file
     54   
    185513-11-07 mma (testem14-V09-00-01)
    1956- HistoManager/HistoMessenger : print selected histos on ascii file
  • trunk/examples/extended/electromagnetic/TestEm14/README

    r807 r1337  
    1 $Id: README,v 1.6 2007/11/13 12:13:32 maire Exp $
     1$Id: README,v 1.9 2010/04/02 13:22:02 maire Exp $
    22-------------------------------------------------------------------
    33
     
    2828        The physics list contains the standard electromagnetic processes.
    2929        In order not to introduce 'artificial' constraints on the step size, the
    30         multiple scattering is not instanciated, and there is no limitation from
    31         the maximum energy lost per step
     30        multiple scattering is not instanciated, and all processes are
     31        registered as discrete : there is no continuous energy loss
    3232         
    3333 3- AN EVENT : THE PRIMARY GENERATOR
     
    7979        the commands:
    8080        /testem/histo/setFileName  name  (default testem14)
    81         /testem/histo/setFileType  name  (default hbook)
     81        /testem/histo/setFileType  name  (default root)
    8282   
    8383        It is also possible to print selected histograms on an ascii file:
     
    130130         
    131131  To use histograms, at least one of the AIDA implementations should be
    132   available (see http://aida.freehep.org).
     132  available. See InstallAida.txt
    133133 
    134  8a - PI
    135 
    136   A package including AIDA and extended interfaces also using Python is PI,
    137   available from: http://cern.ch/pi
    138 
    139   Once installed PI or PI-Lite in a specified local area $MYPY, it is required
    140   to add the installation path to $PATH, i.e. for example, for release 1.2.1 of
    141   PI:
    142   setenv PATH ${PATH}:$MYPI/1.2.1/app/releases/PI/PI_1_2_1/rh73_gcc32/bin
    143 
    144   CERN users can use the PATH to the LCG area on AFS.
    145   Before running the example the command should be issued:
    146   eval `aida-config --runtime csh`
    147 
    148  8b -  OpenScientist
    149 
    150   OpenScientist is available at http://OpenScientist.lal.in2p3.fr.
    151 
    152   You have to "setup" the OpenScientist AIDA implementation before compiling
    153   (then with G4ANALYSIS_USE set) and running your Geant4 application.
    154 
    155  On UNIX you setup, with a csh flavoured shell :
    156         csh> source <<OpenScientist install path>/aida-setup.csh
    157         or with a sh flavoured shell :
    158         sh> . <<OpenScientist install path>/aida-setup.sh
    159  On Windows :
    160         DOS> call <<OpenScientist install path>/aida-setup.bat
    161 
    162   You can use various file formats for writing (AIDA-XML, hbook, root).
    163   These formats are readable by the Lab onx interactive program
    164   or the OpenPAW application. See the web pages.
    165 
    166 
    167   With OpenPAW, on a run.hbook file, one can view the histograms
    168   with something like :
    169         OS> opaw
    170         opaw> h/file 1 run.hbook  ( or opaw> h/file 1 run.aida or run.root) 
    171         opaw> zone 2 2
    172         opaw> h/plot 1
    173         opaw> h/plot 2
  • trunk/examples/extended/electromagnetic/TestEm14/TestEm14.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: TestEm14.cc,v 1.4 2007/06/23 22:23:20 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: TestEm14.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    3232#include "G4RunManager.hh"
    3333#include "G4UImanager.hh"
    34 #include "G4UIterminal.hh"
    35 #include "G4UItcsh.hh"
    3634#include "Randomize.hh"
    3735
     
    4846#ifdef G4VIS_USE
    4947 #include "G4VisExecutive.hh"
     48#endif
     49
     50#ifdef G4UI_USE
     51#include "G4UIExecutive.hh"
    5052#endif
    5153
     
    9496   visManager->Initialize();
    9597#endif   
    96      
    97      G4UIsession * session = 0;
    98 #ifdef G4UI_USE_TCSH
    99       session = new G4UIterminal(new G4UItcsh);     
    100 #else
    101       session = new G4UIterminal();
    102 #endif     
    103      session->SessionStart();
    104      delete session;
     98
     99#ifdef G4UI_USE
     100      G4UIExecutive * ui = new G4UIExecutive(argc,argv);     
     101      ui->SessionStart();
     102      delete ui;
     103#endif
    105104     
    106105#ifdef G4VIS_USE
  • trunk/examples/extended/electromagnetic/TestEm14/TestEm14.in

    r807 r1337  
    1 # $Id: TestEm14.in,v 1.3 2006/05/10 11:15:33 maire Exp $
     1# $Id: TestEm14.in,v 1.6 2010/04/05 18:02:39 maire Exp $
    22#
    33# Macro file for "TestEm14.cc"
     
    1212#### /testem/det/setSize 100 m
    1313#
    14 #### /testem/phys/addPhysics livermore
    15 #### /testem/phys/addPhysics penelope
     14/testem/phys/addPhysics standard
    1615#
    1716/run/initialize
     
    2019/gun/energy 100 keV
    2120#
    22 /run/beamOn 100000
     21/run/beamOn 1000000
    2322#
    2423/gun/particle e-
    2524/gun/energy 100 MeV
    2625#
    27 /run/beamOn 100000
     26/run/beamOn 1000000
  • trunk/examples/extended/electromagnetic/TestEm14/TestEm14.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
     
    1014***** Table : Nb of materials = 15 *****
    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 H_2O   density:  1.000 g/cm3   RadL:  36.092 cm   Imean:  75.000 eV
     23 Material:    Water H_2O   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: liquidArgon     density:  1.390 g/cm3   RadL:  14.065 cm   Imean: 187.200 eV
     27 Material: liquidArgon     density:  1.390 g/cm3   RadL:  14.065 cm   Nucl.Int.Length:  86.078 cm   Imean: 188.000 eV
    2428   --->  Element: liquidArgon ( )   Z = 18.0   N =  40.0   A =  39.95 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    2529
    26  Material:   Carbon     density:  2.267 g/cm3   RadL:  18.833 cm   Imean:  78.000 eV
     30 Material:   Carbon     density:  2.267 g/cm3   RadL:  18.833 cm   Nucl.Int.Length:  35.356 cm   Imean:  81.000 eV
    2731   --->  Element: Carbon ( )   Z =  6.0   N =  12.0   A =  12.01 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    2832
    29  Material: Aluminium     density:  2.700 g/cm3   RadL:   8.893 cm   Imean: 166.400 eV
     33 Material: Aluminium     density:  2.700 g/cm3   RadL:   8.893 cm   Nucl.Int.Length:  38.879 cm   Imean: 166.000 eV
    3034   --->  Element: Aluminium ( )   Z = 13.0   N =  27.0   A =  26.98 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    3135
    32  Material:  Silicon     density:  2.330 g/cm3   RadL:   9.368 cm   Imean: 173.600 eV
     36 Material:  Silicon     density:  2.330 g/cm3   RadL:   9.368 cm   Nucl.Int.Length:  45.663 cm   Imean: 173.000 eV
    3337   --->  Element: Silicon ( )   Z = 14.0   N =  28.1   A =  28.09 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    3438
    35  Material: Germanium     density:  5.323 g/cm3   RadL:   2.301 cm   Imean: 332.800 eV
     39 Material: Germanium     density:  5.323 g/cm3   RadL:   2.301 cm   Nucl.Int.Length:  27.431 cm   Imean: 350.000 eV
    3640   --->  Element: Germanium ( )   Z = 32.0   N =  72.6   A =  72.61 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    3741
    38  Material:      NaI     density:  3.670 g/cm3   RadL:   2.586 cm   Imean: 452.000 eV
     42 Material:      NaI     density:  3.670 g/cm3   RadL:   2.586 cm   Nucl.Int.Length:  42.878 cm   Imean: 452.000 eV
    3943   --->  Element: Sodium (Na)   Z = 11.0   N =  23.0   A =  22.99 g/mole  ElmMassFraction:  15.34 %  ElmAbundance  50.00 %
    4044   --->  Element: Iodine (I)   Z = 53.0   N = 126.9   A = 126.90 g/mole  ElmMassFraction:  84.66 %  ElmAbundance  50.00 %
    4145
    42  Material:   Iodine     density:  4.930 g/cm3   RadL:   1.720 cm   Imean: 492.900 eV
     46 Material:   Iodine     density:  4.930 g/cm3   RadL:   1.720 cm   Nucl.Int.Length:  35.676 cm   Imean: 491.000 eV
    4347   --->  Element: Iodine (I)   Z = 53.0   N = 126.9   A = 126.90 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    4448
    45  Material:      BGO     density:  7.100 g/cm3   RadL:   1.123 cm   Imean: 469.142 eV
     49 Material:      BGO     density:  7.100 g/cm3   RadL:   1.123 cm   Nucl.Int.Length:  22.806 cm   Imean: 473.785 eV
    4650   --->  Element: Oxygen (O)   Z =  8.0   N =  16.0   A =  16.00 g/mole  ElmMassFraction:  15.41 %  ElmAbundance  63.16 %
    4751   --->  Element: Germanium (Ge)   Z = 32.0   N =  72.6   A =  72.59 g/mole  ElmMassFraction:  17.48 %  ElmAbundance  15.79 %
    4852   --->  Element: Bismuth (Bi)   Z = 83.0   N = 209.0   A = 208.98 g/mole  ElmMassFraction:  67.10 %  ElmAbundance  21.05 %
    4953
    50  Material:     Iron     density:  7.870 g/cm3   RadL:   1.759 cm   Imean: 286.000 eV
    51    --->  Element: Iron ( )   Z = 26.0   N =  55.9   A =  55.85 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
    52 
    53  Material: Tungsten     density: 19.300 g/cm3   RadL:   3.504 mm   Imean: 725.200 eV
     54 Material:     Iron     density:  7.870 g/cm3   RadL:   1.759 cm   Nucl.Int.Length:  16.999 cm   Imean: 286.000 eV
     55   --->  Element: Iron ( )   Z = 26.0   N =  55.8   A =  55.85 g/mole  ElmMassFraction: 100.00 %  ElmAbundance 100.00 %
     56
     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
     
    6670#### /testem/det/setSize 100 m
    6771#
    68 #### /testem/phys/addPhysics livermore
    69 #### /testem/phys/addPhysics penelope
     72/testem/phys/addPhysics standard
     73PhysicsList::AddPhysicsList: <standard>
    7074#
    7175/run/initialize
     
    7680physicsList->Construct() start.
    7781physicsList->Construct() start.
     82physicsList->CheckParticleList() start.
    7883physicsList->setCut() start.
    7984#
     
    8186/gun/energy 100 keV
    8287#
    83 /run/beamOn 100000
    84 
    85 phot:  Total cross sections from Sandia parametrisation.
    86       Sampling according PhotoElectric model
    87 
    88 compt:  Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV
    89       Sampling according Klein-Nishina model
    90       tables are built for  gamma
    91       Lambda tables from 100 eV  to 100 GeV in 90 bins.
    92 
    93 conv:  Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z;
    94       sampling secondary e+e- according Bethe-Heitler model
    95       tables are built for  gamma
    96       Lambda tables from 1.022 MeV to 100 GeV in 100 bins.
    97 
    98 eIoni:   tables are built for  e-
    99       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    100       Lambda tables from threshold to 100 TeV in 120 bins.
    101       Delta cross sections and sampling from MollerBhabha model
    102       Good description from 1 KeV to 100 GeV.
    103       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    104 
    105 eBrem:   tables are built for  e-
    106       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    107       Lambda tables from threshold to 100 TeV in 120 bins.
    108       Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    109       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
    110 
    111 eIoni:   tables are built for  e+
    112       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    113       Lambda tables from threshold to 100 TeV in 120 bins.
    114       Delta cross sections and sampling from MollerBhabha model
    115       Good description from 1 KeV to 100 GeV.
    116       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    117 
    118 eBrem:   tables are built for  e+
    119       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    120       Lambda tables from threshold to 100 TeV in 120 bins.
    121       Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    122       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
    123 
    124 annihil:       Sampling according eplus2gg model
    125       tables are built for  e+
    126       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    127 
    128 hIoni:   tables are built for  proton
    129       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    130       Lambda tables from threshold to 100 TeV in 120 bins.
    131       Scaling relation is used from proton dE/dx and range.
    132       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    133       Parametrisation from Bragg for protons below. NuclearStopping= 1
    134       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    135 
    136 ionIoni:   tables are built for  GenericIon
    137       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    138       Lambda tables from threshold to 100 TeV in 120 bins.
    139       Scaling relation is used from proton dE/dx and range.
    140       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    141       Parametrisation from BraggIon for protons below. NuclearStopping= 1
    142 
    143       Stopping Power data for 8 ion/material pairs are used.
    144       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    145 
    146 hIoni:   tables are built for  anti_proton
    147       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    148       Lambda tables from threshold to 100 TeV in 120 bins.
    149       Scaling relation is used from proton dE/dx and range.
    150       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    151       Parametrisation from Bragg for protons below. NuclearStopping= 1
    152       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    153 
    154 muIoni:   tables are built for  mu+
    155       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    156       Lambda tables from threshold to 100 TeV in 120 bins.
    157       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    158       radiative corrections for E > 1 GeV
    159       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    160 
    161 muBrems:   tables are built for  mu+
    162       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    163       Lambda tables from threshold to 100 TeV in 120 bins.
    164       Parametrised model
    165 
    166 muPairProd:   tables are built for  mu+
    167       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    168       Lambda tables from threshold to 100 TeV in 120 bins.
    169       Parametrised model
    170 
    171 muIoni:   tables are built for  mu-
    172       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    173       Lambda tables from threshold to 100 TeV in 120 bins.
    174       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    175       radiative corrections for E > 1 GeV
    176       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    177 
    178 muBrems:   tables are built for  mu-
    179       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    180       Lambda tables from threshold to 100 TeV in 120 bins.
    181       Parametrised model
    182 
    183 muPairProd:   tables are built for  mu-
    184       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    185       Lambda tables from threshold to 100 TeV in 120 bins.
    186       Parametrised model
    187 
    188 hIoni:   tables are built for  pi+
    189       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    190       Lambda tables from threshold to 100 TeV in 120 bins.
    191       Scaling relation is used from proton dE/dx and range.
    192       Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
    193       Parametrisation from Bragg for protons below. NuclearStopping= 1
    194       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
    195 
    196 hIoni:   tables are built for  pi-
    197       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    198       Lambda tables from threshold to 100 TeV in 120 bins.
    199       Scaling relation is used from proton dE/dx and range.
    200       Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
    201       Parametrisation from Bragg for protons below. NuclearStopping= 1
    202       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0, fluct: 0
     88/run/beamOn 1000000
     89
     90phot:   for  gamma    SubType= 12
     91      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     92       PhotoElectric :     Emin=          0 eV         Emax=   10 TeV
     93
     94compt:   for  gamma    SubType= 13
     95      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     96      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     97       Klein-Nishina :     Emin=          0 eV         Emax=   10 TeV
     98
     99conv:   for  gamma    SubType= 14
     100      Lambda tables from 1.022 MeV to 10 TeV in 77 bins, spline: 1
     101      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     102       Bethe-Heitler :     Emin=          0 eV         Emax=   10 TeV
     103
     104eIoni:   for  e-    SubType= 2
     105      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     106      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     107      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     108      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     109        MollerBhabha :     Emin=          0 eV         Emax=   10 TeV
     110
     111eBrem:   for  e-    SubType= 3
     112      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     113      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     114      LPM flag: 1 for E > 1 GeV
     115      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     116               eBrem :     Emin=          0 eV         Emax=   1 GeV
     117            eBremRel :     Emin=          1 GeV        Emax=   10 TeV
     118
     119eIoni:   for  e+    SubType= 2
     120      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     121      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     122      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     123      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     124        MollerBhabha :     Emin=          0 eV         Emax=   10 TeV
     125
     126eBrem:   for  e+    SubType= 3
     127      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     128      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     129      LPM flag: 1 for E > 1 GeV
     130      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     131               eBrem :     Emin=          0 eV         Emax=   1 GeV
     132            eBremRel :     Emin=          1 GeV        Emax=   10 TeV
     133
     134annihil:   for  e+    SubType= 5
     135      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     136      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     137            eplus2gg :     Emin=          0 eV         Emax=   10 TeV
     138
     139hIoni:   for  proton    SubType= 2
     140      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     141      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     142      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     143      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     144               Bragg :     Emin=          0 eV         Emax=   2 MeV
     145          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     146
     147ionIoni:   for  GenericIon    SubType= 2
     148      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     149      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     150      finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 0, fluct: 1, linLossLimit= 0.02
     151      Stopping Power data for 17 ion/material pairs, nuclearStopping: 1
     152      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     153            BraggIon :     Emin=          0 eV         Emax=   2 MeV
     154          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     155
     156hIoni:   for  anti_proton    SubType= 2
     157      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     158      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     159      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     160      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     161            ICRU73QO :     Emin=          0 eV         Emax=   2 MeV
     162          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     163
     164hIoni:   for  kaon+    SubType= 2
     165      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     166      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     167      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     168      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     169               Bragg :     Emin=          0 eV         Emax=   1.05231 MeV
     170          BetheBloch :     Emin=    1.05231 MeV        Emax=   10 TeV
     171
     172hIoni:   for  kaon-    SubType= 2
     173      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     174      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     175      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     176      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     177            ICRU73QO :     Emin=          0 eV         Emax=   1.05231 MeV
     178          BetheBloch :     Emin=    1.05231 MeV        Emax=   10 TeV
     179
     180muIoni:   for  mu+    SubType= 2
     181      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     182      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     183      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     184      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     185               Bragg :     Emin=          0 eV         Emax=   200 keV
     186          BetheBloch :     Emin=        200 keV        Emax=   1 GeV
     187        MuBetheBloch :     Emin=          1 GeV        Emax=   10 TeV
     188
     189muBrems:   for  mu+    SubType= 3
     190      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     191      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     192      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     193              MuBrem :     Emin=          0 eV         Emax=   10 TeV
     194
     195muPairProd:   for  mu+    SubType= 4
     196      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     197      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     198      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     199          muPairProd :     Emin=          0 eV         Emax=   10 TeV
     200
     201muIoni:   for  mu-    SubType= 2
     202      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     203      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     204      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     205      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     206            ICRU73QO :     Emin=          0 eV         Emax=   200 keV
     207          BetheBloch :     Emin=        200 keV        Emax=   1 GeV
     208        MuBetheBloch :     Emin=          1 GeV        Emax=   10 TeV
     209
     210muBrems:   for  mu-    SubType= 3
     211      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     212      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     213      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     214              MuBrem :     Emin=          0 eV         Emax=   10 TeV
     215
     216muPairProd:   for  mu-    SubType= 4
     217      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     218      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     219      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     220          muPairProd :     Emin=          0 eV         Emax=   10 TeV
     221
     222hIoni:   for  pi+    SubType= 2
     223      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     224      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     225      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     226      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     227               Bragg :     Emin=          0 eV         Emax=   297.504 keV
     228          BetheBloch :     Emin=    297.504 keV        Emax=   10 TeV
     229
     230hIoni:   for  pi-    SubType= 2
     231      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     232      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     233      finalRange(mm)= 1, dRoverRange= 0.2, integral: 0, fluct: 1, linLossLimit= 0.01
     234      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     235            ICRU73QO :     Emin=          0 eV         Emax=   297.504 keV
     236          BetheBloch :     Emin=    297.504 keV        Emax=   10 TeV
    203237
    204238Region <DefaultRegionForTheWorld> -- appears in <Water> world volume
     
    206240 Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
    207241 Materials : Water
    208  Production cuts :  gamma 1 mm     e- 1 mm     e+ 1 mm
     242 Production cuts :   gamma 1 mm      e- 1 mm      e+ 1 mm  proton 0 fm
    209243
    210244========= Table of registered couples ==============================
     
    212246Index : 0     used in the geometry : Yes     recalculation needed : No
    213247 Material : Water
    214  Range cuts        :  gamma 1 mm     e- 1 mm     e+ 1 mm
    215  Energy thresholds :  gamma 2.90186 keV    e- 347.138 keV    e+ 338.695 keV
     248 Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 0 fm
     249 Energy thresholds :  gamma  2.93991 keV    e-  349.408 keV    e+  341.455 keV proton 0 eV
    216250 Region(s) which use this couple :
    217251    DefaultRegionForTheWorld
     
    234268---> Begin of Event: 0
    235269
    236 ---> Begin of Event: 10000
    237 
    238 ---> Begin of Event: 20000
    239 
    240 ---> Begin of Event: 30000
    241 
    242 ---> Begin of Event: 40000
    243 
    244 ---> Begin of Event: 50000
    245 
    246 ---> Begin of Event: 60000
    247 
    248 ---> Begin of Event: 70000
    249 
    250 ---> Begin of Event: 80000
    251 
    252 ---> Begin of Event: 90000
     270---> Begin of Event: 100000
     271
     272---> Begin of Event: 200000
     273
     274---> Begin of Event: 300000
     275
     276---> Begin of Event: 400000
     277
     278---> Begin of Event: 500000
     279
     280---> Begin of Event: 600000
     281
     282---> Begin of Event: 700000
     283
     284---> Begin of Event: 800000
     285
     286---> Begin of Event: 900000
    253287Run terminated.
    254288Run Summary
    255   Number of events processed : 100000
    256   User=1.4s Real=1.4s Sys=0s
    257 
    258  The run consists of 100000 gamma of 100 keV through 100 m   of Water (density: 1 g/cm3 )
    259 
    260  Process calls frequency --->   compt = 98335   phot = 1665
    261 
    262  MeanFreePath:  6.0496 cm  +- 6.0503 cm         massic: 6.0496 g/cm2
    263  CrossSection:  0.1653 cm^-1                    massic: 0.1653 cm2/g
    264 
    265  mean energy of charged secondaries: 15.209 keV mass_energy_transfer coef: 0.025141 cm2/g
     289  Number of events processed : 1000000
     290  User=8.8s Real=11s Sys=0s
     291
     292 The run consists of 1000000 gamma of 100 keV through 100 m   of Water (density: 1 g/cm3 )
     293
     294 Process calls frequency --->   compt = 983863  phot = 16137
     295
     296 MeanFreePath:  6.0708 cm  +- 6.0755 cm         massic: 6.0708 g/cm2
     297 CrossSection:  0.16472 cm^-1                   massic: 0.16472 cm2/g
     298
     299 mean energy of charged secondaries: 15.188 keV mass_energy_transfer coef: 0.025018 cm2/g
    266300
    267301 Verification : crossSections from G4EmCalculator
    268         compt= 0.1623 cm2/g     phot= 0.0026853 cm2/g   total= 0.16498 cm2/g
     302        compt= 0.1623 cm2/g     phot= 0.0026853 cm2/g   total= 0.16499 cm2/g
    269303
    270304--------- Ranecu engine status ---------
    271305 Initial seed (index) = 0
    272  Current couple of seeds = 1982964064, 678286457
     306 Current couple of seeds = 2024716243, 1456126694
    273307----------------------------------------
    274308#
     
    276310/gun/energy 100 MeV
    277311#
    278 /run/beamOn 100000
     312/run/beamOn 1000000
    279313
    280314Region <DefaultRegionForTheWorld> -- appears in <Water> world volume
     
    282316 Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
    283317 Materials : Water
    284  Production cuts :  gamma 1 mm     e- 1 mm     e+ 1 mm
     318 Production cuts :   gamma 1 mm      e- 1 mm      e+ 1 mm  proton 0 fm
    285319
    286320========= Table of registered couples ==============================
     
    288322Index : 0     used in the geometry : Yes     recalculation needed : No
    289323 Material : Water
    290  Range cuts        :  gamma 1 mm     e- 1 mm     e+ 1 mm
    291  Energy thresholds :  gamma 2.9 keV    e- 3.5e+02 keV    e+ 3.4e+02 keV
     324 Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 0 fm
     325 Energy thresholds :  gamma  2.9 keV    e-  3.5e+02 keV    e+  3.4e+02 keV proton 0 eV
    292326 Region(s) which use this couple :
    293327    DefaultRegionForTheWorld
     
    299333--------- Ranecu engine status ---------
    300334 Initial seed (index) = 0
    301  Current couple of seeds = 1982964064, 678286457
     335 Current couple of seeds = 2024716243, 1456126694
    302336----------------------------------------
    303337Start Run processing.
     
    305339---> Begin of Event: 0
    306340
    307 ---> Begin of Event: 10000
    308 
    309 ---> Begin of Event: 20000
    310 
    311 ---> Begin of Event: 30000
    312 
    313 ---> Begin of Event: 40000
    314 
    315 ---> Begin of Event: 50000
    316 
    317 ---> Begin of Event: 60000
    318 
    319 ---> Begin of Event: 70000
    320 
    321 ---> Begin of Event: 80000
    322 
    323 ---> Begin of Event: 90000
     341---> Begin of Event: 100000
     342
     343---> Begin of Event: 200000
     344
     345---> Begin of Event: 300000
     346
     347---> Begin of Event: 400000
     348
     349---> Begin of Event: 500000
     350
     351---> Begin of Event: 600000
     352
     353---> Begin of Event: 700000
     354
     355---> Begin of Event: 800000
     356
     357---> Begin of Event: 900000
    324358Run terminated.
    325359Run Summary
    326   Number of events processed : 100000
    327   User=1.4s Real=1.4s Sys=0s
    328 
    329  The run consists of 100000 e- of 100 MeV through 100 m   of Water (density: 1 g/cm3 )
    330 
    331  Process calls frequency --->   eBrem = 61697   eIoni = 38303
    332 
    333  MeanFreePath:  1.5679 cm  +- 1.5695 cm         massic: 1.5679 g/cm2
    334  CrossSection:  0.63781 cm^-1                   massic: 0.63781 cm2/g
    335 
    336  mean energy of charged secondaries: 705.83 keV mass_energy_transfer coef: 0.0045019 cm2/g
     360  Number of events processed : 1000000
     361  User=9.8s Real=14s Sys=0s
     362
     363 The run consists of 1000000 e- of 100 MeV through 100 m   of Water (density: 1 g/cm3 )
     364
     365 Process calls frequency --->   eBrem = 604059  eIoni = 395941
     366
     367 MeanFreePath:  1.626 cm  +- 1.6247 cm  massic: 1.626 g/cm2
     368 CrossSection:  0.61499 cm^-1                   massic: 0.61499 cm2/g
     369
     370 mean energy of charged secondaries: 750.63 keV mass_energy_transfer coef: 0.0046163 cm2/g
    337371
    338372 Verification : crossSections from G4EmCalculator
    339         eBrem= 0.39397 cm2/g    eIoni= 0.24497 cm2/g    total= 0.63894 cm2/g
     373        eBrem= 0.37212 cm2/g    eIoni= 0.24337 cm2/g    total= 0.61549 cm2/g
    340374
    341375--------- Ranecu engine status ---------
    342376 Initial seed (index) = 0
    343  Current couple of seeds = 679237908, 105871640
     377 Current couple of seeds = 1860356547, 1898423253
    344378----------------------------------------
    345379UserDetectorConstruction deleted.
     
    349383G4 kernel has come to Quit state.
    350384EventManager deleted.
    351 Default detector region deleted.
    352385UImanager deleted.
    353386Units table cleared.
     
    355388RunManagerKernel is deleted.
    356389RunManager is deleting.
     390
  • trunk/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh

    r1230 r1337  
    2525//
    2626// $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:44:56 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/TestEm14/include/DetectorMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:44:58 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/TestEm14/include/EventAction.hh

    r1230 r1337  
    2525//
    2626// $Id: EventAction.hh,v 1.3 2006/06/29 16:45:00 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/TestEm14/include/EventActionMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:45:02 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/TestEm14/include/HistoManager.hh

    r1230 r1337  
    2525//
    2626// $Id: HistoManager.hh,v 1.4 2007/11/13 12:13:32 maire 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/TestEm14/include/HistoMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: HistoMessenger.hh,v 1.4 2007/11/13 12:13:32 maire 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/TestEm14/include/PhysListEmLivermore.hh

    r1230 r1337  
    2525//
    2626// $Id: PhysListEmLivermore.hh,v 1.4 2009/11/19 10:36:37 maire 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/TestEm14/include/PhysListEmPenelope.hh

    r1230 r1337  
    2525//
    2626// $Id: PhysListEmPenelope.hh,v 1.4 2009/11/19 10:36:37 maire 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/TestEm14/include/PhysListEmStandard.hh

    r1230 r1337  
    2525//
    2626// $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 16:45:14 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/TestEm14/include/PhysicsList.hh

    r1230 r1337  
    2626//
    2727// $Id: PhysicsList.hh,v 1.3 2006/06/29 16:45:16 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/TestEm14/include/PhysicsListMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:45:18 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/TestEm14/include/PrimaryGeneratorAction.hh

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:45:20 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/TestEm14/include/RunAction.hh

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: RunAction.hh,v 1.5 2010/04/05 18:02:39 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    3434
    3535#include "G4UserRunAction.hh"
    36 #include "ProcessesCount.hh"
    3736#include "globals.hh"
     37#include <map>
    3838
    3939//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    5656    void   EndOfRunAction(const G4Run*);
    5757
    58     void CountProcesses(G4String);
     58    void CountProcesses(G4String procName)
     59                  {procCounter[procName]++;};
    5960    void SumTrack (G4double track)
    60          {totalCount++; sumTrack += track; sumTrack2 += track*track;};
     61                  {totalCount++; sumTrack += track; sumTrack2 += track*track;};
    6162    void SumeTransf (G4double energy)
    62          {eTransfer += energy;};         
     63                  {eTransfer += energy;};       
    6364                   
    6465  private:
    65     DetectorConstruction*   detector;
    66     PrimaryGeneratorAction* primary;
    67     ProcessesCount*         ProcCounter;
    68     HistoManager*           histoManager;
     66    DetectorConstruction*      detector;
     67    PrimaryGeneratorAction*    primary;
     68    HistoManager*              histoManager;
    6969       
     70    std::map<G4String,G4int>   procCounter;           
    7071    G4int totalCount;      //all processes counter
    7172    G4double sumTrack;     //sum of trackLength
  • trunk/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: SteppingAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: SteppingAction.hh,v 1.5 2010/04/02 13:22:02 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    3939class RunAction;
    4040class HistoManager;
    41 class SteppingMessenger;
    4241
    4342//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    5150    void UserSteppingAction(const G4Step*);
    5251   
    53     void SetMaxEdepForPlot(G4double value)  {fract = value;};
    54    
    5552  private:
    5653    PrimaryGeneratorAction* primary;
    5754    RunAction*              runAction;
    5855    HistoManager*           histoManager;
    59     SteppingMessenger*      stepMessenger;
    60    
    61     G4double                fract;   //max edep for plotting final state
    6256};
    6357
  • trunk/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh

    r1230 r1337  
    2525//
    2626// $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:45:31 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//   This class manages the verbose outputs in G4SteppingManager.
  • trunk/examples/extended/electromagnetic/TestEm14/src/DetectorConstruction.cc

    r1230 r1337  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.4 2006/06/29 16:45:33 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/TestEm14/src/DetectorMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.3 2006/06/29 16:45:35 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/TestEm14/src/EventAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: EventAction.cc,v 1.3 2006/06/29 16:45:37 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: EventAction.cc,v 1.6 2010/06/07 05:40:46 perl Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    3535
    3636#include "G4Event.hh"
    37 #include "G4TrajectoryContainer.hh"
    38 #include "G4Trajectory.hh"
    39 #include "G4VVisManager.hh"
    4037#include "G4UnitsTable.hh"
    4138
     
    4340
    4441EventAction::EventAction()
    45 :printModulo(10000),eventMessenger(0)
     42:printModulo(100000),eventMessenger(0)
    4643{
    4744  eventMessenger = new EventActionMessenger(this);
     
    6865//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6966
    70 void EventAction::EndOfEventAction(const G4Event* evt)
     67void EventAction::EndOfEventAction(const G4Event*)
    7168{
    72   if (G4VVisManager::GetConcreteInstance())
    73   {
    74     G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    75     G4int n_trajectories = 0;
    76     if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    77     for (G4int i=0; i<n_trajectories; i++) {
    78        G4Trajectory* trj = (G4Trajectory*)
    79                                        ((*(evt->GetTrajectoryContainer()))[i]);
    80        trj->DrawTrajectory(1000);
    81     }
    82   }
    8369}
    8470
  • trunk/examples/extended/electromagnetic/TestEm14/src/EventActionMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:45:39 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/TestEm14/src/HistoManager.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoManager.cc,v 1.7 2008/09/24 18:53:56 maire 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/TestEm14/src/HistoMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: HistoMessenger.cc,v 1.4 2007/11/13 12:17:07 maire 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/TestEm14/src/PhysListEmLivermore.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmLivermore.cc,v 1.4 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmLivermore.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    140140      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    141141      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    142       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     142      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    143143     
    144144      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
     
    147147      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    148148      eBrem->AddEmModel(0, eBremModel);
    149       pmanager->AddProcess(eBrem,                   -1, 2, 2);
     149      pmanager->AddProcess(eBrem,                   -1,-1, 2);
    150150           
    151151    } else if (particleName == "e+") {
    152152      //positron
    153       pmanager->AddProcess(new G4eIonisation,       -1, 1, 1);
    154       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 2, 2);
     153      pmanager->AddProcess(new G4eIonisation,       -1,-1, 1);
     154      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-1, 2);
    155155      pmanager->AddProcess(new G4eplusAnnihilation,  0,-1, 3);
    156156     
     
    158158               particleName == "mu-"    ) {
    159159      //muon 
    160       pmanager->AddProcess(new G4MuIonisation,      -1, 1, 1);
    161       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2, 2);
    162       pmanager->AddProcess(new G4MuPairProduction,  -1, 3, 3);       
     160      pmanager->AddProcess(new G4MuIonisation,      -1,-1, 1);
     161      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1, 2);
     162      pmanager->AddProcess(new G4MuPairProduction,  -1,-1, 3);       
    163163     
    164164    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    165       pmanager->AddProcess(new G4ionIonisation,     -1, 1, 1);
     165      pmanager->AddProcess(new G4ionIonisation,     -1,-1, 1);
    166166
    167167    } else if ((!particle->IsShortLived()) &&
     
    169169               (particle->GetParticleName() != "chargedgeantino")) {
    170170      //all others charged particles except geantino
    171       pmanager->AddProcess(new G4hIonisation,       -1, 1, 1);
     171      pmanager->AddProcess(new G4hIonisation,       -1,-1, 1);
    172172    }
    173173  }
  • trunk/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmPenelope.cc,v 1.4 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmPenelope.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    141141      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    142142      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    143       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     143      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    144144     
    145145      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
     
    148148      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    149149      eBrem->AddEmModel(0, eBremModel);
    150       pmanager->AddProcess(eBrem,                   -1, 2, 2);
     150      pmanager->AddProcess(eBrem,                   -1,-1, 2);
    151151           
    152152    } else if (particleName == "e+") {
     
    157157      eIoniModel->SetHighEnergyLimit(highEnergyLimit);
    158158      eIoni->AddEmModel(0, eIoniModel, new G4UniversalFluctuation() );
    159       pmanager->AddProcess(eIoni,                   -1, 1, 1);
     159      pmanager->AddProcess(eIoni,                   -1,-1, 1);
    160160     
    161161      G4eBremsstrahlung* eBrem = new G4eBremsstrahlung();
     
    164164      eBremModel->SetHighEnergyLimit(highEnergyLimit);
    165165      eBrem->AddEmModel(0, eBremModel);
    166       pmanager->AddProcess(eBrem,                   -1, 2, 2);     
     166      pmanager->AddProcess(eBrem,                   -1,-1, 2);     
    167167
    168168      G4eplusAnnihilation* eAnni = new G4eplusAnnihilation();
     
    176176               particleName == "mu-"    ) {
    177177      //muon 
    178       pmanager->AddProcess(new G4MuIonisation,      -1, 1, 1);
    179       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2, 2);
    180       pmanager->AddProcess(new G4MuPairProduction,  -1, 3, 3);       
     178      pmanager->AddProcess(new G4MuIonisation,      -1,-1, 1);
     179      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1, 2);
     180      pmanager->AddProcess(new G4MuPairProduction,  -1,-1, 3);       
    181181     
    182182    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    183       pmanager->AddProcess(new G4ionIonisation,     -1, 1, 1);
     183      pmanager->AddProcess(new G4ionIonisation,     -1,-1, 1);
    184184
    185185    } else if ((!particle->IsShortLived()) &&
     
    187187               (particle->GetParticleName() != "chargedgeantino")) {
    188188      //all others charged particles except geantino
    189       pmanager->AddProcess(new G4hIonisation,       -1, 1, 1);
     189      pmanager->AddProcess(new G4hIonisation,       -1,-1, 1);
    190190    }
    191191  }
  • trunk/examples/extended/electromagnetic/TestEm14/src/PhysListEmStandard.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysListEmStandard.cc,v 1.4 2006/10/24 16:54:16 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysListEmStandard.cc,v 1.5 2010/04/02 13:22:02 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    8282    } else if (particleName == "e-") {
    8383      //electron
    84       pmanager->AddProcess(new G4eIonisation,        -1, 1,1);
    85       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 2,2);
     84      pmanager->AddProcess(new G4eIonisation,        -1,-1,1);
     85      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,2);
    8686           
    8787    } else if (particleName == "e+") {
    8888      //positron
    89       pmanager->AddProcess(new G4eIonisation,        -1, 1,1);
    90       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 2,2);
     89      pmanager->AddProcess(new G4eIonisation,        -1,-1,1);
     90      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,2);
    9191      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,3);
    9292     
     
    9494               particleName == "mu-"    ) {
    9595      //muon 
    96       pmanager->AddProcess(new G4MuIonisation,      -1, 1,1);
    97       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 2,2);
    98       pmanager->AddProcess(new G4MuPairProduction,  -1, 3,3);       
     96      pmanager->AddProcess(new G4MuIonisation,      -1,-1,1);
     97      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1,2);
     98      pmanager->AddProcess(new G4MuPairProduction,  -1,-1,3);       
    9999     
    100100    } else if( particleName == "alpha" || particleName == "GenericIon" ) {
    101       pmanager->AddProcess(new G4ionIonisation,     -1, 1,1);
     101      pmanager->AddProcess(new G4ionIonisation,     -1,-1,1);
    102102
    103103    } else if ((!particle->IsShortLived()) &&
     
    105105               (particle->GetParticleName() != "chargedgeantino")) {
    106106      //all others charged particles except geantino
    107       pmanager->AddProcess(new G4hIonisation,       -1,1,1);
     107      pmanager->AddProcess(new G4hIonisation,       -1,-1,1);
    108108    }
    109109  }
  • trunk/examples/extended/electromagnetic/TestEm14/src/PhysicsList.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysicsList.cc,v 1.6 2009/11/19 10:36:37 maire Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysicsList.cc,v 1.8 2010/04/05 18:02:39 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    183183  //
    184184  G4EmProcessOptions emOptions;
    185   emOptions.SetStepFunction(1., 1*mm); 
    186185  emOptions.SetIntegral(false);
    187   emOptions.SetLossFluctuations(false);   
    188186}
    189187
     
    227225
    228226void PhysicsList::SetCuts()
    229 {   
    230   // set cut values for gamma at first and for e- second and next for e+,
    231   // because some processes for e+/e- need cut values for gamma
    232   SetCutValue(cutForGamma, "gamma");
    233   SetCutValue(cutForElectron, "e-");
    234   SetCutValue(cutForPositron, "e+");
     227{
     228 // fixe lower limit for cut
     229 G4ProductionCutsTable::GetProductionCutsTable()->SetEnergyRange(100*eV, 1*GeV);
     230 
     231 // set cut values for gamma at first and for e- second and next for e+,
     232 // because some processes for e+/e- need cut values for gamma
     233 SetCutValue(cutForGamma, "gamma");
     234 SetCutValue(cutForElectron, "e-");
     235 SetCutValue(cutForPositron, "e+");
    235236}
    236237
  • trunk/examples/extended/electromagnetic/TestEm14/src/PhysicsListMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:45: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/TestEm14/src/PrimaryGeneratorAction.cc

    r1230 r1337  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:45:57 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/TestEm14/src/RunAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.4 2006/09/06 09:56:06 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: RunAction.cc,v 1.5 2010/04/05 18:02:39 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    4949RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim,
    5050                     HistoManager* histo)
    51   : detector(det), primary(prim), ProcCounter(0), histoManager(histo)
     51  : detector(det), primary(prim), histoManager(histo)
    5252{ }
    5353
     
    6767  CLHEP::HepRandom::showEngineStatus();
    6868
    69   ProcCounter = new ProcessesCount;
    7069  totalCount = 0;
    7170  sumTrack = sumTrack2 = 0.;
     
    7372 
    7473  histoManager->book();
    75 }
    76 
    77 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    78 
    79 void RunAction::CountProcesses(G4String procName)
    80 {
    81    //does the process  already encounted ?
    82    size_t nbProc = ProcCounter->size();
    83    size_t i = 0;
    84    while ((i<nbProc)&&((*ProcCounter)[i]->GetName()!=procName)) i++;
    85    if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName));
    86 
    87    (*ProcCounter)[i]->Count();
    8874}
    8975
     
    11399  //frequency of processes
    114100  G4cout << "\n Process calls frequency --->";
    115   for (size_t i=0; i< ProcCounter->size();i++) {
    116      G4String procName = (*ProcCounter)[i]->GetName();
    117      G4int    count    = (*ProcCounter)[i]->GetCounter();
     101  std::map<G4String,G4int>::iterator it; 
     102  for (it = procCounter.begin(); it != procCounter.end(); it++) {
     103     G4String procName = it->first;
     104     G4int    count    = it->second;
    118105     G4cout << "\t" << procName << " = " << count;
    119106     if (procName == "Transportation") survive = count;
    120107  }
    121  
     108     
    122109  if (survive > 0) {
    123110    G4cout << "\n\n Nb of incident particles surviving after "
     
    160147  G4EmCalculator emCalculator;
    161148  G4double sumc = 0.0; 
    162   for (size_t i=0; i< ProcCounter->size();i++) {
    163     G4String procName = (*ProcCounter)[i]->GetName();
     149  for (it = procCounter.begin(); it != procCounter.end(); it++) {
     150    G4String procName = it->first;     
    164151    G4double massSigma =
    165152    emCalculator.GetCrossSectionPerVolume(energy,particle,
     
    177164                 
    178165  //restore default format       
    179   G4cout.precision(prec);         
    180 
    181   // delete and remove all contents in ProcCounter
    182   while (ProcCounter->size()>0){
    183     OneProcessCount* aProcCount=ProcCounter->back();
    184     ProcCounter->pop_back();
    185     delete aProcCount;
    186   }
    187   delete ProcCounter;
     166  G4cout.precision(prec);
     167           
     168  // remove all contents in procCounter
     169  procCounter.clear();
    188170 
    189171  histoManager->save();
  • trunk/examples/extended/electromagnetic/TestEm14/src/SteppingAction.cc

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: SteppingAction.cc,v 1.5 2007/06/23 22:23:20 maire Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: SteppingAction.cc,v 1.6 2010/04/02 13:22:02 maire Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    3434#include "RunAction.hh"
    3535#include "HistoManager.hh"
    36 #include "SteppingMessenger.hh"
    3736
    3837#include "G4RunManager.hh"
     
    4342                               RunAction* RuAct, HistoManager* Hist)
    4443:primary(prim),runAction(RuAct), histoManager(Hist)
    45 {
    46   stepMessenger = new SteppingMessenger(this);
    47   fract = 0.1;
    48 }
     44{ }
    4945
    5046//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    5147
    5248SteppingAction::~SteppingAction()
    53 {
    54   delete stepMessenger;
    55 }
     49{ }
    5650
    5751//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     
    6054{
    6155  G4StepPoint* endPoint = aStep->GetPostStepPoint();
    62   G4String procName = endPoint->GetProcessDefinedStep()->GetProcessName();
    63   G4TrackVector* secondary = fpSteppingManager->GetSecondary();         
     56  G4String procName = endPoint->GetProcessDefinedStep()->GetProcessName();     
    6457  G4bool transmit = (endPoint->GetStepStatus() <= fGeomBoundary); 
    6558  if (transmit) runAction->CountProcesses(procName);
     
    6760    //count real processes and sum track length
    6861    G4double stepLength = aStep->GetStepLength();
    69     G4double charge = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
    70     if ((charge == 0.) || ((charge != 0.) && (((*secondary).size() > 0))))
    71       {
    72        runAction->CountProcesses(procName); 
    73        runAction->SumTrack(stepLength);
    74       }
     62    runAction->CountProcesses(procName); 
     63    runAction->SumTrack(stepLength);
    7564  }
    7665 
    7766  //plot final state (only if continuous energy loss is small enough)
    7867  //
    79   G4double edep = aStep->GetTotalEnergyDeposit();
    80   G4double E0 = primary->GetParticleGun()->GetParticleEnergy();
    81   if (edep < fract*E0) {
    8268   
    83     //scattered primary particle
    84     //
    85     G4int id = 1;
    86     if (aStep->GetTrack()->GetTrackStatus() == fAlive) {
    87       G4double energy = endPoint->GetKineticEnergy();     
    88       histoManager->FillHisto(id,energy);
     69  //scattered primary particle
     70  //
     71  G4int id = 1;
     72  if (aStep->GetTrack()->GetTrackStatus() == fAlive) {
     73    G4double energy = endPoint->GetKineticEnergy();     
     74    histoManager->FillHisto(id,energy);
    8975
    90       id = 2;
    91       G4ThreeVector direction = endPoint->GetMomentumDirection();
    92       G4double costeta = direction.x();
    93       histoManager->FillHisto(id,costeta);     
    94    
     76    id = 2;
     77    G4ThreeVector direction = endPoint->GetMomentumDirection();
     78    G4double costeta = direction.x();
     79    histoManager->FillHisto(id,costeta);     
     80 
    9581 
    96     //secondaries
    97     //
    98     //G4TrackVector* secondary = fpSteppingManager->GetSecondary();
    99     for (size_t lp=0; lp<(*secondary).size(); lp++) {
    100       G4double charge = (*secondary)[lp]->GetDefinition()->GetPDGCharge();
    101       if (charge != 0.) id = 3; else id = 5;
    102       G4double energy = (*secondary)[lp]->GetKineticEnergy();
    103       histoManager->FillHisto(id,energy);
     82  //secondaries
     83  //
     84  G4TrackVector* secondary = fpSteppingManager->GetSecondary();
     85  for (size_t lp=0; lp<(*secondary).size(); lp++) {
     86    G4double charge = (*secondary)[lp]->GetDefinition()->GetPDGCharge();
     87    if (charge != 0.) id = 3; else id = 5;
     88    G4double energy = (*secondary)[lp]->GetKineticEnergy();
     89    histoManager->FillHisto(id,energy);
    10490
    105       id++;
    106       G4ThreeVector direction = (*secondary)[lp]->GetMomentumDirection();     
    107       G4double costeta = direction.x();
    108       histoManager->FillHisto(id,costeta);
     91    id++;
     92    G4ThreeVector direction = (*secondary)[lp]->GetMomentumDirection();     
     93    G4double costeta = direction.x();
     94    histoManager->FillHisto(id,costeta);
    10995     
    110       //energy tranferred to charged secondaries
    111       if (charge != 0.) runAction->SumeTransf(energy);         
    112     }
     96    //energy tranferred to charged secondaries
     97    if (charge != 0.) runAction->SumeTransf(energy);         
    11398  }
    11499         
  • trunk/examples/extended/electromagnetic/TestEm14/src/SteppingVerbose.cc

    r1230 r1337  
    2525//
    2626// $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:46:05 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/TestEm14/vis.mac

    r807 r1337  
    11#
    2 # Macro file for the initialization phase of "TestEm14.cc"
     2# Macro file for the initialization phase of "TestEm6.cc"
    33#
    44# Sets some default verbose
     
    1010/run/initialize
    1111#
    12 # Create empty scene ("world" is default)
    13 /vis/scene/create
     12# Use this open statement to create an OpenGL view:
     13/vis/open OGL 600x600-0+0
    1414#
    15 # Create a scene handler for a specific graphics system
    16 # Edit the next line(s) to choose another graphic system
    17 #
    18 /vis/open OGLIX
    19 #
     15# Use this open statement to create a .prim file suitable for
     16# viewing in DAWN:
    2017#/vis/open DAWNFILE
    2118#
    22 # Draw scene
     19# Use this open statement to create a .heprep file suitable for
     20# viewing in HepRApp:
     21#/vis/open HepRepFile
     22#
     23# Use this open statement to create a .wrl file suitable for
     24# viewing in a VRML viewer:
     25#/vis/open VRML2FILE
     26#
     27# Disable auto refresh and quieten vis messages whilst scene and
     28# trajectories are established:
     29/vis/viewer/set/autoRefresh false
     30/vis/verbose errors
     31#
     32# Draw geometry:
     33/vis/drawVolume
     34#
     35# Specify view angle:
     36#/vis/viewer/set/viewpointThetaPhi 90. 0.
     37#
     38# Specify zoom value:
    2339/vis/viewer/zoom 1.4
    24 /vis/viewer/flush
    2540#
    26 # for drawing the tracks
    27 # if too many tracks cause core dump => storeTrajectory 0
    28 /tracking/storeTrajectory 1
     41# Specify style (surface or wireframe):
     42#/vis/viewer/set/style surface
     43#
     44# Draw coordinate axes:
     45#/vis/scene/add/axes 0 0 0 1 m
     46#
     47# Draw smooth trajectories at end of event, showing trajectory points
     48# as markers 2 pixels wide:
     49/vis/scene/add/trajectories smooth
     50/vis/modeling/trajectories/create/drawByCharge
     51/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     52/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     53# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     54#
     55# Draw hits at end of event:
     56#/vis/scene/add/hits
     57#
     58# To draw only gammas:
     59#/vis/filtering/trajectories/create/particleFilter
     60#/vis/filtering/trajectories/particleFilter-0/add gamma
     61#
     62# To invert the above, drawing all particles except gammas,
     63# keep the above two lines but also add:
     64#/vis/filtering/trajectories/particleFilter-0/invert true
     65#
     66# Many other options are available with /vis/modeling and /vis/filtering.
     67# For example, to select colour by particle ID:
     68#/vis/modeling/trajectories/create/drawByParticleID
     69#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     70#
     71# To superimpose all of the events from a given run:
    2972/vis/scene/endOfEventAction accumulate
     73#
     74# Re-establish auto refreshing and verbosity:
     75/vis/viewer/set/autoRefresh true
     76/vis/verbose warnings
     77#
     78# For file-based drivers, use this to create an empty detector view:
     79#/vis/viewer/flush
Note: See TracChangeset for help on using the changeset viewer.