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

update to geant4.9.3

Location:
trunk/examples/advanced/radioprotection
Files:
60 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/advanced/radioprotection/GNUmakefile

    r807 r1230  
    1 # $Id: GNUmakefile,v 1.5 2004/01/30 12:11:20 guatelli Exp $
     1# $Id: GNUmakefile,v 1.6 2009/03/06 09:38:55 gbarrand Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1616
    1717include $(G4INSTALL)/config/binmake.gmk
    18 ifdef G4ANALYSIS_USE 
    19  CPPFLAGS += `aida-config --include`
    20  LDFLAGS  += `aida-config --lib`
    21  LOADLIBS += `aida-config --lib`
    22 endif
    2318
    24 

  • trunk/examples/advanced/radioprotection/History

    r807 r1230  
    11-------------------------------------------------------------------
    2 $Id: History,v 1.20 2007/06/06 19:15:06 pia Exp $
     2$Id: History,v 1.24 2009/11/15 23:23:24 cirrone Exp $
    33-------------------------------------------------------------------
    44
    … …  
    1010                      ---------------------
    1111
     1216.11.2009 S. Guatelli, tag radioprotection-V09-02-04
     13           analysis output format is changed to xml     
     14
     1512.11.2009 S. Guatelli, tag radioprotection-V09-02-01
     16           Physics List updated
     17
     1808.04.2009 G.A.P.Cirrone, tag radioprotection-V09-02-00
     19           GNUmakefile updated
     20
     216 March 2009 Guy Barrand (in agreement with G.Cosmo)
     22- GNUmakefile : remove the G4ANALYSIS_USE logic found in this file
     23  since it is handled already in the config/analysis.gmk.
     24  This avoids a duplication in the compilation and link commands
     25  of the aida-config options.
     26
    122706.06.2007 MGP tag radioprotection-V08-03-00
    13                Minor documentation update
     28           Minor documentation update
    1429
    153015th November 2006 Susanna Guatelli (radioprotection-V08-01-00)

  • trunk/examples/advanced/radioprotection/include/RemSimAnalysisManager.hh

    r807 r1230  
    3030//    **********************************
    3131//
    32 // $Id: RemSimAnalysisManager.hh,v 1.11 2006/06/29 16:22:04 gunter Exp $
     32// $Id: RemSimAnalysisManager.hh,v 1.12 2009/04/08 13:25:37 cirrone Exp $
    3333//
    3434// Author: Susanna Guatelli (guatelli@ge.infn.it)
    … …  
    5353  class ITuple;
    5454  class ITreeFactory;
    55 };
     55}
    5656
    5757class RemSimAnalysisMessenger;

  • trunk/examples/advanced/radioprotection/include/RemSimDecay.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimDecay.hh,v 1.3 2006/06/29 16:22:08 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimDecorator.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimDecorator.hh,v 1.10 2006/06/29 16:22:10 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimDetectorConstruction.hh

    r807 r1230  
    3131//
    3232// $Id: RemSimDetectorConstruction.hh,v 1.13 2006/06/29 16:22:12 gunter Exp $
    33 // GEANT4 tag $Name: $
     33// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3434//
    3535// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimDetectorMessenger.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimDetectorMessenger.hh,v 1.9 2006/06/29 16:22:37 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636//

  • trunk/examples/advanced/radioprotection/include/RemSimElectronEEDL.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimElectronEEDL.hh,v 1.4 2006/06/29 16:22:41 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimEventAction.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimEventAction.hh,v 1.5 2006/06/29 16:22:43 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author : Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimHadronicBertini.hh

    r807 r1230  
    3131//
    3232// $Id: RemSimHadronicBertini.hh,v 1.5 2006/11/15 18:39:30 guatelli Exp $
    33 // GEANT4 tag $Name: $
     33// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3434//
    3535// Author : Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimHadronicBinary.hh

    r807 r1230  
    3131//
    3232// $Id: RemSimHadronicBinary.hh,v 1.5 2006/11/15 18:39:30 guatelli Exp $
    33 // GEANT4 tag $Name: $
     33// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3434//
    3535// Author : Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimIonICRU.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimIonICRU.hh,v 1.5 2006/06/29 16:22:49 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimMaterial.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimMaterial.hh,v 1.6 2006/06/29 16:22:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    **********************************

  • trunk/examples/advanced/radioprotection/include/RemSimMoonHabitat.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimMoonHabitat.hh,v 1.6 2006/06/29 16:22:53 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimMuonStandard.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimMuonStandard.hh,v 1.3 2006/06/29 16:22:55 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPhotonEPDL.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimPhotonEPDL.hh,v 1.4 2006/06/29 16:22:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPhysicsList.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimPhysicsList.hh,v 1.6 2006/06/29 16:23:01 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPhysicsListMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimPhysicsListMessenger.hh,v 1.4 2006/06/29 16:23:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPositronStandard.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimPositronStandard.hh,v 1.4 2006/06/29 16:23:05 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorAction.hh

    r807 r1230  
    2525//
    2626//
    27 // $Id: RemSimPrimaryGeneratorAction.hh,v 1.14 2006/06/29 16:23:07 gunter Exp $// GEANT4 tag $Name: $
     27// $Id: RemSimPrimaryGeneratorAction.hh,v 1.14 2006/06/29 16:23:07 gunter Exp $// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorMessenger.hh

    r807 r1230  
    3232//
    3333// $Id: RemSimPrimaryGeneratorMessenger.hh,v 1.10 2006/06/29 16:23:09 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636//Code developed by:  S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimROGeometry.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimROGeometry.hh,v 1.6 2006/06/29 16:23:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//    ************************************

  • trunk/examples/advanced/radioprotection/include/RemSimRoofDecorator.hh

    r807 r1230  
    3434//
    3535// $Id: RemSimRoofDecorator.hh,v 1.6 2006/06/29 16:23:13 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838

  • trunk/examples/advanced/radioprotection/include/RemSimRunAction.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimRunAction.hh,v 1.10 2006/06/29 16:23:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimSensitiveDetector.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimSensitiveDetector.hh,v 1.5 2006/06/29 16:23:17 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimShelterSPEDecorator.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimShelterSPEDecorator.hh,v 1.5 2006/06/29 16:23:19 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimShieldingDecorator.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimShieldingDecorator.hh,v 1.7 2006/06/29 16:23:21 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimSteppingAction.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimSteppingAction.hh,v 1.4 2006/06/29 16:23:23 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Author: Susanna Guatelli (guatelli@ge.infn.it)

  • trunk/examples/advanced/radioprotection/include/RemSimSteppingActionMessenger.hh

    r807 r1230  
    2626//
    2727// $Id: RemSimSteppingActionMessenger.hh,v 1.3 2006/06/29 16:23:25 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimVGeometryComponent.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimVGeometryComponent.hh,v 1.8 2006/06/29 16:23:27 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/include/RemSimVehicle1.hh

    r807 r1230  
    2525//
    2626// $Id: RemSimVehicle1.hh,v 1.8 2006/06/29 16:23:29 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/remsim.cc

    r807 r1230  
    2626//
    2727// $Id: remsim.cc,v 1.14 2006/07/24 09:53:27 guatelli Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929
    3030#include "G4RunManager.hh"

  • trunk/examples/advanced/radioprotection/src/RemSimAnalysisManager.cc

    r807 r1230  
    3030//    *******************************
    3131//
    32 // $Id: RemSimAnalysisManager.cc,v 1.12 2006/06/29 16:23:31 gunter Exp $
     32// $Id: RemSimAnalysisManager.cc,v 1.13 2009/11/15 23:23:24 cirrone Exp $
    3333//
    3434// Author:Susanna Guatelli, guatelli@ge.infn.it
    … …  
    6161{
    6262  aFact = AIDA_createAnalysisFactory();
    63   fileFormat = "hbook";
     63  fileFormat = "xml";
    6464}
    6565
    … …  
    125125   
    126126
    127   theTree = treeFact -> create("remsim.hbk", "hbook", false, true);
    128   G4cout << "The format of the output file is hbook" << G4endl;
     127  theTree = treeFact -> create("remsim.xml", "xml",false, true,"uncompressed");
     128
     129  G4cout << "The format of the output file is xml" << G4endl;
    129130
    130131  histogramFactory = aFact -> createHistogramFactory(*theTree);

  • trunk/examples/advanced/radioprotection/src/RemSimDecay.cc

    r807 r1230  
    3232//
    3333// $Id: RemSimDecay.cc,v 1.5 2006/06/29 16:23:35 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimDecorator.cc

    r807 r1230  
    3232//
    3333// $Id: RemSimDecorator.cc,v 1.6 2006/06/29 16:23:37 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimDetectorConstruction.cc

    r807 r1230  
    3232//
    3333// $Id: RemSimDetectorConstruction.cc,v 1.17 2006/06/29 16:23:39 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimDetectorMessenger.cc

    r807 r1230  
    3636//
    3737// $Id: RemSimDetectorMessenger.cc,v 1.13 2006/06/29 16:23:41 gunter Exp $
    38 // GEANT4 tag $Name: $
     38// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3939//
    4040//

  • trunk/examples/advanced/radioprotection/src/RemSimElectronEEDL.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RemSimElectronEEDL.cc,v 1.6 2006/06/29 16:23:43 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RemSimElectronEEDL.cc,v 1.7 2009/11/12 05:12:18 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelloi@ge.infn.it
    … …  
    3232#include "G4ProcessManager.hh"
    3333#include "G4ParticleDefinition.hh"
    34 #include "G4MultipleScattering.hh"
    35 #include "G4LowEnergyIonisation.hh"
    36 #include "G4LowEnergyBremsstrahlung.hh"
     34// e-
     35#include "G4eMultipleScattering.hh"
     36#include "G4eIonisation.hh"
     37#include "G4LivermoreIonisationModel.hh"
     38#include "G4eBremsstrahlung.hh"
     39#include "G4LivermoreBremsstrahlungModel.hh"
    3740#include "G4StepLimiter.hh"
    3841
    … …  
    5255    {
    5356      G4ParticleDefinition* particle = theParticleIterator -> value();
    54       G4ProcessManager* manager = particle -> GetProcessManager();
     57      G4ProcessManager* pmanager = particle -> GetProcessManager();
    5558      G4String particleName = particle -> GetParticleName();
    5659     
    5760      if (particleName == "e-")
    5861        {
    59           manager -> AddProcess(new G4MultipleScattering,     -1, 1,1);
    60           manager -> AddProcess(new G4LowEnergyIonisation,    -1, 2,2);
    61           manager -> AddProcess(new G4LowEnergyBremsstrahlung,-1,-1,3);
    62           manager -> AddProcess(new G4StepLimiter(),-1,-1,3);
     62          G4eMultipleScattering* msc = new G4eMultipleScattering();
     63          msc->SetStepLimitType(fUseDistanceToBoundary);
     64          pmanager->AddProcess(msc,-1, 1, 1);
     65
     66          // Ionisation
     67          G4eIonisation* eIonisation = new G4eIonisation();
     68          eIonisation->SetEmModel(new G4LivermoreIonisationModel());
     69          eIonisation->SetStepFunction(0.2, 100*um); //improved precision in tracking 
     70          pmanager->AddProcess(eIonisation,-1, 2, 2);
     71       
     72          // Bremsstrahlung
     73          G4eBremsstrahlung* eBremsstrahlung = new G4eBremsstrahlung();
     74          eBremsstrahlung->SetEmModel(new G4LivermoreBremsstrahlungModel());
     75          pmanager->AddProcess(eBremsstrahlung, -1,-3, 3);
     76
     77          // Step Limiter
     78          pmanager -> AddProcess(new G4StepLimiter(),  -1,-1,3);
    6379        }   
    6480    }

  • trunk/examples/advanced/radioprotection/src/RemSimEventAction.cc

    r807 r1230  
    3232//
    3333// $Id: RemSimEventAction.cc,v 1.9 2006/06/29 16:23:45 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author : Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimHadronicBertini.cc

    r807 r1230  
    3030//    **************************************
    3131//
    32 // $Id: RemSimHadronicBertini.cc,v 1.5 2006/11/15 18:39:30 guatelli Exp $
    33 // GEANT4 tag $Name: $
     32// $Id: RemSimHadronicBertini.cc,v 1.6 2009/11/12 05:12:18 cirrone Exp $
     33// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3434//
    3535// Author : Susanna Guatelli, guatelli@ge.infn.it
    … …  
    261261  // Energy limit of the binary ion model
    262262  G4double binaryIonLowLimit = 80. * MeV;
    263   G4double binaryIonHighLimit = 40. * GeV;
     263  G4double binaryIonHighLimit = 400. * GeV;
    264264  binaryIonModel->SetMinEnergy(binaryIonLowLimit);
    265265  binaryIonModel->SetMaxEnergy(binaryIonHighLimit);

  • trunk/examples/advanced/radioprotection/src/RemSimHadronicBinary.cc

    r807 r1230  
    3030//    **************************************
    3131//
    32 // $Id: RemSimHadronicBinary.cc,v 1.7 2006/11/15 18:39:30 guatelli Exp $
    33 // GEANT4 tag $Name: $
     32// $Id: RemSimHadronicBinary.cc,v 1.8 2009/11/12 05:12:18 cirrone Exp $
     33// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3434//
    3535// Author : Susanna Guatelli, guatelli@ge.infn.it
    … …  
    257257  // Energy limit of the binary ion model
    258258  G4double binaryIonLowLimit = 80. * MeV;
    259   G4double binaryIonHighLimit = 40. * GeV;
     259  G4double binaryIonHighLimit = 400. * GeV;
    260260  binaryIonModel->SetMinEnergy(binaryIonLowLimit);
    261261  binaryIonModel->SetMaxEnergy(binaryIonHighLimit);

  • trunk/examples/advanced/radioprotection/src/RemSimIonICRU.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RemSimIonICRU.cc,v 1.10 2006/06/29 16:23:51 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RemSimIonICRU.cc,v 1.11 2009/11/12 05:12:18 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it
    … …  
    3232#include "G4ProcessManager.hh"
    3333#include "G4ParticleDefinition.hh"
    34 #include "G4MultipleScattering.hh"
    35 #include "G4hLowEnergyIonisation.hh"
     34#include "G4hMultipleScattering.hh"
    3635#include "G4hIonisation.hh"
    37 #include "G4hLowEnergyLoss.hh"
     36#include "G4ionIonisation.hh"
    3837#include "G4StepLimiter.hh"
     38#include "G4IonParametrisedLossModel.hh"
    3939
    4040RemSimIonICRU::RemSimIonICRU(const G4String& name): G4VPhysicsConstructor(name)
    … …  
    5555      G4double charge = particle -> GetPDGCharge();
    5656
    57       if (particleName  == "proton" || particleName == "GenericIon"
    58           || particleName == "alpha" )
     57      if (particleName  == "proton"
     58          || particleName == "pi+"
     59          || particleName == "pi-")
    5960        {
    60           G4hLowEnergyIonisation* ionisation = new G4hLowEnergyIonisation();
    61           G4VProcess*  multipleScattering = new G4MultipleScattering();
    62           manager -> AddProcess(multipleScattering, -1,1,1);   
    63           manager -> AddProcess(ionisation, -1,2,2);
     61          manager -> AddProcess(new G4hMultipleScattering, -1,1,1);   
     62
     63          G4hIonisation* ionisation = new G4hIonisation();
     64          ionisation -> SetStepFunction(0.2, 50*um);
     65          manager -> AddProcess(ionisation, -1,2,2);
     66          manager -> AddProcess(new G4StepLimiter(),-1,-1,3);
     67        }
     68
     69      else if(particleName == "alpha"      ||
     70              particleName == "deuteron"   ||
     71              particleName == "triton"     ||
     72              particleName == "He3")
     73        {
     74          //multiple scattering
     75          manager->AddProcess(new G4hMultipleScattering,-1,1,1);
     76       
     77          //ionisation
     78          G4ionIonisation* ionIoni = new G4ionIonisation();
     79          ionIoni->SetStepFunction(0.1, 20*um);
     80          manager->AddProcess(ionIoni,-1, 2, 2);
     81          manager -> AddProcess(new G4StepLimiter(),-1,-1,3);
     82        }
     83
     84      else if (particleName == "GenericIon")
     85        {
     86          // OBJECT may be dynamically created as either a GenericIon or nucleus
     87          // G4Nucleus exists and therefore has particle type nucleus
     88          // genericIon:
     89       
     90          //multiple scattering
     91          manager->AddProcess(new G4hMultipleScattering,-1,1,1);
     92
     93          //ionisation
     94          G4ionIonisation* ionIoni = new G4ionIonisation();
     95          ionIoni->SetEmModel(new G4IonParametrisedLossModel());
     96          ionIoni->SetStepFunction(0.1, 20*um);
     97          manager->AddProcess(ionIoni,-1, 2, 2);
    6498          manager -> AddProcess(new G4StepLimiter(),-1,-1,3);
    6599        }
    66100      else{     
    67101        if (( charge != 0. ) && particleName != "e+" && particleName != "mu+" &&
    68             particleName != "e-" && particleName != "mu-") 
     102            particleName != "e-" && particleName != "mu-")
    69103          {
    70104            if((!particle -> IsShortLived()) &&
    71105               (particle -> GetParticleName() != "chargedgeantino"))
    72106              {
    73                 G4hLowEnergyIonisation* ionisation = new G4hLowEnergyIonisation();
    74                 G4VProcess*  multipleScattering = new G4MultipleScattering();
     107                G4hIonisation* ionisation = new G4hIonisation();
     108                G4VProcess*  multipleScattering = new G4hMultipleScattering();
    75109                manager -> AddProcess(multipleScattering, -1,1,1);   
    76110                manager -> AddProcess(ionisation, -1,2,2);
    … …  
    78112              }
    79113          }
    80       }}
     114      }
     115    }
    81116}
    82117

  • trunk/examples/advanced/radioprotection/src/RemSimMaterial.cc

    r807 r1230  
    3434//
    3535// $Id: RemSimMaterial.cc,v 1.7 2006/06/29 16:23:53 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838

  • trunk/examples/advanced/radioprotection/src/RemSimMoonHabitat.cc

    r807 r1230  
    3232//
    3333// $Id: RemSimMoonHabitat.cc,v 1.7 2006/06/29 16:23:55 gunter Exp $
    34 // GEANT4 tag $Name: $
     34// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3535//
    3636// Author:Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimMuonStandard.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RemSimMuonStandard.cc,v 1.6 2006/06/29 16:23:57 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RemSimMuonStandard.cc,v 1.7 2009/11/12 05:12:18 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author:Susanna Guatelli, guatelli@ge.infn.it
    … …  
    3434//muon:
    3535#include "G4hIonisation.hh"
    36 #include "G4MultipleScattering.hh"
     36#include "G4MuMultipleScattering.hh"
    3737#include "G4MuIonisation.hh"
    3838#include "G4MuBremsstrahlung.hh"
    … …  
    6161      if(( particleName == "mu+")|| (particleName == "mu-" ))
    6262        {//muon
    63           G4VProcess* aMultipleScattering = new G4MultipleScattering();
     63          G4VProcess* aMultipleScattering = new G4MuMultipleScattering();
    6464          G4VProcess* aBremsstrahlung     = new G4MuBremsstrahlung();
    6565          G4VProcess* aPairProduction     = new G4MuPairProduction();

  • trunk/examples/advanced/radioprotection/src/RemSimPhotonEPDL.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RemSimPhotonEPDL.cc,v 1.7 2006/06/29 16:24:01 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RemSimPhotonEPDL.cc,v 1.8 2009/11/12 05:12:18 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author:Susanna Guatelli, guatelli@ge.infn.it
    … …  
    3434#include "G4Gamma.hh"
    3535#include "G4ParticleDefinition.hh"
    36 #include "G4LowEnergyCompton.hh"
    37 #include "G4LowEnergyGammaConversion.hh"
    38 #include "G4LowEnergyPhotoElectric.hh"
    39 #include "G4LowEnergyRayleigh.hh"
     36
     37#include "G4PhotoElectricEffect.hh"
     38#include "G4LivermorePhotoElectricModel.hh"
     39
     40#include "G4ComptonScattering.hh"
     41#include "G4LivermoreComptonModel.hh"
     42
     43#include "G4GammaConversion.hh"
     44#include "G4LivermoreGammaConversionModel.hh"
     45
     46#include "G4RayleighScattering.hh"
     47#include "G4LivermoreRayleighModel.hh"
     48
    4049#include "G4StepLimiter.hh"
    4150
    … …  
    5665    {
    5766      G4ParticleDefinition* particle = theParticleIterator -> value();
    58       G4ProcessManager* manager = particle -> GetProcessManager();
     67      G4ProcessManager* pmanager = particle -> GetProcessManager();
    5968      G4String particleName = particle -> GetParticleName();
    6069     
    6170      if (particleName == "gamma")
    6271        {
    63           manager -> AddDiscreteProcess(new G4LowEnergyPhotoElectric);
    64           manager -> AddDiscreteProcess(new G4LowEnergyCompton);
    65           manager -> AddDiscreteProcess(new G4LowEnergyGammaConversion);
    66           manager -> AddDiscreteProcess(new G4LowEnergyRayleigh);
    67           manager -> AddProcess(new G4StepLimiter(),-1,-1,3);
     72          // Photon     
     73      G4RayleighScattering* theRayleigh = new G4RayleighScattering();
     74      theRayleigh->SetModel(new G4LivermoreRayleighModel());  //not strictly necessary
     75      pmanager->AddDiscreteProcess(theRayleigh);
     76
     77      G4PhotoElectricEffect* thePhotoElectricEffect = new G4PhotoElectricEffect();
     78      thePhotoElectricEffect->SetModel(new G4LivermorePhotoElectricModel());
     79      pmanager->AddDiscreteProcess(thePhotoElectricEffect);
     80       
     81      G4ComptonScattering* theComptonScattering = new G4ComptonScattering();
     82      theComptonScattering->SetModel(new G4LivermoreComptonModel());
     83      pmanager->AddDiscreteProcess(theComptonScattering);
     84       
     85      G4GammaConversion* theGammaConversion = new G4GammaConversion();
     86      theGammaConversion->SetModel(new G4LivermoreGammaConversionModel());
     87      pmanager->AddDiscreteProcess(theGammaConversion); 
     88     
     89      pmanager->AddProcess(new G4StepLimiter(),  -1,-1,3);
    6890        }   
    6991    }

  • trunk/examples/advanced/radioprotection/src/RemSimPhysicsList.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimPhysicsList.cc,v 1.10 2006/06/29 16:24:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli

  • trunk/examples/advanced/radioprotection/src/RemSimPhysicsListMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimPhysicsListMessenger.cc,v 1.4 2006/06/29 16:24:05 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimPositronStandard.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RemSimPositronStandard.cc,v 1.6 2006/06/29 16:24:07 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RemSimPositronStandard.cc,v 1.8 2009/11/12 05:29:47 cirrone Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Author: Susanna Guatelli, guatelli@ge.infn.it
    … …  
    3232#include "G4Gamma.hh"
    3333#include "G4ParticleDefinition.hh"
    34 #include "G4MultipleScattering.hh"
     34#include "G4eMultipleScattering.hh"
    3535#include "G4eIonisation.hh"
    3636#include "G4eBremsstrahlung.hh"
    … …  
    5858      if (particleName == "e+")
    5959        {
    60           manager -> AddProcess(new G4MultipleScattering, -1, 1,1);
    61           manager -> AddProcess(new G4eIonisation,        -1, 2,2);
    62           manager -> AddProcess(new G4eBremsstrahlung,    -1,-1,3);
    63           manager -> AddProcess(new G4eplusAnnihilation,   0,-1,4);
    64           manager -> AddProcess(new G4StepLimiter(),  -1,-1,3);
    65         }   
     60            // Positron     
     61      G4eMultipleScattering* msc = new G4eMultipleScattering();
     62      msc->SetStepLimitType(fUseDistanceToBoundary);
     63      manager->AddProcess(msc,-1, 1, 1);
     64       
     65      // Ionisation
     66      G4eIonisation* eIonisation = new G4eIonisation();
     67      eIonisation->SetStepFunction(0.2, 100*um); //     
     68      manager->AddProcess(eIonisation,                 -1, 2, 2);
     69
     70      //Bremsstrahlung (use default, no low-energy available)
     71      manager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3);
     72
     73      //Annihilation
     74      manager->AddProcess(new G4eplusAnnihilation(),0,-1, 4);   
     75
     76      manager -> AddProcess(new G4StepLimiter(),  -1,-1,3);
     77        }
    6678    }
    6779}

  • trunk/examples/advanced/radioprotection/src/RemSimPrimaryGeneratorMessenger.cc

    r807 r1230  
    3535//
    3636// $Id: RemSimPrimaryGeneratorMessenger.cc,v 1.11 2006/06/29 16:24:11 gunter Exp $
    37 // GEANT4 tag $Name: $
     37// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3838//
    3939//

  • trunk/examples/advanced/radioprotection/src/RemSimROGeometry.cc

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

  • trunk/examples/advanced/radioprotection/src/RemSimRoofDecorator.cc

    r807 r1230  
    3434//
    3535// $Id: RemSimRoofDecorator.cc,v 1.7 2006/06/29 16:24:15 gunter Exp $
    36 // GEANT4 tag $Name: $
     36// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3737//
    3838#include "RemSimVGeometryComponent.hh"

  • trunk/examples/advanced/radioprotection/src/RemSimRunAction.cc

    r807 r1230  
    3333// Code developed by: S.Guatelli, guatelli@ge.infn.it
    3434// $Id: RemSimRunAction.cc,v 1.14 2006/06/29 16:24:17 gunter Exp $
    35 // GEANT4 tag $Name: $
     35// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3636//
    3737

  • trunk/examples/advanced/radioprotection/src/RemSimSensitiveDetector.cc

    r807 r1230  
    2626//
    2727// $Id: RemSimSensitiveDetector.cc,v 1.15 2006/06/29 16:24:19 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimShelterSPEDecorator.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimShelterSPEDecorator.cc,v 1.3 2006/06/29 16:24:21 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimShieldingDecorator.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimShieldingDecorator.cc,v 1.6 2006/06/29 16:24:23 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimSteppingAction.cc

    r807 r1230  
    2626//
    2727// $Id: RemSimSteppingAction.cc,v 1.10 2006/06/29 16:24:25 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/radioprotection/src/RemSimSteppingActionMessenger.cc

    r807 r1230  
    2525//
    2626//
    27 //$Id: RemSimSteppingActionMessenger.cc,v 1.5 2006/06/29 16:24:27 gunter Exp $// GEANT4 tag $Name: $
     27//$Id: RemSimSteppingActionMessenger.cc,v 1.5 2006/06/29 16:24:27 gunter Exp $// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimVGeometryComponent.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimVGeometryComponent.cc,v 1.4 2006/06/29 16:24:29 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it

  • trunk/examples/advanced/radioprotection/src/RemSimVehicle1.cc

    r807 r1230  
    2525//
    2626// $Id: RemSimVehicle1.cc,v 1.9 2006/06/29 16:24:31 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// Code developed by: S.Guatelli, guatelli@ge.infn.it
Note: See TracChangeset for help on using the changeset viewer.