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

update to geant4.9.3

Location:
trunk/examples/novice/N02/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/novice/N02/src/ExN02ChamberParameterisation.cc

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

  • trunk/examples/novice/N02/src/ExN02DetectorConstruction.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: ExN02DetectorConstruction.cc,v 1.20 2007/10/17 08:50:35 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN02DetectorConstruction.cc,v 1.21 2008/09/22 16:41:20 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    304304
    305305//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     306
     307void ExN02DetectorConstruction::SetMaxStep(G4double maxStep)
     308{
     309  if ((stepLimit)&&(maxStep>0.)) stepLimit->SetMaxAllowedStep(maxStep);
     310}
     311
     312//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/novice/N02/src/ExN02DetectorMessenger.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: ExN02DetectorMessenger.cc,v 1.11 2006/06/29 17:48:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN02DetectorMessenger.cc,v 1.12 2008/09/22 16:41:20 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    6565  FieldCmd->SetParameterName("Bx",false);
    6666  FieldCmd->SetUnitCategory("Magnetic flux density");
    67   FieldCmd->AvailableForStates(G4State_PreInit,G4State_Idle); 
     67  FieldCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
     68       
     69  StepMaxCmd = new G4UIcmdWithADoubleAndUnit("/N02/det/stepMax",this); 
     70  StepMaxCmd->SetGuidance("Define a step max");
     71  StepMaxCmd->SetParameterName("stepMax",false);
     72  StepMaxCmd->SetUnitCategory("Length");
     73  StepMaxCmd->AvailableForStates(G4State_Idle);   
    6874}
    6975
    … …  
    7581  delete ChamMatCmd;
    7682  delete FieldCmd;
     83  delete StepMaxCmd; 
    7784  delete detDir;
    7885  delete N02Dir;
    … …  
    9198  if( command == FieldCmd )
    9299   { myDetector->SetMagField(FieldCmd->GetNewDoubleValue(newValue));}
     100     
     101  if( command == StepMaxCmd )
     102   { myDetector->SetMaxStep(StepMaxCmd->GetNewDoubleValue(newValue));}   
    93103}
    94104

  • trunk/examples/novice/N02/src/ExN02EventAction.cc

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

  • trunk/examples/novice/N02/src/ExN02MagneticField.cc

    r807 r1230  
    2626//
    2727// $Id: ExN02MagneticField.cc,v 1.9 2007/08/22 13:11:51 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// 
    3030//   User Field class implementation.

  • trunk/examples/novice/N02/src/ExN02PhysicsList.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: ExN02PhysicsList.cc,v 1.22 2006/06/29 17:48:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: ExN02PhysicsList.cc,v 1.27 2009/11/15 14:27:30 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    134134  ConstructEM();
    135135  ConstructGeneral();
     136  AddStepMax();
    136137}
    137138
    … …  
    142143#include "G4PhotoElectricEffect.hh"
    143144
    144 #include "G4MultipleScattering.hh"
    145 
     145#include "G4eMultipleScattering.hh"
    146146#include "G4eIonisation.hh"
    147147#include "G4eBremsstrahlung.hh"
    148148#include "G4eplusAnnihilation.hh"
    149149
     150#include "G4MuMultipleScattering.hh"
    150151#include "G4MuIonisation.hh"
    151152#include "G4MuBremsstrahlung.hh"
    152153#include "G4MuPairProduction.hh"
    153154
     155#include "G4hMultipleScattering.hh"
    154156#include "G4hIonisation.hh"
    155 
    156 #include "G4StepLimiter.hh"
    157 #include "G4UserSpecialCuts.hh"
     157#include "G4hBremsstrahlung.hh"
     158#include "G4hPairProduction.hh"
     159
     160#include "G4ionIonisation.hh"
    158161
    159162//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    175178    } else if (particleName == "e-") {
    176179      //electron
    177       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    178       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    179       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);     
     180      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
     181      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     182      pmanager->AddProcess(new G4eBremsstrahlung,     -1, 3, 3);     
    180183
    181184    } else if (particleName == "e+") {
    182185      //positron
    183       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    184       pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    185       pmanager->AddProcess(new G4eBremsstrahlung,   -1, 3,3);
    186       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1,4);
     186      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
     187      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     188      pmanager->AddProcess(new G4eBremsstrahlung,     -1, 3, 3);
     189      pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
    187190
    188191    } else if( particleName == "mu+" ||
    189192               particleName == "mu-"    ) {
    190193      //muon 
    191       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    192       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    193       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
    194       pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
    195      
     194      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
     195      pmanager->AddProcess(new G4MuIonisation,         -1, 2, 2);
     196      pmanager->AddProcess(new G4MuBremsstrahlung,     -1, 3, 3);
     197      pmanager->AddProcess(new G4MuPairProduction,     -1, 4, 4);       
     198             
     199    } else if( particleName == "proton" ||
     200               particleName == "pi-" ||
     201               particleName == "pi+"    ) {
     202      //proton 
     203      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     204      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
     205      pmanager->AddProcess(new G4hBremsstrahlung,     -1, 3, 3);
     206      pmanager->AddProcess(new G4hPairProduction,     -1, 4, 4);       
     207     
     208    } else if( particleName == "alpha" ||
     209               particleName == "He3" )     {
     210      //alpha
     211      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     212      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     213     
     214    } else if( particleName == "GenericIon" ) {
     215      //Ions
     216      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     217      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     218                 
    196219    } else if ((!particle->IsShortLived()) &&
    197220               (particle->GetPDGCharge() != 0.0) &&
    198221               (particle->GetParticleName() != "chargedgeantino")) {
    199222      //all others charged particles except geantino
    200       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    201       pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
    202       //step limit
    203       pmanager->AddProcess(new G4StepLimiter,       -1,-1,3);         
    204       ///pmanager->AddProcess(new G4UserSpecialCuts,   -1,-1,4); 
     223      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     224      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
    205225    }
    206226  }
    … …  
    210230
    211231#include "G4Decay.hh"
     232
    212233void ExN02PhysicsList::ConstructGeneral()
    213234{
    … …  
    226247  }
    227248}
     249 
     250//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     251
     252#include "G4StepLimiter.hh"
     253#include "G4UserSpecialCuts.hh"
     254
     255void ExN02PhysicsList::AddStepMax()
     256{
     257  // Step limitation seen as a process
     258  G4StepLimiter* stepLimiter = new G4StepLimiter();
     259  ////G4UserSpecialCuts* userCuts = new G4UserSpecialCuts();
     260 
     261  theParticleIterator->reset();
     262  while ((*theParticleIterator)()){
     263      G4ParticleDefinition* particle = theParticleIterator->value();
     264      G4ProcessManager* pmanager = particle->GetProcessManager();
     265
     266      if (particle->GetPDGCharge() != 0.0)
     267        {
     268          pmanager ->AddDiscreteProcess(stepLimiter);
     269          ////pmanager ->AddDiscreteProcess(userCuts);
     270        }
     271  }
     272}
    228273
    229274//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc

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

  • trunk/examples/novice/N02/src/ExN02RunAction.cc

    r807 r1230  
    2626//
    2727// $Id: ExN02RunAction.cc,v 1.9 2006/06/29 17:48:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/novice/N02/src/ExN02SteppingAction.cc

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

  • trunk/examples/novice/N02/src/ExN02SteppingVerbose.cc

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

  • trunk/examples/novice/N02/src/ExN02TrackerHit.cc

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

  • trunk/examples/novice/N02/src/ExN02TrackerSD.cc

    r807 r1230  
    2626//
    2727// $Id: ExN02TrackerSD.cc,v 1.9 2006/06/29 17:48:27 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Note: See TracChangeset for help on using the changeset viewer.