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/radioactivedecay/exrdm
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/radioactivedecay/exrdm/History

    r1230 r1337  
    1 $Id: History,v 1.27 2009/09/22 16:50:06 gunter Exp $
     1$Id: History,v 1.30 2010/06/07 05:40:46 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17
     1806/06/2010 - J.Perl (exrdm-V09-03-02)
     19- Remove unused variable in EventAction
     20
     2102/06/2010 - J.Perl (exrdm-V09-03-01)
     22- Updated vis usage
     23
     2410/05/2010 V.Ivanchenko (exrdm-V09-03-00)
     25- substitute G4MultipleScattering by specialized processes per particle type
    1726
    182722/09/2009 G.Folger (exrdm-V09-02-00)

  • trunk/examples/extended/radioactivedecay/exrdm/README

    r1230 r1337  
    108108 
    109109     Visualisation of the geometry and the tracks is possible with many of the G4 visualisation packages. An
    110      example of display the geometry and tracks using VRML is given in the macro file macros/vrml.mac. 
     110     example of display the geometry and tracks using VRML is given in the macro file macros/vis.mac. 
    111111
    112112  6. ANALYSIS:

  • trunk/examples/extended/radioactivedecay/exrdm/exrdm.out

    r807 r1337  
     1
     2        ############################################
     3        !!! WARNING - FPE detection is activated !!!
     4        ############################################
    15
    26*************************************************************
    3  Geant4 version $Name:  $   (27-July-2004)
     7 Geant4 version Name: geant4-09-03-ref-06    (25-June-2010)
    48                      Copyright : Geant4 Collaboration
    59                      Reference : NIM A 506 (2003), 250-303
    … …  
    711*************************************************************
    812
     13New histogram will be booked: #10  <Energy deposit (MeV) in the traget  100  0  15  1
     14New histogram will be booked: #11  <Energy deposit (MeV) in the detector  100  0  15  1
     15New histogram will be booked: #12  <Total energy spectrum (MeV) of the traget and detector  100  0  15  1
     16New histogram will be booked: #13  <Coincidence spectrum (MeV) between the traget and detector  100  0  15  1
     17New histogram will be booked: #14  <Anti-coincidence spectrum (MeV) in the traget  100  0  15  1
     18New histogram will be booked: #15  <Anti-coincidence spectrum (MeV) in the detector  100  0  15  1
     19New histogram will be booked: #16  <Decay emission spectrum (MeV)  100  0  15  1
     20Vacuum H 1e-25 2.73 1.87245e-14
    921 Material:Vacuum with formula: H added!
    1022     Nb of Material = 1
    1123     Nb of Isotope =  0
    1224     Nb of Element =  1
     25Air N0.78-O0.22 0.00129 273.15 6.32421e+08
    1326 Material:Air with formula: N0.78-O0.22 added!
    1427     Nb of Material = 2
    1528     Nb of Isotope =  0
    1629     Nb of Element =  3
     30Aluminium Al 2.7 273.15 6.32421e+08
    1731 Material:Aluminium with formula: Al added!
    1832     Nb of Material = 3
    1933     Nb of Isotope =  0
    2034     Nb of Element =  4
     35Silicon Si 2.329 273.15 6.32421e+08
    2136 Material:Silicon with formula: Si added!
    2237     Nb of Material = 4
    2338     Nb of Isotope =  0
    2439     Nb of Element =  5
     40Lead Pb 11.3 273.15 6.32421e+08
    2541 Material:Lead with formula: Pb added!
    2642     Nb of Material = 5
    2743     Nb of Isotope =  0
    2844     Nb of Element =  6
     45Germanium Ge 5.323 273.15 6.32421e+08
    2946 Material:Germanium with formula: Ge added!
    3047     Nb of Material = 6
    3148     Nb of Isotope =  0
    3249     Nb of Element =  7
     50CsI Cs-I 4.51 273.15 6.32421e+08
    3351 Material:CsI with formula: Cs-I added!
    3452     Nb of Material = 7
    3553     Nb of Isotope =  0
    3654     Nb of Element =  9
    37 Visualization Manager instantiating...
     55Visualization Manager instantiating with verbosity "warnings (3)"...
    3856Visualization Manager initialising...
    3957Registering graphics systems...
    4058
    41 You have successfully chosen to use the following graphics systems.
     59You have successfully registered the following graphics systems.
    4260Current available graphics systems are:
    43   FukuiRenderer (DAWN)
     61  ASCIITree (ATree)
    4462  DAWNFILE (DAWNFILE)
     63  G4HepRep (HepRepXML)
     64  G4HepRepFile (HepRepFile)
     65  RayTracer (RayTracer)
    4566  VRML1FILE (VRML1FILE)
    4667  VRML2FILE (VRML2FILE)
    47   RayTracer (RayTracer)
     68  gMocrenFile (gMocrenFile)
     69  OpenGLStoredX (OGL)
     70  OpenGLImmediateX (OGLI)
     71  OpenGLStoredX (OGLS)
     72  OpenGLImmediateX (OGLIX)
     73  OpenGLStoredX (OGLSX)
     74
     75Registering model factories...
     76
     77You have successfully registered the following model factories.
     78Registered model factories:
     79  generic
     80  drawByCharge
     81  drawByParticleID
     82  drawByOriginVolume
     83  drawByAttribute
     84
     85Registered filter factories:
     86  chargeFilter
     87  particleFilter
     88  originVolumeFilter
     89  attributeFilter
     90
    4891
    4992----> The target has been changed to 3 cm of Lead
    50 
    51 phot:  Total cross sections from Sandia parametrisation.
    52 Thank you for using G4BinaryCascade.
    53 /fred/geant4/g4/data/G4NDL
    54 Thank you for using G4BinaryCascade.
    55 Thank you for using G4BinaryCascade.
     93NeutronHP: /Elastic/ file for Z = 8, A = 18 is not found and NeutronHP will use /afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13/Elastic///CrossSection/8_17_Oxygen
     94NeutronHP: /Capture file for Z = 8, A = 18 is not found and NeutronHP will use /afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13/Capture//CrossSection/8_17_Oxygen
     95NeutronHP: /Elastic file for Z = 8, A = 18 is not found and NeutronHP will use /afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13/Elastic//CrossSection/8_17_Oxygen
     96NeutronHP: /Inelastic file for Z = 8, A = 18 is not found and NeutronHP will use /afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13/Inelastic//CrossSection/8_17_Oxygen
     97/afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13
     98NeutronHP: /Capture/ file for Z = 8, A = 18 is not found and NeutronHP will use /afs/cern.ch/sw/geant4/releases/share/data/G4NDL3.13/Capture///CrossSection/8_17_Oxygen
     99### exrdmPhysicsList::ConstructProcess is done
    56100world cuts are set
    57101Target cuts are set
    58102Detector cuts are set
    59 G4VRangeToEnergyConverter::ConvertCutToKineticEnergy   for gamma
    60 The cut in range [500 (mm)]   is too big   for material  idx=5
    61 The cut in energy is set1.79769e+305GeV
     103============================================================================================
     104             HADRONIC PROCESSES SUMMARY (verbose level 1)
    62105
    63 compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV.
    64        Scattered gamma energy according Klein-Nishina.
    65         PhysicsTables from 1 keV to 100 GeV in 80 bins.
     106                     Hadronic Processes for <anti_neutron>
     107            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     108AntiNeutronInelastic  Models:  G4LEAntiNeutronInelastic: Emin(GeV)=     0  Emax(GeV)= 25
     109                               G4HEAntiNeutronInelastic: Emin(GeV)=    20  Emax(GeV)= 100000
    66110
    67 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z.
    68         e+e- energies according Bethe-Heitler
    69         PhysicsTables from 1.022 MeV to 100 GeV in 100 bins.
     111                     Hadronic Processes for <anti_proton>
     112            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     113 AntiProtonInelastic  Models:   G4LEAntiProtonInelastic: Emin(GeV)=     0  Emax(GeV)= 25
     114                                G4HEAntiProtonInelastic: Emin(GeV)=    20  Emax(GeV)= 100000
    70115
    71 msc:  Model variant of multiple scattering for e-
    72       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    73       Boundary algorithm is active with facrange= 0.199
     116                     Hadronic Processes for <e->
     117      ElectroNuclear  Models:                     CHIPS: Emin(GeV)=     0  Emax(GeV)= 30000
    74118
    75 eIoni:   tables are built for  e-
    76       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    77       Lambda tables from threshold to 100 TeV in 120 bins.
    78       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1
    79       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     119                     Hadronic Processes for <gamma>
     120     PhotonInelastic  Models:                     CHIPS: Emin(GeV)=     0  Emax(GeV)= 3.5
     121                                        TheoFSGenerator: Emin(GeV)=     3  Emax(GeV)= 100000
    80122
    81 eBrem:   tables are built for  e-
    82       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    83       Lambda tables from threshold to 100 TeV in 120 bins.
    84       Total cross sections from a parametrisation based on the EEDL data library.
    85       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
     123                     Hadronic Processes for <kaon+>
     124            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     125   KaonPlusInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     126                                  G4LEKaonPlusInelastic: Emin(GeV)=     0  Emax(GeV)= 25
    86127
    87 eIoni:   tables are built for  e+
    88       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    89       Lambda tables from threshold to 100 TeV in 120 bins.
    90       Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1
    91       Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV.
     128                     Hadronic Processes for <kaon->
     129            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     130  KaonMinusInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     131                                 G4LEKaonMinusInelastic: Emin(GeV)=     0  Emax(GeV)= 25
    92132
    93 eBrem:   tables are built for  e+
    94       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    95       Lambda tables from threshold to 100 TeV in 120 bins.
    96       Total cross sections from a parametrisation based on the EEDL data library.
    97       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV.
     133                     Hadronic Processes for <lambda>
     134            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     135     LambdaInelastic  Models:       G4LELambdaInelastic: Emin(GeV)=     0  Emax(GeV)= 25
     136                                    G4HELambdaInelastic: Emin(GeV)=    20  Emax(GeV)= 100000
    98137
    99 annihil:  Total cross section from Heilter formula(annihilation into 2 photons).
    100         gamma energies sampled according Heitler
    101         PhysicsTables from 10 keV to 10 TeV in 100 bins.
     138                     Hadronic Processes for <mu->
     139          muMinusCaptureAtRest
    102140
    103 msc:  Model variant of multiple scattering for proton
    104       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    105       Boundary algorithm is active with facrange= 0.199
     141                     Hadronic Processes for <neutron>
     142            hElastic  Models:          NeutronHPElastic: Emin(GeV)=     0  Emax(GeV)= 0.02
     143                                        G4HadronElastic: Emin(GeV)= 0.0195  Emax(GeV)= 100000
     144    NeutronInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     145                                   G4LENeutronInelastic: Emin(GeV)=   9.5  Emax(GeV)= 25
     146                                         Binary Cascade: Emin(GeV)= 0.0199  Emax(GeV)= 9.9
     147                                     NeutronHPInelastic: Emin(GeV)=     0  Emax(GeV)= 0.02
     148            nCapture  Models:                G4LCapture: Emin(GeV)= 0.0199  Emax(GeV)= 20000
     149                                       NeutronHPCapture: Emin(GeV)=     0  Emax(GeV)= 0.02
     150            nFission  Models:                G4LFission: Emin(GeV)= 0.0199  Emax(GeV)= 20000
     151                                       NeutronHPFission: Emin(GeV)=     0  Emax(GeV)= 0.02
    106152
    107 hIoni:   tables are built for  proton
    108       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    109       Lambda tables from threshold to 100 TeV in 120 bins.
    110       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    111       Bether-Bloch model for Escaled > 2 MeV, parametrisation of Bragg peak below, Integral mode 1
     153                     Hadronic Processes for <pi+>
     154            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     155   PionPlusInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     156                                  G4LEPionPlusInelastic: Emin(GeV)=     0  Emax(GeV)= 25
    112157
    113 msc:  Model variant of multiple scattering for mu+
    114       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    115       Boundary algorithm is active with facrange= 0.199
     158                     Hadronic Processes for <pi->
     159            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     160  PionMinusInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     161                                 G4LEPionMinusInelastic: Emin(GeV)=     0  Emax(GeV)= 25
    116162
    117 MuIoni:   tables are built for  mu+
    118       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    119       Lambda tables from threshold to 100 TeV in 120 bins.
    120       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    121       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    122       radiative corrections for E > 1 GeV
    123 
    124 MuBrems:   tables are built for  mu+
    125       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    126       Lambda tables from threshold to 100 TeV in 120 bins.
    127       Parametrised model
    128 
    129 MuPairProd:   tables are built for  mu+
    130       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    131       Lambda tables from threshold to 100 TeV in 120 bins.
    132       Parametrised model
    133 ### All dEdx and Range tables are built #####
    134 
    135 MuIoni:   tables are built for  mu-
    136       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    137       Lambda tables from threshold to 100 TeV in 120 bins.
    138       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1
    139       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    140       radiative corrections for E > 1 GeV
    141 
    142 msc:  Model variant of multiple scattering for pi-
    143       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    144       Boundary algorithm is active with facrange= 0.199
     163                     Hadronic Processes for <proton>
     164            hElastic  Models:           G4HadronElastic: Emin(GeV)=     0  Emax(GeV)= 100000
     165     ProtonInelastic  Models:                      QGSP: Emin(GeV)=    12  Emax(GeV)= 100000
     166                                    G4LEProtonInelastic: Emin(GeV)=   9.5  Emax(GeV)= 25
     167                                         Binary Cascade: Emin(GeV)=     0  Emax(GeV)= 9.9
     168============================================================================================
    145169
    146170========= Table of registered couples ==============================
    … …  
    148172Index : 0     used in the geometry : Yes     recalculation needed : No
    149173 Material : Air
    150  Range cuts        :  gamma 1 mm     e- 1 mm     e+ 1 mm
    151  Energy thresholds :  gamma 990 eV     e- 990 eV     e+ 990 eV
     174 Range cuts        :  gamma  1 mm     e-  1 mm     e+  1 mm  proton 0 fm
     175 Energy thresholds :  gamma  990 eV     e-  990 eV     e+  990 eV  proton 0 eV
    152176 Region(s) which use this couple :
    153177    DefaultRegionForTheWorld
    … …  
    155179Index : 1     used in the geometry : Yes     recalculation needed : No
    156180 Material : Lead
    157  Range cuts        :  gamma 10 cm     e- 10 cm     e+ 10 cm
    158  Energy thresholds :  gamma 2.24888 MeV    e- 437.915 MeV    e+ 396.844 MeV
     181 Range cuts        :  gamma  10 cm     e-  10 cm     e+  10 cm  proton 10 cm
     182 Energy thresholds :  gamma  2.10237 MeV    e-  430.674 MeV    e+  408.132 MeV proton 10 MeV
    159183 Region(s) which use this couple :
    160184    Target
    … …  
    162186Index : 2     used in the geometry : Yes     recalculation needed : No
    163187 Material : Germanium
    164  Range cuts        :  gamma 50 cm     e- 50 cm     e+ 50 cm
    165  Energy thresholds :  gamma 2.88022e+295 J      e- 1.91846 GeV    e+ 1.73853 GeV
     188 Range cuts        :  gamma  50 cm     e-  50 cm     e+  50 cm  proton 50 cm
     189 Energy thresholds :  gamma  10 GeV    e-  1.83883 GeV    e+  1.74258 GeV proton 50 MeV
    166190 Region(s) which use this couple :
    167191    Detector
    … …  
    169193====================================================================
    170194
    171 ### Histo books 7 histograms
    172 Loaded linked in JVM.
    173 Looking for already loaded JVMs...
    174 None found.
    175 Using CLASSPATH.
    176 classpathOption: -Djava.class.path=/fred/flei/AIDAJNI-3.2.2/lib/freehep-aidajni.jar:/fred/flei/JAIDA-3.2.2/lib/optimizers.jar:/fred/flei/JAIDA-3.2.2/lib/openide-lookup.jar:/fred/flei/JAIDA-3.2.2/lib/jel.jar:/fred/flei/JAIDA-3.2.2/lib/jas-plotter.jar:/fred/flei/JAIDA-3.2.2/lib/freehep-hep.jar:/fred/flei/JAIDA-3.2.2/lib/freehep-base.jar:/fred/flei/JAIDA-3.2.2/lib/bcel.jar:/fred/flei/JAIDA-3.2.2/lib/aida-dev.jar:/fred/flei/JAIDA-3.2.2/lib/aida.jar:
    177 Starting JVM...JVM Created.
    178 Tree store  : exrdm-proton.aida
    179 Creating Ntuple: Emitted Particles
    180 Creating Ntuple: RadioIsotopes
    181 Creating Ntuple: Energy Depositions
     195exrdmAnalysisManager: Histograms are booked and the run has been started
    182196### Run : 0
    183 G4AugerData for Element no. 7 are loaded
    184 G4AugerData for Element no. 8 are loaded
    185 G4AugerData for Element no. 13 are loaded
    186 G4AugerData for Element no. 14 are loaded
    187 G4AugerData for Element no. 32 are loaded
    188 G4AugerData for Element no. 53 are loaded
    189 G4AugerData for Element no. 55 are loaded
    190 G4AugerData for Element no. 82 are loaded
    191 AugerTransitionTable complete
    192 Closing the tree...
    193 Histograms and Ntuples are saved
    194 ### Histo books 7 histograms
    195 Loaded linked in JVM.
    196 Looking for already loaded JVMs...
    197 Number of jvm's returned: 1Using already loaded JVM.
    198 Tree store  : exrdm-f24.aida
    199 Creating Ntuple: Emitted Particles
    200 Creating Ntuple: RadioIsotopes
    201 Creating Ntuple: Energy Depositions
    202 Closing the tree...
    203 Histograms and Ntuples are saved
    204197Graphics systems deleted.
    205198Visualization Manager deleting...
     199

  • trunk/examples/extended/radioactivedecay/exrdm/macros/vrml.mac

    r807 r1337  
    44/run/setCutForRegion Target 10 cm
    55/run/setCutForRegion Detector 50 cm
    6 
    7 # vis
     6#
     7# Use this open statement to create an OpenGL view:
     8#/vis/open OGL 600x600-0+0
     9#
     10# Use this open statement to create a .prim file suitable for
     11# viewing in DAWN:
     12#/vis/open DAWNFILE
     13#
     14# Use this open statement to create a .heprep file suitable for
     15# viewing in HepRApp:
     16#/vis/open HepRepFile
     17#
     18# Use this open statement to create a .wrl file suitable for
     19# viewing in a VRML viewer:
    820/vis/open VRML2FILE
    9 /vis/scene/create
    10 /vis/viewer/reset
     21#
     22# Disable auto refresh and quieten vis messages whilst scene and
     23# trajectories are established:
     24/vis/viewer/set/autoRefresh false
     25/vis/verbose errors
     26#
     27# Draw geometry:
     28/vis/drawVolume
     29#
     30# Specify view angle:
     31/vis/viewer/set/viewpointThetaPhi 90. 180.
     32#
     33# Specify zoom value:
    1134/vis/viewer/zoom 20.
    12 /vis/viewer/set/viewpointThetaPhi 90. 180.
     35#
     36# Specify style (surface or wireframe):
    1337/vis/viewer/set/style wireframe
    14 /vis/drawVolume
    15 /vis/scene/endOfEventAction accumulate 
    16 /tracking/storeTrajectory 1     
    1738#
    18 
     39# Draw coordinate axes:
     40#/vis/scene/add/axes 0 0 0 1 m
     41#
     42# Draw smooth trajectories at end of event, showing trajectory points
     43# as markers 2 pixels wide:
     44/vis/scene/add/trajectories smooth
     45/vis/modeling/trajectories/create/drawByCharge
     46/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     47/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     48# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     49#
     50# Draw hits at end of event:
     51#/vis/scene/add/hits
     52#
     53# To draw only gammas:
     54#/vis/filtering/trajectories/create/particleFilter
     55#/vis/filtering/trajectories/particleFilter-0/add gamma
     56#
     57# To invert the above, drawing all particles except gammas,
     58# keep the above two lines but also add:
     59#/vis/filtering/trajectories/particleFilter-0/invert true
     60#
     61# Many other options are available with /vis/modeling and /vis/filtering.
     62# For example, to select colour by particle ID:
     63#/vis/modeling/trajectories/create/drawByParticleID
     64#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     65#
     66# To superimpose all of the events from a given run:
     67/vis/scene/endOfEventAction accumulate
     68#
     69# Re-establish auto refreshing and verbosity:
     70/vis/viewer/set/autoRefresh true
     71/vis/verbose warnings
     72#
     73# For file-based drivers, use this to create an empty detector view:
     74#/vis/viewer/flush
     75#
    1976/gps/particle proton
    2077/tracking/verbose 1

  • trunk/examples/extended/radioactivedecay/exrdm/src/exrdmEventAction.cc

    r1230 r1337  
    3232#include "G4EventManager.hh"
    3333#include "G4HCofThisEvent.hh"
    34 #include "G4TrajectoryContainer.hh"
    35 #include "G4Trajectory.hh"
    36 #include "G4VVisManager.hh"
    3734#include "G4UImanager.hh"
    3835#include "G4UnitsTable.hh"
    … …  
    6562//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    6663
    67 void exrdmEventAction::EndOfEventAction(const G4Event* evt)
     64void exrdmEventAction::EndOfEventAction(const G4Event*)
    6865{
    6966  //analysis
    7067  exrdmAnalysisManager::getInstance()->EndOfEvent();
    71   // visualisation
    72 #ifdef G4VIS_USE
    73   G4int event_id       = evt->GetEventID();
    74   if (event_id < 100 && G4VVisManager::GetConcreteInstance()) {
    75     G4TrajectoryContainer * trajectoryContainer = evt->GetTrajectoryContainer();
    76     G4int n_trajectories = 0;
    77     if (trajectoryContainer) n_trajectories = trajectoryContainer->entries();
    78     for (G4int i=0; i<n_trajectories; i++) {
    79       G4Trajectory* trj = (G4Trajectory *)
    80         ((*(evt->GetTrajectoryContainer()))[i]);
    81       if (drawFlag == "all") {
    82         trj->DrawTrajectory(0);
    83       } else if (drawFlag == "charged" && trj->GetCharge() != 0.) {
    84         trj->DrawTrajectory(0);
    85       }
    86     }
    87   }
    88 #endif
    8968}
    9069

  • trunk/examples/extended/radioactivedecay/exrdm/src/exrdmPhysListEmLowEnergy.cc

    r807 r1337  
    4646#include "G4eplusAnnihilation.hh"
    4747
    48 #include "G4MultipleScattering.hh"
     48#include "G4eMultipleScattering.hh"
     49#include "G4MuMultipleScattering.hh"
     50#include "G4hMultipleScattering.hh"
    4951
    5052#include "G4MuIonisation.hh"
    … …  
    8890    } else if (particleName == "e-") {
    8991 
    90       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
     92      pmanager->AddProcess(new G4eMultipleScattering, -1, 1,1);
    9193      pmanager->AddProcess(new G4LowEnergyIonisation,        -1, 2,2);
    9294      pmanager->AddProcess(new G4LowEnergyBremsstrahlung,    -1,-3,3);
    … …  
    9496    } else if (particleName == "e+") {
    9597
    96       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
     98      pmanager->AddProcess(new G4eMultipleScattering, -1, 1,1);
    9799      pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
    98100      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3,3);
    … …  
    102104               particleName == "mu-"    ) {
    103105
    104       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
     106      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
    105107      pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    106108      pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
    … …  
    109111    } else if (particleName == "GenericIon") {
    110112
    111       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
     113      pmanager->AddProcess(new G4hMultipleScattering, -1, 1,1);
    112114      pmanager->AddProcess(new G4hLowEnergyIonisation,       -1,2,2);
    113115      //      pmanager->AddProcess(new G4ionIonisation,      -1, 2,2);
    … …  
    117119               (particle->GetParticleName() != "chargedgeantino")) {
    118120
    119       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
     121      pmanager->AddProcess(new G4hMultipleScattering,-1,1,1);
    120122      pmanager->AddProcess(new G4hLowEnergyIonisation,       -1,2,2);
    121123    }
Note: See TracChangeset for help on using the changeset viewer.