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

update to geant4.9.3

Location:
trunk/examples/extended/electromagnetic/TestEm8
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm8/GNUmakefile

    r807 r1230  
    1 # $Id: GNUmakefile,v 1.7 2006/10/26 16:20:33 maire Exp $
     1# $Id: GNUmakefile,v 1.8 2008/06/11 22:27:45 maire Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1515all: lib bin
    1616
    17 ifdef G4ANALYSIS_USE
    18   CPPFLAGS += -DG4ANALYSIS_USE
    19 endif
     17#### G4ANALYSIS_USE := true
    2018
    2119include $(G4INSTALL)/config/architecture.gmk
    2220
    23 ifdef G4ANALYSIS_USE
    24   # for the aida-config command see the README file
    25   CPPFLAGS += `aida-config --include`
    26   LOADLIBS += `aida-config --lib`
    27 endif
    28 
    2921include $(G4INSTALL)/config/binmake.gmk

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

    r807 r1230  
    2626//
    2727// $Id: TestEm8.cc,v 1.8 2007/07/27 15:29:38 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r807 r1230  
    2525//
    2626//
    27 // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:59:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: PhysicsList.hh,v 1.3 2008/11/21 12:39:24 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4040#include "G4VModularPhysicsList.hh"
    4141#include "globals.hh"
     42#include "G4EmConfigurator.hh"
    4243
    4344class G4VPhysicsConstructor;
    … …  
    4950class PhysicsList: public G4VModularPhysicsList
    5051{
    51   public:
    52     PhysicsList();
    53   ~PhysicsList();
     52public:
     53  PhysicsList();
     54  virtual ~PhysicsList();
    5455
    55     void ConstructParticle();
     56  void ConstructParticle();
    5657   
    57     void SetCuts();
    58     void SetCutForGamma(G4double);
    59     void SetCutForElectron(G4double);
    60     void SetCutForPositron(G4double);
     58  void SetCuts();
     59  void SetCutForGamma(G4double);
     60  void SetCutForElectron(G4double);
     61  void SetCutForPositron(G4double);
    6162       
    62     void AddPhysicsList(const G4String& name);
    63     void ConstructProcess();
     63  void AddPhysicsList(const G4String& name);
     64  void ConstructProcess();
    6465   
    65     void AddStepMax();       
    66     StepMax* GetStepMaxProcess() {return stepMaxProcess;};
     66  void AddStepMax();       
     67  //StepMax* GetStepMaxProcess() {return stepMaxProcess;};
    6768
    68   private:
    69     G4double cutForGamma;
    70     G4double cutForElectron;
    71     G4double cutForPositron;
     69private:
    7270
    73     G4VPhysicsConstructor*  emPhysicsList;
    74     G4VPhysicsConstructor*  generalPhysicsList;
    75     G4VPhysicsConstructor*  particleList;
    76     std::vector<G4VPhysicsConstructor*>  hadronPhys;
    77     G4String emName;
     71  void  AddPAIModel(const G4String&);
     72  void  NewPAIModel(const G4ParticleDefinition*, const G4String& modname,
     73                    const G4String& procname);
     74
     75  G4EmConfigurator em_config;
     76
     77  G4double cutForGamma;
     78  G4double cutForElectron;
     79  G4double cutForPositron;
     80
     81  G4VPhysicsConstructor*  emPhysicsList;
     82  G4VPhysicsConstructor*  generalPhysicsList;
     83  G4VPhysicsConstructor*  particleList;
     84  std::vector<G4VPhysicsConstructor*>  hadronPhys;
     85  G4String emName;
    7886   
    79     StepMax* stepMaxProcess;
     87  StepMax* stepMaxProcess;
    8088   
    81     PhysicsListMessenger* pMessenger;
     89  PhysicsListMessenger* pMessenger;
     90
     91  G4VEmModel* em_model;
     92  G4VEmFluctuationModel* fm_model;
     93
    8294};
    8395

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

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

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

    r807 r1230  
    2525//
    2626// $Id: StepMax.hh,v 1.2 2006/06/29 16:59:52 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r807 r1230  
    2525//
    2626// $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:59:55 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

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

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

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

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

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

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

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

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

    r807 r1230  
    2626//
    2727// $Id: Em8DetectorConstruction.cc,v 1.21 2007/10/02 10:12:47 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r807 r1230  
    2525//
    2626//
    27 // $Id: PhysicsList.cc,v 1.14 2007/09/26 10:23:17 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: PhysicsList.cc,v 1.16 2008/12/05 17:46:12 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030
    … …  
    3636
    3737#include "G4EmStandardPhysics.hh"
     38#include "G4EmStandardPhysics_option1.hh"
     39#include "G4EmStandardPhysics_option2.hh"
     40#include "G4EmStandardPhysics_option3.hh"
    3841#include "G4DecayPhysics.hh"
    3942
    40 #include "PhysListEmModelPai.hh"
    41 #include "PhysListEmPaiPhoton.hh"
    42 #include "PhysListEmPAI.hh"
     43#include "G4PAIModel.hh"
     44#include "G4PAIPhotonModel.hh"
    4345
    4446#include "G4Gamma.hh"
    … …  
    6971  pMessenger = new PhysicsListMessenger(this);
    7072
    71   SetVerboseLevel(1);
    72 
    7373  // Decay Physics is always defined
    7474  generalPhysicsList = new G4DecayPhysics();
    … …  
    7676  // EM physics
    7777  emName = G4String("emstandard");
    78   emPhysicsList = new G4EmStandardPhysics();
    79 
     78  emPhysicsList = new G4EmStandardPhysics(1);
     79
     80  SetVerboseLevel(1);
    8081}
    8182
    … …  
    104105  AddTransportation();
    105106  emPhysicsList->ConstructProcess();
     107  em_config.AddModels();
    106108  generalPhysicsList->ConstructProcess();
    107109  for(size_t i=0; i<hadronPhys.size(); i++) hadronPhys[i]->ConstructProcess();
    … …  
    113115void PhysicsList::AddPhysicsList(const G4String& name)
    114116{
    115   if (verboseLevel>-1) {
     117  if (verboseLevel>1) {
    116118    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
    117119  }
    118120
    119   if (name == emName) return;
    120 
    121   if (name == "pai")
    122   {
     121  if (name == emName) {
     122    return;
     123
     124  } else if (name == "emstandard_opt1") {
     125
    123126    emName = name;
    124127    delete emPhysicsList;
    125     emPhysicsList = new PhysListEmModelPai(name);
    126     G4cout<<"PhysListEmModelPai is called"<<G4endl;
    127   }
    128   else if (name == "pai_photon")
    129   {
     128    emPhysicsList = new G4EmStandardPhysics_option1();
     129
     130  } else if (name == "emstandard_opt2") {
     131
    130132    emName = name;
    131133    delete emPhysicsList;
    132     emPhysicsList = new PhysListEmPaiPhoton(name);
    133     G4cout<<"PhysListEmModelPaiPhoton is called"<<G4endl;
    134   }
    135   else if (name == "pai_brem")
    136   {
     134    emPhysicsList = new G4EmStandardPhysics_option2();
     135
     136  } else if (name == "emstandard_opt3") {
     137
    137138    emName = name;
    138139    delete emPhysicsList;
    139     emPhysicsList = new PhysListEmPAI(name);
    140     G4cout<<"PhysListEmPAI is called (bremsstrahlung dedx added)"<<G4endl;
    141   }
    142   else
    143   {
     140    emPhysicsList = new G4EmStandardPhysics_option3();
     141
     142  } else if (name == "pai") {
     143
     144    emName = name;
     145    AddPAIModel(name);
     146
     147  } else if (name == "pai_photon") {
     148
     149    emName = name;
     150    AddPAIModel(name);
     151
     152  } else {
     153
    144154    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
    145155           << " is not defined"
    … …  
    156166
    157167  theParticleIterator->reset();
    158 
    159168  while ((*theParticleIterator)())
    160169  {
    … …  
    216225//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    217226
     227void PhysicsList::AddPAIModel(const G4String& modname)
     228{
     229  theParticleIterator->reset();
     230  while ((*theParticleIterator)())
     231  {
     232    G4ParticleDefinition* particle = theParticleIterator->value();
     233    G4String partname = particle->GetParticleName();
     234    if(partname == "e-" || partname == "e+") {
     235      NewPAIModel(particle, modname, "eIoni");
     236
     237    } else if(partname == "mu-" || partname == "mu+") {
     238      NewPAIModel(particle, modname, "muIoni");
     239
     240    } else if(partname == "proton" ||
     241              partname == "pi+" ||
     242              partname == "pi-"   
     243              ) {
     244      NewPAIModel(particle, modname, "hIoni");
     245    }
     246  }
     247}
     248
     249//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     250
     251void PhysicsList::NewPAIModel(const G4ParticleDefinition* part,
     252                              const G4String& modname,
     253                              const G4String& procname)
     254{
     255  G4String partname = part->GetParticleName();
     256  if(modname == "pai") {
     257    G4PAIModel* pai = new G4PAIModel(part,"PAIModel");
     258    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
     259                              0.0,100.*TeV,pai);
     260  } else if(modname == "pai_photon") {
     261    G4PAIPhotonModel* pai = new G4PAIPhotonModel(part,"PAIPhotModel");
     262    em_config.SetExtraEmModel(partname,procname,pai,"VertexDetector",
     263                              0.0,100.*TeV,pai);
     264  }
     265}
     266
     267//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     268

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

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

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

    r807 r1230  
    2525//
    2626// $Id: StepMax.cc,v 1.3 2006/06/29 17:00:49 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r807 r1230  
    2525//
    2626// $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:00:52 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Note: See TracChangeset for help on using the changeset viewer.