Ignore:
Timestamp:
Jan 8, 2010, 3:02:48 PM (16 years ago)
Author:
garnier
Message:

update to geant4.9.3

Location:
trunk/examples/advanced/brachytherapy
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/advanced/brachytherapy/Brachy.cc

    r807 r1230  
    2626//
    2727// $Id: Brachy.cc
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/examples/advanced/brachytherapy/GNUmakefile

    r807 r1230  
    11# --------------------------------------------------------------
    2 # $Id: GNUmakefile,v 1.12 2003/05/26 12:36:25 guatelli Exp $
     2# $Id: GNUmakefile,v 1.13 2008/06/15 18:05:59 cirrone Exp $
    33# --------------------------------------------------------------
    44# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1919include $(G4INSTALL)/config/binmake.gmk
    2020
    21 ifdef G4ANALYSIS_USE 
    22  CPPFLAGS += `aida-config --include`
    23  LDFLAGS  += `aida-config --lib`
    24  LOADLIBS += `aida-config --lib`
    25 endif
    2621
    2722

  • trunk/examples/advanced/brachytherapy/IridiumSourceMacro.mac

    r807 r1230  
    33/run/verbose 0
    44/event/verbose 0
    5 /run/beamOn  20000
     5/run/beamOn  10000
    66
    77

  • trunk/examples/advanced/brachytherapy/LeipzigSourceMacro.mac

    r807 r1230  
    33/event/verbose 0
    44/source/switch Leipzig
    5 /run/beamOn  20000
     5/run/beamOn  10000

  • trunk/examples/advanced/brachytherapy/include/BrachyAnalysisManager.hh

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: BrachyAnalysisManager.hh,v 1.13 2007/06/21 14:58:39 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: BrachyAnalysisManager.hh,v 1.14 2008/06/05 13:45:39 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929// Code review: MG Pia, 14/05/2207
    … …  
    6363
    6464  void book();
    65   void FillNtupleWithEnergy(G4double,G4double,G4double,G4float);
     65  void FillNtupleWithEnergy(G4double,G4double,G4double,G4double);
    6666  void FillHistogramWithEnergy(G4double,G4double,G4double);
    6767  void PrimaryParticleEnergySpectrum(G4double);

  • trunk/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyDetectorConstruction.hh,v 1.17 2006/06/29 15:47:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// 
    3030//    ****************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyDetectorConstructionI.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyDetectorConstructionI.hh,v 1.5 2006/06/29 15:47:13 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ****************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyDetectorConstructionIr.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyDetectorConstructionIr.hh,v 1.5 2006/06/29 15:47:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ****************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyDetectorConstructionLeipzig.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyDetectorConstructionLeipzig.hh,v 1.5 2006/06/29 15:47:19 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/brachytherapy/include/BrachyDetectorMessenger.hh

    r807 r1230  
    3232//
    3333// $Id: BrachyDetectorMessenger.hh,v 1.7 2006/06/29 15:47:22 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636//

  • trunk/examples/advanced/brachytherapy/include/BrachyEventAction.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyEventAction.hh,v 1.15 2006/06/29 15:47:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Code developed by:

  • trunk/examples/advanced/brachytherapy/include/BrachyFactory.hh

    r807 r1230  
    2727//
    2828// $Id: BrachyFactory.hh,v 1.6 2006/06/29 15:47:30 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3030//
    3131//    **********************************

  • trunk/examples/advanced/brachytherapy/include/BrachyFactoryI.hh

    r807 r1230  
    3636//
    3737// $Id: BrachyFactoryI.hh,v 1.7 2006/06/29 15:47:33 gunter Exp $
    38 // GEANT4 tag $Name: $
     38// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3939//
    4040//

  • trunk/examples/advanced/brachytherapy/include/BrachyFactoryIr.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyFactoryIr.hh,v 1.6 2006/06/29 15:47:36 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    **********************************

  • trunk/examples/advanced/brachytherapy/include/BrachyFactoryLeipzig.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyFactoryLeipzig.hh,v 1.6 2006/06/29 15:47:39 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    **********************************

  • trunk/examples/advanced/brachytherapy/include/BrachyMaterial.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyMaterial.hh,v 1.7 2006/06/29 15:47:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    **********************************

  • trunk/examples/advanced/brachytherapy/include/BrachyPhantomROGeometry.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPhantomROGeometry.hh,v 1.7 2006/06/29 15:47:45 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyPhantomSD.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPhantomSD.hh,v 1.10 2006/06/29 15:47:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ********************************

  • trunk/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPhysicsList.hh,v 1.9 2006/11/15 10:02:17 guatelli Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Code review: MGP, 5 November 2006 (still to be completed)

  • trunk/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPrimaryGeneratorAction.hh,v 1.12 2006/06/29 15:47:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ********************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionI.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPrimaryGeneratorActionI.hh,v 1.6 2006/06/29 15:47:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionIr.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyPrimaryGeneratorActionIr.hh,v 1.7 2006/06/29 15:47:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    *************************************************

  • trunk/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorMessenger.hh

    r807 r1230  
    3232//
    3333// $Id: BrachyPrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 15:48:02 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636//

  • trunk/examples/advanced/brachytherapy/include/BrachyRunAction.hh

    r807 r1230  
    2626//
    2727// $Id: BrachyRunAction.hh,v 1.11 2006/06/29 15:48:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/brachytherapy/src/BrachyAnalysisManager.cc

    r807 r1230  
    3333//    *******************************
    3434//
    35 // $Id: BrachyAnalysisManager.cc,v 1.19 2007/05/14 09:57:55 pia Exp $
    36 // GEANT4 tag $Name: $
     35// $Id: BrachyAnalysisManager.cc,v 1.22 2009/11/12 10:32:59 pandola Exp $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
     38#ifdef G4ANALYSIS_USE
     39
    3840#include <stdlib.h>
    3941#include <fstream>
    … …  
    4244#include "G4ios.hh"
    4345
    44 #ifdef G4ANALYSIS_USE
     46
    4547#include "AIDA/IHistogram1D.h"
    4648#include "AIDA/IHistogram2D.h"
    … …  
    5254#include "AIDA/ITree.h"
    5355#include "AIDA/ITuple.h"
    54 #endif
     56
    5557
    5658BrachyAnalysisManager* BrachyAnalysisManager::instance = 0;
    5759
    58 BrachyAnalysisManager::BrachyAnalysisManager()
     60BrachyAnalysisManager::BrachyAnalysisManager() :
     61aFact(0), theTree(0), histFact(0), tupFact(0), h1(0),
     62  h2(0), h3(0), ntuple(0)
     63
    5964{
    60 
    61 #ifdef G4ANALYSIS_USE
    62   aFact = 0;
    63   theTree(0);
    64   histFact = 0;
    65   tupFact = 0;
    66   h1 = 0;
    67   h2 = 0;
    68   ntuple = 0;
    69 
     65 
    7066  // Instantiate the factories
    7167  // The factories manage the analysis objects
    … …  
    7571 
    7672  // Definition of the output file
    77   G4String fileName = "brachytherapy.hbk";
    78   theTree = treeFact -> create(fileName,"hbook",false, true);
     73  G4String fileName = "brachytherapy.root";
     74  theTree = treeFact -> create(fileName,"ROOT",false, true);
    7975
    8076  delete treeFact;
    81 #endif
    8277}
    8378
    8479BrachyAnalysisManager::~BrachyAnalysisManager()
    8580{
    86 
    87 #ifdef G4ANALYSIS_USE
    8881  delete tupFact;
    8982  tupFact = 0;
    … …  
    9790  delete aFact;
    9891  aFact = 0;
    99 #endif
    10092}
    10193
    … …  
    108100void BrachyAnalysisManager::book()
    109101{
    110 #ifdef G4ANALYSIS_USE
    111102  // Instantiate the histogram and ntuple factories
    112103  histFact = aFact -> createHistogramFactory( *theTree );
    … …  
    129120
    130121  //defining the ntuple columns' name
    131   std::string columnNames = "float energy; float x; float y; float z";
     122  std::string columnNames = "double energy, x , y , z ";
    132123  std::string options = "";
    133124 
    … …  
    136127  // check for non-zero ...
    137128  if (ntuple) G4cout<<"The Ntuple is non-zero"<<G4endl;
    138 #endif
    139129}
    140130 
    … …  
    142132                                                 G4double yy,
    143133                                                 G4double zz,
    144                                                  G4float en)
     134                                                 G4double en)
    145135{
    146 #ifdef G4ANALYSIS_USE
    147136  if (ntuple == 0)
    148137   {
    … …  
    164153
    165154  ntuple->addRow();
    166 #endif
    167155}
    168156
    … …  
    171159                                                    G4double energyDeposit)
    172160{
    173 #ifdef G4ANALYSIS_USE
    174161  // 2DHistogram: energy deposit in a voxel which center is fixed in position (x,z) 
    175162  h1 -> fill(x,z,energyDeposit);
    176 #endif
    177163}
    178164
    179165void BrachyAnalysisManager::PrimaryParticleEnergySpectrum(G4double primaryParticleEnergy)
    180166{
    181 #ifdef G4ANALYSIS_USE
    182167 // 1DHistogram: energy spectrum of primary particles 
    183168  h2 -> fill(primaryParticleEnergy);
    184 #endif
    185169  return;
    186170}
    … …  
    188172void BrachyAnalysisManager::DoseDistribution(G4double x,G4double energy)
    189173{
    190 #ifdef G4ANALYSIS_USE
    191174  // 1DHistogram: energy spectrum of primary particles 
    192175  h3 -> fill(x, energy);
    193 #endif
    194176}
    195177
    196178void BrachyAnalysisManager::finish()
    197179{ 
    198 #ifdef G4ANALYSIS_USE
     180
    199181 // write all histograms to file ...
    200182  theTree -> commit();
    … …  
    202184  // close (will again commit) ...
    203185  theTree -> close();
     186}
    204187#endif
    205 }
    206188
    207189
    … …  
    215197
    216198
    217 

  • trunk/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc

    r807 r1230  
    3939//
    4040// $Id: BrachyDetectorConstruction.cc,v 1.29 2006/06/29 15:48:09 gunter Exp $
    41 // GEANT4 tag $Name: $
     41// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4242//
    4343#include "G4CSGSolid.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyDetectorConstructionI.cc

    r807 r1230  
    3838//
    3939// $Id: BrachyDetectorConstructionI.cc,v 1.9 2006/06/29 15:48:11 gunter Exp $
    40 // GEANT4 tag $Name: $
     40// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4141//
    4242#include "globals.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyDetectorConstructionIr.cc

    r807 r1230  
    3939//
    4040// $Id: BrachyDetectorConstructionIr.cc,v 1.10 2006/06/29 15:48:13 gunter Exp $
    41 // GEANT4 tag $Name: $
     41// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4242//
    4343#include "globals.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyDetectorConstructionLeipzig.cc

    r807 r1230  
    4040//
    4141// $Id: BrachyDetectorConstructionLeipzig.cc,v 1.10 2006/06/29 15:48:16 gunter Exp $
    42 // GEANT4 tag $Name: $
     42// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4343//
    4444

  • trunk/examples/advanced/brachytherapy/src/BrachyDetectorMessenger.cc

    r807 r1230  
    3636//
    3737// $Id: BrachyDetectorMessenger.cc,v 1.12 2006/06/29 15:48:18 gunter Exp $
    38 // GEANT4 tag $Name: $
     38// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3939//
    4040//

  • trunk/examples/advanced/brachytherapy/src/BrachyEventAction.cc

    r807 r1230  
    3434//
    3535// $Id: BrachyEventAction.cc,v 1.21 2006/06/29 15:48:21 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838#include "BrachyEventAction.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyFactory.cc

    r807 r1230  
    3636//
    3737// $Id: BrachyFactory.cc,v 1.7 2006/06/29 15:48:23 gunter Exp $
    38 // GEANT4 tag $Name: $
     38// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3939//
    4040// Factory of brachytherapic sources

  • trunk/examples/advanced/brachytherapy/src/BrachyFactoryI.cc

    r807 r1230  
    3434//
    3535// $Id: BrachyFactoryI.cc,v 1.6 2006/06/29 15:48:26 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838#include "BrachyFactoryI.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyFactoryIr.cc

    r807 r1230  
    3434//
    3535// $Id: BrachyFactoryIr.cc,v 1.6 2006/06/29 15:48:29 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838#include "globals.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyFactoryLeipzig.cc

    r807 r1230  
    3434//
    3535// $Id: BrachyFactoryLeipzig.cc,v 1.6 2006/06/29 15:48:31 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838

  • trunk/examples/advanced/brachytherapy/src/BrachyMaterial.cc

    r807 r1230  
    3434//
    3535// $Id: BrachyMaterial.cc,v 1.7 2006/06/29 15:48:33 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838

  • trunk/examples/advanced/brachytherapy/src/BrachyPhantomROGeometry.cc

    r807 r1230  
    3535//
    3636// $Id: BrachyPhantomROGeometry.cc,v 1.11 2006/06/29 15:48:36 gunter Exp $
    37 // GEANT4 tag $Name: $
     37// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3838//
    3939#include "BrachyPhantomROGeometry.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyPhantomSD.cc

    r807 r1230  
    3434//    ********************************
    3535//
    36 // $Id: BrachyPhantomSD.cc,v 1.13 2006/06/29 15:48:39 gunter Exp $
    37 // GEANT4 tag $Name: $
     36// $Id: BrachyPhantomSD.cc,v 1.14 2009/02/23 17:34:26 gunter Exp $
     37// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3838//
    3939#include "BrachyPhantomSD.hh"
     40#ifdef G4ANALYSIS_USE
    4041#include "BrachyAnalysisManager.hh"
     42#endif
    4143#include "BrachyDetectorConstruction.hh"
    4244#include "G4Track.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc

    r807 r1230  
    3636//    **********************************
    3737//
    38 // $Id: BrachyPhysicsList.cc,v 1.13 2006/11/15 10:02:17 guatelli Exp $
    39 // GEANT4 tag $Name: $
     38// $Id: BrachyPhysicsList.cc,v 1.14 2009/11/12 02:50:51 cirrone Exp $
     39// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4040//
    4141#include "BrachyPhysicsList.hh"
    … …  
    4747#include "G4UnitsTable.hh"
    4848#include "G4ios.hh"             
    49 
    5049#include "G4MultipleScattering.hh"
    5150// gamma
    52 #include "G4LowEnergyRayleigh.hh"
    53 #include "G4LowEnergyPhotoElectric.hh"
    54 #include "G4LowEnergyCompton.hh" 
    55 #include "G4LowEnergyGammaConversion.hh"
     51#include "G4PhotoElectricEffect.hh"
     52#include "G4LivermorePhotoElectricModel.hh"
     53
     54#include "G4ComptonScattering.hh"
     55#include "G4LivermoreComptonModel.hh"
     56
     57#include "G4GammaConversion.hh"
     58#include "G4LivermoreGammaConversionModel.hh"
     59
     60#include "G4RayleighScattering.hh"
     61#include "G4LivermoreRayleighModel.hh"
     62
    5663// e-
    57 #include "G4LowEnergyIonisation.hh"
    58 #include "G4LowEnergyBremsstrahlung.hh"
     64#include "G4eMultipleScattering.hh"
     65#include "G4eIonisation.hh"
     66#include "G4LivermoreIonisationModel.hh"
     67#include "G4eBremsstrahlung.hh"
     68#include "G4LivermoreBremsstrahlungModel.hh"
     69
    5970// e+
    6071#include "G4eIonisation.hh"
    … …  
    8091  ConstructBosons();
    8192  ConstructLeptons();
     93
    8294}
    8395
    … …  
    114126   
    115127    if (particleName == "gamma") {
     128     
    116129      // Photon     
    117       pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh);
    118       pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric);
    119       pmanager->AddDiscreteProcess(new G4LowEnergyCompton);
    120       pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion);
     130      G4RayleighScattering* theRayleigh = new G4RayleighScattering();
     131      theRayleigh->SetModel(new G4LivermoreRayleighModel());  //not strictly necessary
     132      pmanager->AddDiscreteProcess(theRayleigh);
     133
     134      G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
     135      thePhotoElectricEffect->SetModel(new G4LivermorePhotoElectricModel());
     136      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
     137       
     138      G4ComptonScattering* theComptonScattering = new G4ComptonScattering();
     139      theComptonScattering->SetModel(new G4LivermoreComptonModel());
     140      pmanager->AddDiscreteProcess(theComptonScattering);
     141       
     142      G4GammaConversion* theGammaConversion = new G4GammaConversion();
     143      theGammaConversion->SetModel(new G4LivermoreGammaConversionModel());
     144      pmanager->AddDiscreteProcess(theGammaConversion);
    121145     
    122146    } else if (particleName == "e-") {
    123147      // Electron
    124       G4LowEnergyIonisation*     loweIon  = new G4LowEnergyIonisation("LowEnergyIoni");
    125 
    126       G4LowEnergyBremsstrahlung* loweBrem = new G4LowEnergyBremsstrahlung("LowEnBrem");
    127       // Select the Bremsstrahlung angular distribution model (Tsai/2BN/2BS)
    128       loweBrem->SetAngularGenerator("tsai");
    129    
    130       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
    131       pmanager->AddProcess(loweIon,     -1, 2,2);
    132       pmanager->AddProcess(loweBrem,    -1,-1,3);     
     148     
     149      G4eMultipleScattering* msc = new G4eMultipleScattering();
     150      msc->SetStepLimitType(fUseDistanceToBoundary);
     151      pmanager->AddProcess(msc,-1, 1, 1);
     152
     153      // Ionisation
     154      G4eIonisation* eIonisation = new G4eIonisation();
     155      eIonisation->SetEmModel(new G4LivermoreIonisationModel());
     156      eIonisation->SetStepFunction(0.2, 100*um); //improved precision in tracking 
     157      pmanager->AddProcess(eIonisation,-1, 2, 2);
     158       
     159      // Bremsstrahlung
     160      G4eBremsstrahlung* eBremsstrahlung = new G4eBremsstrahlung();
     161      eBremsstrahlung->SetEmModel(new G4LivermoreBremsstrahlungModel());
     162      pmanager->AddProcess(eBremsstrahlung, -1,-3, 3);
    133163     
    134164    } else if (particleName == "e+") {
    135165      // Positron     
    136       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
    137       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
    138       pmanager->AddProcess(new G4eBremsstrahlung,    -1,-1,3);
    139       pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,4);     
     166      G4eMultipleScattering* msc = new G4eMultipleScattering();
     167      msc->SetStepLimitType(fUseDistanceToBoundary);
     168      pmanager->AddProcess(msc,-1, 1, 1);
     169       
     170      // Ionisation
     171      G4eIonisation* eIonisation = new G4eIonisation();
     172      eIonisation->SetStepFunction(0.2, 100*um); //     
     173      pmanager->AddProcess(eIonisation,                 -1, 2, 2);
     174
     175      //Bremsstrahlung (use default, no low-energy available)
     176      pmanager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3);
     177
     178      //Annihilation
     179      pmanager->AddProcess(new G4eplusAnnihilation(),0,-1, 4);     
    140180     
    141181    }

  • trunk/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc

    r807 r1230  
    3838//    ********************************************
    3939//
    40 // $Id: BrachyPrimaryGeneratorAction.cc,v 1.18 2006/06/29 15:48:45 gunter Exp $
    41 // GEANT4 tag $Name: $
     40// $Id: BrachyPrimaryGeneratorAction.cc,v 1.19 2009/02/23 17:34:26 gunter Exp $
     41// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4242//
    4343#include "globals.hh"
    4444#include "BrachyPrimaryGeneratorAction.hh"
     45#ifdef G4ANALYSIS_USE
    4546#include "BrachyAnalysisManager.hh"
     47#endif
    4648#include "G4ParticleTable.hh"
    4749#include "Randomize.hh" 

  • trunk/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionI.cc

    r807 r1230  
    3939//
    4040// $Id: BrachyPrimaryGeneratorActionI.cc,v 1.10 2006/06/29 15:48:48 gunter Exp $
    41 // GEANT4 tag $Name: $
     41// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4242//
    4343#include "BrachyPrimaryGeneratorActionI.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionIr.cc

    r807 r1230  
    3939//
    4040// $Id: BrachyPrimaryGeneratorActionIr.cc,v 1.11 2006/06/29 15:48:51 gunter Exp $
    41 // GEANT4 tag $Name: $
     41// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4242//
    4343#include "BrachyPrimaryGeneratorActionIr.hh"

  • trunk/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorMessenger.cc

    r807 r1230  
    3636//
    3737// $Id: BrachyPrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 15:48:54 gunter Exp $
    38 // GEANT4 tag $Name: $
     38// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3939//
    4040//

  • trunk/examples/advanced/brachytherapy/src/BrachyRunAction.cc

    r807 r1230  
    4040//
    4141// $Id: BrachyRunAction.cc,v 1.18 2006/06/29 15:48:57 gunter Exp $
    42 // GEANT4 tag $Name: $
     42// GEANT4 tag $Name: geant4-09-03-cand-01 $
    4343//
    4444
Note: See TracChangeset for help on using the changeset viewer.