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/TestEm8
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm8/History

    r807 r1337  
    1 $Id: History,v 1.29 2007/11/12 10:54:49 vnivanch Exp $
     1$Id: History,v 1.37 2010/06/06 04:31:28 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17
     1804-06-10 J.Perl (testem8-V09-03-03)
     19- Updated vis usage
     20
     2104-06-10 V.Ivant (testem8-V09-03-02)
     22- PhysicsList, Em8DetectorConstruction - renamed "VertexDetector" by
     23  "GasDetector"
     24- added cut per region into TestEm8.in
     25     
     2621-05-10 mma (testem8-V09-03-01)
     27- TestEm8.cc : introduction of G4UIExecutive
     28
     2913-04-10 V.Ivant (testem8-V09-03-00)
     30- Use pointer to G4EmConfigurator and not as a memeber of the class
     31
     3224-11-08 V.Ivant (testem8-V09-02-00)
     33- Fixed compillation warnings at SLC5
     34
     3505-12-08 V.Ivant (testem8-V09-01-02)
     36- Fixed typo in Physics List
     37
     3821-11-08 V.Ivant (testem8-V09-01-01)
     39- remove local components of PhsyicsList and use G4EmConfigurator to
     40  configure PAI model
     41
     4212-06-08 mma (testem8-V09-01-00)
     43- Remove AIDA from GNUmakefile
    1744
    184512-11-07 V.Ivant  (testem8-V09-00-05)

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

    r1230 r1337  
    2525//
    2626//
    27 // $Id: TestEm8.cc,v 1.8 2007/07/27 15:29:38 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: TestEm8.cc,v 1.9 2010/05/21 18:15:04 maire Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    30 //
    31 // --------------------------------------------------------------
    32 //      GEANT 4 - TestEm8
    33 //
    34 // --------------------------------------------------------------
    35 // Comments
    36 //     
    37 //   
    38 // --------------------------------------------------------------
     30//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     31//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    3932
    4033#include "G4RunManager.hh"
    4134#include "G4UImanager.hh"
    42 #include "G4UIterminal.hh"
    4335#include "Randomize.hh"
    44 
    45 #ifdef G4VIS_USE
    46 #include "G4VisExecutive.hh"
    47 #endif
    4836
    4937#include "Em8DetectorConstruction.hh"
    … …  
    5442#include "Em8SteppingAction.hh"
    5543#include "Em8SteppingVerbose.hh"
     44
     45#ifdef G4VIS_USE
     46#include "G4VisExecutive.hh"
     47#endif
     48
     49#ifdef G4UI_USE
     50#include "G4UIExecutive.hh"
     51#endif
     52
     53//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    5654
    5755int main(int argc,char** argv)
    … …  
    7674  runManager->SetUserInitialization(detector);
    7775  runManager->SetUserInitialization(new PhysicsList);
    78  
    79 #ifdef G4VIS_USE
    80   G4VisManager* visManager = 0;
    81 #endif
    8276 
    8377  // set user action classes
    … …  
    9993 
    10094  G4UImanager* UI = G4UImanager::GetUIpointer(); 
    101  
    102   if (argc==1)   // Define UI terminal for interactive mode 
     95
     96  if (argc!=1)   // batch mode 
     97    {
     98     G4String command = "/control/execute ";
     99     G4String fileName = argv[1];
     100     UI->ApplyCommand(command+fileName);
     101    }
     102   
     103  else           //define visualization and UI terminal for interactive mode
    103104    {
    104105#ifdef G4VIS_USE
    105      visManager = new G4VisExecutive;
    106       visManager->Initialize();
    107 #endif
    108       G4UIsession * session = new G4UIterminal;
    109       UI->ApplyCommand("/control/execute init.mac");   
    110       session->SessionStart();
    111       delete session;
    112     }
    113   else           // Batch mode
    114     {
    115       G4String command = "/control/execute ";
    116       G4String fileName = argv[1];
    117       UI->ApplyCommand(command+fileName);
    118     }
    119     
     106   G4VisManager* visManager = new G4VisExecutive;
     107   visManager->Initialize();
     108#endif    
     109     
     110#ifdef G4UI_USE
     111      G4UIExecutive * ui = new G4UIExecutive(argc,argv);     
     112      ui->SessionStart();
     113      delete ui;
     114#endif
     115   
     116#ifdef G4VIS_USE
     117     delete visManager;
     118#endif     
     119    } 
     120   
    120121  // job termination
    121  
    122 #ifdef G4VIS_USE
    123   delete visManager;
    124 #endif 
     122  //
    125123  delete runManager;
    126124
    … …  
    128126}
    129127
     128//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     129

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

    r807 r1337  
    1010#  select EM PhysicsList
    1111#
    12 #/testem/phys/addPhysics  emstandard
    1312/testem/phys/addPhysics  pai
    1413#/testem/phys/addPhysics  pai_photon
    15 #/testem/phys/addPhysics  pai_brem
    1614#
    1715/testem/phys/setCuts    1 mm
    … …  
    2624#
    2725/run/initialize
     26#
     27/run/setCut  0.5 mm
     28/run/setCutForRegion GasDetector 1.8 mm
    2829/run/particle/dumpCutValues
    2930#

  • trunk/examples/extended/electromagnetic/TestEm8/TestEm8.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#/tracking/verbose 2
    1115#
    12 # select EM PhysicsList
    13 #
    14 #/testem/phys/addPhysics emstandard
     16#  select EM PhysicsList
     17#
    1518/testem/phys/addPhysics pai
    16 PhysicsList::AddPhysicsList: <pai>
    17 PhysListEmModelPai is called
    18 #/testem/phys/addPhysics pai_photon
    19 #/testem/phys/addPhysics pai_brem
     19#/testem/phys/addPhysics  pai_photon
    2020#
    2121/testem/phys/setCuts 1 mm
    22 #/testem/stepMax 10 mm
    23 #
    24 # PLOT: energy deposit distribution in absorber
     22#/testem/stepMax         10 mm
     23#
     24#  PLOT: energy deposit distribution in absorber
    2525#
    2626/plots/setnbinEn 20
    … …  
    4343physicsList->Construct() start.
    4444physicsList->Construct() start.
     45physicsList->CheckParticleList() start.
    4546physicsList->setCut() start.
    4647PhysicsList::SetCuts:CutLength : 1 mm
     48#
     49/run/setCut 0.5 mm
     50/run/setCutForRegion GasDetector 1.8 mm
    4751/run/particle/dumpCutValues
    4852#
    … …  
    6165/event/printModulo 100
    6266/run/beamOn 1000
    63 
    64 phot:  Total cross sections from Sandia parametrisation.
    65       Sampling according PhotoElectric model
    66 
    67 compt:  Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV
    68       Sampling according Klein-Nishina model
    69       tables are built for  gamma
    70       Lambda tables from 100 eV  to 100 GeV in 90 bins.
    71 
    72 conv:  Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z;
    73       sampling secondary e+e- according Bethe-Heitler model
    74       tables are built for  gamma
    75       Lambda tables from 1.022 MeV to 100 GeV in 100 bins.
    76 
    77 msc:  Model variant of multiple scattering for e-
    78       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    79       LateralDisplacementFlag=  1   Skin= 0
    80       Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
    81 
    82 eIoni:   tables are built for  e-
    83       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    84       Lambda tables from threshold to 100 TeV in 120 bins.
    85       Delta cross sections and sampling from MollerBhabha model
    86       Good description from 1 KeV to 100 GeV.
    87       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    88 
    89 eBrem:   tables are built for  e-
    90       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    91       Lambda tables from threshold to 100 TeV in 120 bins.
    92       Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    93       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
    94 
    95 eIoni:   tables are built for  e+
    96       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    97       Lambda tables from threshold to 100 TeV in 120 bins.
    98       Delta cross sections and sampling from MollerBhabha model
    99       Good description from 1 KeV to 100 GeV.
    100       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    101 
    102 eBrem:   tables are built for  e+
    103       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    104       Lambda tables from threshold to 100 TeV in 120 bins.
    105       Total cross sections and sampling from StandBrem model (based on the EEDL data library)
    106       Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. LPM flag 1
    107 
    108 annihil:       Sampling according eplus2gg model
    109       tables are built for  e+
    110       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    111 
    112 msc:  Model variant of multiple scattering for proton
    113       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    114       LateralDisplacementFlag=  1   Skin= 0
    115       Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
    116 
    117 hIoni:   tables are built for  proton
    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       Scaling relation is used from proton dE/dx and range.
    121       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    122       Parametrisation from Bragg for protons below. NuclearStopping= 1
    123       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    124 
    125 msc:  Model variant of multiple scattering for GenericIon
    126       LateralDisplacementFlag=  0   Skin= 0
    127       Boundary/stepping algorithm is active with RangeFactor= 0.2  Step limit type 1
    128 
    129 ionIoni:   tables are built for  GenericIon
    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       Scaling relation is used from proton dE/dx and range.
    133       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    134       Parametrisation from BraggIon for protons below. NuclearStopping= 1
    135 
    136       Stopping Power data for 8 ion/material pairs are used.
    137       Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1, fluct: 1
    138 
    139 hIoni:   tables are built for  anti_proton
    140       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    141       Lambda tables from threshold to 100 TeV in 120 bins.
    142       Scaling relation is used from proton dE/dx and range.
    143       Delta cross sections and sampling from BetheBloch model for scaled energy > 2 MeV
    144       Parametrisation from Bragg for protons below. NuclearStopping= 1
    145       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    146 
    147 msc:  Model variant of multiple scattering for mu+
    148       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    149       LateralDisplacementFlag=  1   Skin= 0
    150       Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
    151 
    152 muIoni:   tables are built for  mu+
    153       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    154       Lambda tables from threshold to 100 TeV in 120 bins.
    155       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    156       radiative corrections for E > 1 GeV
    157       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    158 
    159 muBrems:   tables are built for  mu+
    160       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    161       Lambda tables from threshold to 100 TeV in 120 bins.
    162       Parametrised model
    163 
    164 muPairProd:   tables are built for  mu+
    165       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    166       Lambda tables from threshold to 100 TeV in 120 bins.
    167       Parametrised model
    168 
    169 muIoni:   tables are built for  mu-
    170       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    171       Lambda tables from threshold to 100 TeV in 120 bins.
    172       Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below,
    173       radiative corrections for E > 1 GeV
    174       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    175 
    176 muBrems:   tables are built for  mu-
    177       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    178       Lambda tables from threshold to 100 TeV in 120 bins.
    179       Parametrised model
    180 
    181 muPairProd:   tables are built for  mu-
    182       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    183       Lambda tables from threshold to 100 TeV in 120 bins.
    184       Parametrised model
    185 
    186 hIoni:   tables are built for  pi+
    187       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    188       Lambda tables from threshold to 100 TeV in 120 bins.
    189       Scaling relation is used from proton dE/dx and range.
    190       Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
    191       Parametrisation from Bragg for protons below. NuclearStopping= 1
    192       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
    193 
    194 msc:  Model variant of multiple scattering for pi-
    195       Lambda tables from 100 eV  to 100 TeV in 120 bins.
    196       LateralDisplacementFlag=  1   Skin= 0
    197       Boundary/stepping algorithm is active with RangeFactor= 0.02  Step limit type 1
    198 
    199 hIoni:   tables are built for  pi-
    200       dE/dx and range tables from 100 eV  to 100 TeV in 120 bins.
    201       Lambda tables from threshold to 100 TeV in 120 bins.
    202       Scaling relation is used from proton dE/dx and range.
    203       Delta cross sections and sampling from BetheBloch model for scaled energy > 0.297504 MeV
    204       Parametrisation from Bragg for protons below. NuclearStopping= 1
    205       Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1
     67G4PAIModel::Initialise for e+
     68G4PAIModel::Initialise for e-
     69G4PAIModel::Initialise for mu+
     70G4PAIModel::Initialise for mu-
     71G4PAIModel::Initialise for pi+
     72G4PAIModel::Initialise for pi-
     73G4PAIModel::Initialise for proton
     74
     75phot:   for  gamma    SubType= 12
     76      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     77       PhotoElectric :     Emin=          0 eV         Emax=   10 TeV
     78
     79compt:   for  gamma    SubType= 13
     80      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     81      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     82       Klein-Nishina :     Emin=          0 eV         Emax=   10 TeV
     83
     84conv:   for  gamma    SubType= 14
     85      Lambda tables from 1.022 MeV to 10 TeV in 77 bins, spline: 1
     86      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     87       Bethe-Heitler :     Emin=          0 eV         Emax=   10 TeV
     88
     89msc:   for e-    SubType= 10
     90      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     91      RangeFactor= 0.04, stepLimitType: 1, latDisplacement: 1
     92      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     93          UrbanMsc93 :     Emin=          0 eV         Emax=   10 TeV
     94
     95eIoni:   for  e-    SubType= 2
     96      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     97      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     98      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     99      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     100        MollerBhabha :     Emin=          0 eV         Emax=   10 TeV
     101      ===== EM models for the G4Region  GasDetector ======
     102            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     103
     104eBrem:   for  e-    SubType= 3
     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      LPM flag: 1 for E > 1 GeV
     108      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     109               eBrem :     Emin=          0 eV         Emax=   1 GeV
     110            eBremRel :     Emin=          1 GeV        Emax=   10 TeV
     111
     112eIoni:   for  e+    SubType= 2
     113      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     114      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     115      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     116      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     117        MollerBhabha :     Emin=          0 eV         Emax=   10 TeV
     118      ===== EM models for the G4Region  GasDetector ======
     119            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     120
     121eBrem:   for  e+    SubType= 3
     122      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     123      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     124      LPM flag: 1 for E > 1 GeV
     125      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     126               eBrem :     Emin=          0 eV         Emax=   1 GeV
     127            eBremRel :     Emin=          1 GeV        Emax=   10 TeV
     128
     129annihil:   for  e+    SubType= 5
     130      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     131      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     132            eplus2gg :     Emin=          0 eV         Emax=   10 TeV
     133
     134msc:   for proton    SubType= 10
     135      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     136      RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 1
     137      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     138          UrbanMsc90 :     Emin=          0 eV         Emax=   10 TeV
     139
     140hIoni:   for  proton    SubType= 2
     141      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     142      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     143      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     144      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     145               Bragg :     Emin=          0 eV         Emax=   2 MeV
     146          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     147      ===== EM models for the G4Region  GasDetector ======
     148            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     149
     150hBrems:   for  proton    SubType= 3
     151      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     152      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     153      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     154               hBrem :     Emin=          0 eV         Emax=   10 TeV
     155
     156hPairProd:   for  proton    SubType= 4
     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      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     160           hPairProd :     Emin=          0 eV         Emax=   10 TeV
     161
     162msc:   for GenericIon    SubType= 10
     163      RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 0
     164      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     165          UrbanMsc90 :     Emin=          0 eV         Emax=   10 TeV
     166
     167ionIoni:   for  GenericIon    SubType= 2
     168      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     169      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     170      finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1, fluct: 1, linLossLimit= 0.02
     171      Stopping Power data for 17 ion/material pairs, nuclearStopping: 1
     172      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     173            BraggIon :     Emin=          0 eV         Emax=   2 MeV
     174          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     175
     176hIoni:   for  anti_proton    SubType= 2
     177      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     178      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     179      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     180      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     181            ICRU73QO :     Emin=          0 eV         Emax=   2 MeV
     182          BetheBloch :     Emin=          2 MeV        Emax=   10 TeV
     183
     184hIoni:   for  kaon+    SubType= 2
     185      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     186      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     187      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     188      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     189               Bragg :     Emin=          0 eV         Emax=   1.05231 MeV
     190          BetheBloch :     Emin=    1.05231 MeV        Emax=   10 TeV
     191
     192hBrems:   for  kaon+    SubType= 3
     193      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     194      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     195      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     196               hBrem :     Emin=          0 eV         Emax=   10 TeV
     197
     198hPairProd:   for  kaon+    SubType= 4
     199      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     200      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     201      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     202           hPairProd :     Emin=          0 eV         Emax=   10 TeV
     203
     204hIoni:   for  kaon-    SubType= 2
     205      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     206      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     207      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     208      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     209            ICRU73QO :     Emin=          0 eV         Emax=   1.05231 MeV
     210          BetheBloch :     Emin=    1.05231 MeV        Emax=   10 TeV
     211
     212hBrems:   for  kaon-    SubType= 3
     213      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     214      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     215      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     216               hBrem :     Emin=          0 eV         Emax=   10 TeV
     217
     218hPairProd:   for  kaon-    SubType= 4
     219      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     220      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     221      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     222           hPairProd :     Emin=          0 eV         Emax=   10 TeV
     223
     224muMsc:   for mu+    SubType= 10
     225      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     226      RangeFactor= 0.2, step limit type: 0, lateralDisplacement: 1, polarAngleLimit(deg)= 0
     227      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     228          UrbanMsc90 :     Emin=          0 eV         Emax=   10 TeV
     229
     230muIoni:   for  mu+    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: 1, fluct: 1, linLossLimit= 0.01
     234      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     235               Bragg :     Emin=          0 eV         Emax=   200 keV
     236          BetheBloch :     Emin=        200 keV        Emax=   1 GeV
     237        MuBetheBloch :     Emin=          1 GeV        Emax=   10 TeV
     238      ===== EM models for the G4Region  GasDetector ======
     239            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     240
     241muBrems:   for  mu+    SubType= 3
     242      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     243      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     244      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     245              MuBrem :     Emin=          0 eV         Emax=   10 TeV
     246
     247muPairProd:   for  mu+    SubType= 4
     248      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     249      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     250      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     251          muPairProd :     Emin=          0 eV         Emax=   10 TeV
     252
     253muIoni:   for  mu-    SubType= 2
     254      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     255      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     256      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     257      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     258            ICRU73QO :     Emin=          0 eV         Emax=   200 keV
     259          BetheBloch :     Emin=        200 keV        Emax=   1 GeV
     260        MuBetheBloch :     Emin=          1 GeV        Emax=   10 TeV
     261      ===== EM models for the G4Region  GasDetector ======
     262            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     263
     264muBrems:   for  mu-    SubType= 3
     265      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     266      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     267      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     268              MuBrem :     Emin=          0 eV         Emax=   10 TeV
     269
     270muPairProd:   for  mu-    SubType= 4
     271      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     272      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     273      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     274          muPairProd :     Emin=          0 eV         Emax=   10 TeV
     275
     276hIoni:   for  pi+    SubType= 2
     277      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     278      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     279      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     280      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     281               Bragg :     Emin=          0 eV         Emax=   297.504 keV
     282          BetheBloch :     Emin=    297.504 keV        Emax=   10 TeV
     283      ===== EM models for the G4Region  GasDetector ======
     284            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     285
     286hBrems:   for  pi+    SubType= 3
     287      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     288      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     289      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     290               hBrem :     Emin=          0 eV         Emax=   10 TeV
     291
     292hPairProd:   for  pi+    SubType= 4
     293      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     294      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     295      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     296           hPairProd :     Emin=          0 eV         Emax=   10 TeV
     297
     298msc:   for pi-    SubType= 10
     299      Lambda tables from 100 eV  to 10 TeV in 77 bins, spline: 1
     300      RangeFactor= 0.2, stepLimitType: 0, latDisplacement: 1
     301      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     302          UrbanMsc90 :     Emin=          0 eV         Emax=   10 TeV
     303
     304hIoni:   for  pi-    SubType= 2
     305      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     306      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     307      finalRange(mm)= 1, dRoverRange= 0.2, integral: 1, fluct: 1, linLossLimit= 0.01
     308      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     309            ICRU73QO :     Emin=          0 eV         Emax=   297.504 keV
     310          BetheBloch :     Emin=    297.504 keV        Emax=   10 TeV
     311      ===== EM models for the G4Region  GasDetector ======
     312            PAIModel :     Emin=          0 eV         Emax=   10 TeV
     313
     314hBrems:   for  pi-    SubType= 3
     315      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     316      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     317      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     318               hBrem :     Emin=          0 eV         Emax=   10 TeV
     319
     320hPairProd:   for  pi-    SubType= 4
     321      dE/dx and range tables from 100 eV  to 10 TeV in 77 bins
     322      Lambda tables from threshold to 10 TeV in 77 bins, spline: 1
     323      ===== EM models for the G4Region  DefaultRegionForTheWorld ======
     324           hPairProd :     Emin=          0 eV         Emax=   10 TeV
    206325
    207326Region <DefaultRegionForTheWorld> -- appears in <World> world volume
    … …  
    209328 Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
    210329 Materials : Mylar
    211  Production cuts :  gamma 1 mm     e- 1 mm     e+ 1 mm
    212 
    213 Region <VertexDetector> -- appears in <World> world volume
     330 Production cuts :   gamma 500 um      e- 500 um      e+ 500 um  proton 500 um
     331
     332Region <GasDetector> -- appears in <World> world volume
    214333 Root logical volume(s) : Absorber
    215334 Pointers : G4VUserRegionInformation[0], G4UserLimits[0], G4FastSimulationManager[0], G4UserSteppingAction[0]
    216335 Materials : XeCH4C3H8
    217  Production cuts :  gamma 2.3 cm     e- 2.3 cm     e+ 2.3 cm
     336 Production cuts :   gamma 1.8 mm      e- 1.8 mm      e+ 1.8 mm  proton 1.8 mm
    218337
    219338========= Table of registered couples ==============================
    … …  
    221340Index : 0     used in the geometry : Yes     recalculation needed : No
    222341 Material : Mylar
    223  Range cuts        :  gamma 1 mm     e- 1 mm     e+ 1 mm
    224  Energy thresholds :  gamma 2.97898 keV    e- 417.539 keV    e+ 402.4 keV
     342 Range cuts        :  gamma  500 um     e-  500 um     e+  500 um  proton 500 um
     343 Energy thresholds :  gamma  2.27786 keV    e-  261.805 keV    e+  258.31 keV proton 50 keV
    225344 Region(s) which use this couple :
    226345    DefaultRegionForTheWorld
    … …  
    228347Index : 1     used in the geometry : Yes     recalculation needed : No
    229348 Material : XeCH4C3H8
    230  Range cuts        :  gamma 2.3 cm     e- 2.3 cm     e+ 2.3 cm
    231  Energy thresholds :  gamma 3.83995 keV    e- 63.4899 keV    e+ 61.9458 keV
     349 Range cuts        :  gamma  1.8 mm     e-  1.8 mm     e+  1.8 mm  proton 1.8 mm
     350 Energy thresholds :  gamma  990 eV     e-  5.57533 keV    e+  5.40743 keV proton 180 keV
    232351 Region(s) which use this couple :
    233     VertexDetector
     352    GasDetector
    234353
    235354====================================================================
    … …  
    270389Run Summary
    271390  Number of events processed : 1000
    272   User=0.15s Real=0.15s Sys=0s
     391  User=0.11s Real=0.1s Sys=0s
    273392 ================== run summary =====================
    274393 end of Run TotNbofEvents = 1000
    275     mean charged track length   in absorber=23.3231 +- 0.118697  mm 
    276 
    277             mean energy deposit in absorber=0.0158995 +- 0.000304796  MeV
    278 
    279  mean number of steps in absorber (charged) =0.092 +- 0.043215     
    280  mean number of steps in absorber (neutral) =0 +- 0     
    281 
    282    mean number of charged secondaries = 0.01 +- 0.00314643
    283 
    284    mean number of neutral secondaries = 0 +- 0
    285 
    286    mean number of e-s =0.01  and e+s =0
     394    mean charged track length   in absorber=24.2704 +- 0.310817  mm 
     395
     396            mean energy deposit in absorber=0.0160189 +- 0.000378691  MeV
     397
     398 mean number of steps in absorber (charged) =0.898 +- 0.0848269     
     399 mean number of steps in absorber (neutral) =0.002 +- 0.0014128     
     400
     401   mean number of charged secondaries = 0.257 +- 0.0163997
     402
     403   mean number of neutral secondaries = 0.002 +- 0.0014128
     404
     405   mean number of e-s =0.257  and e+s =0
    287406
    288407(number) transmission coeff=1  reflection coeff=0
    289408
    290409 energy deposit distribution
    291 #entries=1000    #underflows=0    #overflows=7
     410#entries=1000    #underflows=0    #overflows=12
    292411 bin nb      Elow      entries     normalized
    293412    0         0           0           0
    294     1         3           8       0.008
    295     2         6         102       0.102
    296     3         9         261       0.261
    297     4        12         240        0.24
    298     5        15         158       0.158
    299     6        18          77       0.077
    300     7        21          45       0.045
     413    1         3           4       0.004
     414    2         6          95       0.095
     415    3         9         270        0.27
     416    4        12         251       0.251
     417    5        15         146       0.146
     418    6        18          90        0.09
     419    7        21          49       0.049
    301420    8        24          30        0.03
    302     9        27          17       0.017
    303    10        30          14       0.014
    304    11        33          10        0.01
    305    12        36           8       0.008
    306    13        39           6       0.006
    307    14        42           5       0.005
    308    15        45           1       0.001
     421    9        27          16       0.016
     422   10        30          13       0.013
     423   11        33           5       0.005
     424   12        36           5       0.005
     425   13        39           9       0.009
     426   14        42           1       0.001
     427   15        45           2       0.002
    309428   16        48           1       0.001
    310    17        51           1       0.001
    311    18        54           5       0.005
    312    19        57           4       0.004
     429   17        51           0           0
     430   18        54           0           0
     431   19        57           1       0.001
    313432
    314433 Emp =           0.009   width=          0.006  MeV
    … …  
    317436--------- Ranecu engine status ---------
    318437 Initial seed (index) = 0
    319  Current couple of seeds = 1062535304, 247495324
     438 Current couple of seeds = 1481926969, 852281434
    320439----------------------------------------
    321440#
    … …  
    327446G4SDManager deleted.
    328447EventManager deleted.
    329 Default detector region deleted.
    330448UImanager deleted.
    331449Units table cleared.
    … …  
    333451RunManagerKernel is deleted.
    334452RunManager is deleting.
     453

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh

    r1230 r1337  
    2626//
    2727// $Id: Em8DetectorConstruction.hh,v 1.9 2007/10/02 10:12:47 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh

    r1230 r1337  
    2626//
    2727// $Id: Em8DetectorMessenger.hh,v 1.6 2007/10/02 10:12:47 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh

    r1230 r1337  
    2727//
    2828// $Id: Em8RunMessenger.hh,v 1.4 2006/06/29 16:59:18 gunter Exp $
    29 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     29// GEANT4 tag $Name: geant4-09-04-beta-01 $
    3030//
    3131//

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh

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

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

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysicsList.hh,v 1.3 2008/11/21 12:39:24 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysicsList.hh,v 1.4 2010/04/13 08:12:23 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    7373                    const G4String& procname);
    7474
    75   G4EmConfigurator em_config;
     75  G4EmConfigurator* em_config;
    7676
    7777  G4double cutForGamma;

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

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/StepMax.hh

    r1230 r1337  
    2525//
    2626// $Id: StepMax.hh,v 1.2 2006/06/29 16:59:52 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/TestEm8/include/StepMaxMessenger.hh

    r1230 r1337  
    2525//
    2626// $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:59: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/TestEm8/include/TRTDetectorConstruction.hh

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

  • trunk/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh

    r1230 r1337  
    2626//
    2727// $Id: TRTMaterials.hh,v 1.4 2006/06/29 17:00:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/run11.mac

    r807 r1337  
    1111#  select EM PhysicsList
    1212#
    13 /testem/phys/addPhysics  pai
     13#/testem/phys/addPhysics  pai
    1414#
    15 #/testem/phys/addPhysics  pai-photon
     15/testem/phys/addPhysics  pai_photon
    1616#
    1717#/testem/phys/addPhysics  standard
    … …  
    1919#/testem/phys/addPhysics model
    2020#
    21 /testem/phys/setCuts    1 mm
     21/testem/phys/setCuts    1.01 mm
    2222#/testem/phys/VertexCuts 0.1 mm
    2323#/testem/phys/MuonCuts  10.0 mm
    … …  
    3333#  PLOT: energy deposit distribution in absorber
    3434#
    35 /plots/setnbinEn 150
     35/plots/setnbinEn 50
    3636/plots/setEnlow 0.00 MeV
    37 /plots/setEnhigh 0.3  MeV 
     37/plots/setEnhigh 0.5  MeV 
    3838#
    3939#
    … …  
    8080#/tracking/verbose 1
    8181#
    82 /event/printModulo 1000
     82/event/printModulo 10000
    8383/run/beamOn 50000
    8484#

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8CalorHit.cc,v 1.5 2006/06/29 17:00:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8CalorimeterSD.cc,v 1.7 2006/06/29 17:00:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: Em8DetectorConstruction.cc,v 1.21 2007/10/02 10:12:47 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: Em8DetectorConstruction.cc,v 1.23 2010/06/04 17:08:15 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    149149  a = 26.98*g/mole;
    150150  density = 2.7*g/cm3;
    151   G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
    152   if(Al);
     151  new G4Material(name="Aluminium", z=13., a, density);
    153152
    154153  // Mylar
    … …  
    162161  density = 2.330*g/cm3;
    163162  a = 28.09*g/mole;
    164   G4Material* Si = new G4Material(name="Silicon", z=14., a, density);
    165   if(Si);
     163  new G4Material(name="Silicon", z=14., a, density);
    166164
    167165  // Krypton as detector gas, STP
    … …  
    367365  if( fRegGasDet == 0 ) // First time - instantiate a region and a cut objects
    368366  {   
    369     fRegGasDet = new G4Region("VertexDetector");
     367    fRegGasDet = new G4Region("GasDetector");
    370368    cuts = new G4ProductionCuts();
    371369    fRegGasDet->SetProductionCuts(cuts);

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8DetectorMessenger.cc,v 1.8 2007/10/02 10:12:47 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: Em8EventAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: Em8EventAction.cc,v 1.11 2010/06/06 04:31:28 perl Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    4545#include "G4SDManager.hh"
    4646#include "G4UImanager.hh"
    47 #include "G4TrajectoryContainer.hh"
    48 #include "G4Trajectory.hh"
    49 #include "G4VVisManager.hh"
    5047#include "G4ios.hh"
    5148#include "G4UnitsTable.hh"
    … …  
    142139    runaction->FillNbOfSteps(nstep);
    143140  }
    144  
    145   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
    146 
    147   if(pVVisManager)
    148   {
    149    G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    150    G4int n_trajectories = 0;
    151    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    152    for(G4int i=0; i<n_trajectories; i++)
    153       { G4Trajectory* trj = (G4Trajectory *)((*(evt->GetTrajectoryContainer()))[i]);
    154         if (drawFlag == "all") trj->DrawTrajectory(50);
    155         else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
    156                                trj->DrawTrajectory(50);
    157       }
    158   } 
    159141
    160142  if(verboselevel>0)

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8EventActionMessenger.cc,v 1.5 2006/06/29 17:00:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8PrimaryGeneratorAction.cc,v 1.7 2006/06/29 17:00:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:00:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8RunAction.cc,v 1.15 2007/11/12 10:54:49 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc

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

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8SteppingAction.cc,v 1.10 2007/11/12 10:54:49 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: Em8SteppingVerbose.cc,v 1.8 2006/06/29 17:00:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

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

    r1230 r1337  
    2525//
    2626//
    27 // $Id: PhysicsList.cc,v 1.16 2008/12/05 17:46:12 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: PhysicsList.cc,v 1.19 2010/06/04 17:08:15 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030
    … …  
    6161PhysicsList::PhysicsList() : G4VModularPhysicsList()
    6262{
    63   G4LossTableManager::Instance();
     63  em_config = G4LossTableManager::Instance()->EmConfigurator();
     64  G4LossTableManager::Instance()->SetVerbose(1);
    6465  defaultCutValue = 1.*mm;
    6566  cutForGamma     = defaultCutValue;
    … …  
    8889  delete generalPhysicsList;
    8990  delete emPhysicsList;
    90   for(size_t i=0; i<hadronPhys.size(); i++) delete hadronPhys[i];
     91  for(size_t i=0; i<hadronPhys.size(); ++i) { delete hadronPhys[i]; }
    9192  delete stepMaxProcess;
    9293}
    … …  
    105106  AddTransportation();
    106107  emPhysicsList->ConstructProcess();
    107   em_config.AddModels();
    108108  generalPhysicsList->ConstructProcess();
    109   for(size_t i=0; i<hadronPhys.size(); i++) hadronPhys[i]->ConstructProcess();
     109  for(size_t i=0; i<hadronPhys.size(); ++i) { hadronPhys[i]->ConstructProcess(); }
    110110  AddStepMax();
    111111}
    … …  
    196196  SetCutValue(cutForPositron, "e+");
    197197
    198   if ( verboseLevel > 0 ) DumpCutValuesTable();
     198  if ( verboseLevel > 0 ) { DumpCutValuesTable(); }
    199199}
    200200
    … …  
    256256  if(modname == "pai") {
    257257    G4PAIModel* pai = new G4PAIModel(part,"PAIModel");
    258     em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
     258    em_config->SetExtraEmModel(partname,procname,pai,"GasDetector",
    259259                              0.0,100.*TeV,pai);
    260260  } else if(modname == "pai_photon") {
    261261    G4PAIPhotonModel* pai = new G4PAIPhotonModel(part,"PAIPhotModel");
    262     em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
     262    em_config->SetExtraEmModel(partname,procname,pai,"GasDetector",
    263263                              0.0,100.*TeV,pai);
    264264  }

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

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

  • trunk/examples/extended/electromagnetic/TestEm8/src/StepMax.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMax.cc,v 1.3 2006/06/29 17:00:49 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/TestEm8/src/StepMaxMessenger.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:00:52 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......
Note: See TracChangeset for help on using the changeset viewer.