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/analysis/N03Con/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/analysis/N03Con/src/ExN03DetectorConstruction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03DetectorConstruction.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03DetectorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03DetectorMessenger.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03EventAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03EventAction.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03EventActionMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03EventActionMessenger.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03PhysicsList.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: ExN03PhysicsList.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: ExN03PhysicsList.cc,v 1.2 2010/03/31 21:43:48 tkoi Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    3636
    3737#include "G4ProcessManager.hh"
    38 #include "G4ParticleTypes.hh"
     38
     39#include "G4BosonConstructor.hh"
     40#include "G4LeptonConstructor.hh"
     41#include "G4MesonConstructor.hh"
     42#include "G4BosonConstructor.hh"
     43#include "G4BaryonConstructor.hh"
     44#include "G4IonConstructor.hh"
    3945
    4046//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4248ExN03PhysicsList::ExN03PhysicsList():  G4VUserPhysicsList()
    4349{
    44  defaultCutValue = 1.0*mm;
    45  SetVerboseLevel(1);
     50  defaultCutValue = 1.0*mm;
     51  SetVerboseLevel(1);
    4652}
    4753
    … …  
    6066  // created in the program.
    6167
    62   ConstructBosons();
    63   ConstructLeptons();
    64   ConstructMesons();
    65   ConstructBaryons();
    66 }
    67 
    68 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    69 
    70 void ExN03PhysicsList::ConstructBosons()
    71 {
    72   // pseudo-particles
    73   G4Geantino::GeantinoDefinition();
    74   G4ChargedGeantino::ChargedGeantinoDefinition();
    75 
    76   // gamma
    77   G4Gamma::GammaDefinition();
    78 
    79   // optical photon
    80   G4OpticalPhoton::OpticalPhotonDefinition();
    81 }
    82 
    83 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    84 
    85 void ExN03PhysicsList::ConstructLeptons()
    86 {
    87   // leptons
    88   G4Electron::ElectronDefinition();
    89   G4Positron::PositronDefinition();
    90   G4MuonPlus::MuonPlusDefinition();
    91   G4MuonMinus::MuonMinusDefinition();
    92 
    93   G4NeutrinoE::NeutrinoEDefinition();
    94   G4AntiNeutrinoE::AntiNeutrinoEDefinition();
    95   G4NeutrinoMu::NeutrinoMuDefinition();
    96   G4AntiNeutrinoMu::AntiNeutrinoMuDefinition();
    97 }
    98 
    99 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    100 
    101 void ExN03PhysicsList::ConstructMesons()
    102 {
    103  //  mesons
    104   G4PionPlus::PionPlusDefinition();
    105   G4PionMinus::PionMinusDefinition();
    106   G4PionZero::PionZeroDefinition();
    107   G4Eta::EtaDefinition();
    108   G4EtaPrime::EtaPrimeDefinition();
    109   G4KaonPlus::KaonPlusDefinition();
    110   G4KaonMinus::KaonMinusDefinition();
    111   G4KaonZero::KaonZeroDefinition();
    112   G4AntiKaonZero::AntiKaonZeroDefinition();
    113   G4KaonZeroLong::KaonZeroLongDefinition();
    114   G4KaonZeroShort::KaonZeroShortDefinition();
    115 }
    116 
    117 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    118 
    119 void ExN03PhysicsList::ConstructBaryons()
    120 {
    121 //  barions
    122   G4Proton::ProtonDefinition();
    123   G4AntiProton::AntiProtonDefinition();
    124   G4Neutron::NeutronDefinition();
    125   G4AntiNeutron::AntiNeutronDefinition();
    126 }
    127 
     68  G4BosonConstructor  pBosonConstructor;
     69  pBosonConstructor.ConstructParticle();
     70
     71  G4LeptonConstructor pLeptonConstructor;
     72  pLeptonConstructor.ConstructParticle();
     73
     74  G4MesonConstructor pMesonConstructor;
     75  pMesonConstructor.ConstructParticle();
     76
     77  G4BaryonConstructor pBaryonConstructor;
     78  pBaryonConstructor.ConstructParticle();
     79
     80  G4IonConstructor pIonConstructor;
     81  pIonConstructor.ConstructParticle();
     82}
    12883
    12984//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    13388  AddTransportation();
    13489  ConstructEM();
    135   ConstructGeneral();
     90  ConstructDecay();
    13691}
    13792
    … …  
    14297#include "G4PhotoElectricEffect.hh"
    14398
    144 #include "G4MultipleScattering.hh"
    145 
     99#include "G4eMultipleScattering.hh"
    146100#include "G4eIonisation.hh"
    147101#include "G4eBremsstrahlung.hh"
    148102#include "G4eplusAnnihilation.hh"
    149103
     104#include "G4MuMultipleScattering.hh"
    150105#include "G4MuIonisation.hh"
    151106#include "G4MuBremsstrahlung.hh"
    152107#include "G4MuPairProduction.hh"
    153108
     109#include "G4hMultipleScattering.hh"
    154110#include "G4hIonisation.hh"
     111#include "G4hBremsstrahlung.hh"
     112#include "G4hPairProduction.hh"
     113
     114#include "G4ionIonisation.hh"
    155115
    156116//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    172132    } else if (particleName == "e-") {
    173133      //electron
    174       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    175       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    176       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);     
     134      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
     135      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
     136      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);     
    177137
    178138    } else if (particleName == "e+") {
    179139      //positron
    180       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    181       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    182       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
    183       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);
    184 
     140      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
     141      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
     142      pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3, 3);
     143      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
     144   
    185145    } else if( particleName == "mu+" ||
    186146               particleName == "mu-"    ) {
    187147      //muon 
    188       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    189       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    190       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
    191       pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
     148      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
     149      pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
     150      pmanager->AddProcess(new G4MuBremsstrahlung,   -1, 3, 3);
     151      pmanager->AddProcess(new G4MuPairProduction,   -1, 4, 4);
     152             
     153    } else if( particleName == "proton" ||
     154               particleName == "pi-" ||
     155               particleName == "pi+"    ) {
     156      //proton 
     157      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     158      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
     159      pmanager->AddProcess(new G4hBremsstrahlung,     -1, 3, 3);
     160      pmanager->AddProcess(new G4hPairProduction,     -1, 4, 4);       
    192161     
    193     } else if ((!particle->IsShortLived()) &&
     162    } else if( particleName == "alpha" ||
     163               particleName == "He3" )     {
     164      //alpha
     165      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     166      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     167     
     168    } else if( particleName == "GenericIon" ) {
     169      //Ions
     170      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     171      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);     
     172     
     173      } else if ((!particle->IsShortLived()) &&
    194174               (particle->GetPDGCharge() != 0.0) &&
    195175               (particle->GetParticleName() != "chargedgeantino")) {
    196176      //all others charged particles except geantino
    197       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    198       pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
    199     }
     177      pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
     178      pmanager->AddProcess(new G4hIonisation,        -1, 2, 2);       
     179    }     
    200180  }
    201181}
    … …  
    205185#include "G4Decay.hh"
    206186
    207 void ExN03PhysicsList::ConstructGeneral()
     187void ExN03PhysicsList::ConstructDecay()
    208188{
    209189  // Add Decay Process
    210    G4Decay* theDecayProcess = new G4Decay();
     190  G4Decay* theDecayProcess = new G4Decay();
    211191  theParticleIterator->reset();
    212192  while( (*theParticleIterator)() ){
    … …  
    237217  SetCutValue(defaultCutValue, "e-");
    238218  SetCutValue(defaultCutValue, "e+");
     219  SetCutValue(defaultCutValue, "proton");
    239220
    240221  if (verboseLevel>0) DumpCutValuesTable();

  • trunk/examples/extended/analysis/N03Con/src/ExN03PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03PrimaryGeneratorAction.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03PrimaryGeneratorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03RunAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03RunAction.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/analysis/N03Con/src/ExN03SteppingAction.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03SteppingAction.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/analysis/N03Con/src/ExN03SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: ExN03SteppingVerbose.cc,v 1.1 2007/05/26 00:18:28 tkoi Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Note: See TracChangeset for help on using the changeset viewer.