Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (15 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/examples/extended/electromagnetic/TestEm10/src
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10CalorHit.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10CalorHit.cc,v 1.4 2006/06/29 16:38:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10CalorimeterSD.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10CalorimeterSD.cc,v 1.4 2006/06/29 16:38:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10DetectorConstruction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10DetectorConstruction.cc,v 1.32 2007/07/27 17:52:04 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10DetectorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10DetectorMessenger.cc,v 1.11 2006/06/29 16:38:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10EventAction.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: Em10EventAction.cc,v 1.6 2006/06/29 16:38:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: Em10EventAction.cc,v 1.7 2010/06/06 04:33:02 perl Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//
    … …  
    4646#include "G4SDManager.hh"
    4747#include "G4UImanager.hh"
    48 #include "G4TrajectoryContainer.hh"
    49 #include "G4Trajectory.hh"
    50 #include "G4VVisManager.hh"
    5148#include "G4ios.hh"
    5249#include "G4UnitsTable.hh"
    … …  
    142139    runaction->FillNbOfSteps(nstep);
    143140  }
    144  
    145   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
    146 
    147   if(pVVisManager)
    148   {
    149    G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer();
    150    G4int n_trajectories = 0;
    151    if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); 
    152    for(G4int i=0; i<n_trajectories; i++)
    153       { G4Trajectory* trj = (G4Trajectory *)((*(evt->GetTrajectoryContainer()))[i]);
    154         if (drawFlag == "all") trj->DrawTrajectory(50);
    155         else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.))
    156                                trj->DrawTrajectory(50);
    157       }
    158   } 
    159141
    160142  if(verboselevel>0)

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10EventActionMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10EventActionMessenger.cc,v 1.4 2006/06/29 16:38:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsList.cc

    r1230 r1337  
    2525//
    2626//
    27 // $Id: Em10PhysicsList.cc,v 1.24 2006/06/29 16:38:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: Em10PhysicsList.cc,v 1.25 2009/11/21 16:12:01 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030
    … …  
    4343#include <iomanip>
    4444
    45 #include "G4FastSimulationManagerProcess.hh"
    46 
    4745#include "G4Region.hh"
    4846#include "G4RegionStore.hh"
    … …  
    5048#include "G4ProductionCuts.hh"
    5149#include "G4EmProcessOptions.hh"
     50
     51#include "G4ComptonScattering.hh"
     52#include "G4GammaConversion.hh"
     53#include "G4PhotoElectricEffect.hh"
     54
     55#include "G4eMultipleScattering.hh"
     56#include "G4MuMultipleScattering.hh"
     57#include "G4hMultipleScattering.hh"
     58
     59#include "G4eIonisation.hh"
     60#include "G4eBremsstrahlung.hh"
     61#include "G4eplusAnnihilation.hh"
     62#include "G4PAIModel.hh"
     63#include "G4PAIPhotonModel.hh"
     64
     65#include "G4SynchrotronRadiation.hh"
     66
     67#include "G4MuIonisation.hh"
     68#include "G4MuBremsstrahlung.hh"
     69#include "G4MuPairProduction.hh"
     70
     71#include "G4hIonisation.hh"
     72
     73#include "G4Decay.hh"
     74
     75#include "G4VXTRenergyLoss.hh"
     76#include "G4RegularXTRadiator.hh"
     77#include "G4TransparentRegXTRadiator.hh"
     78#include "G4GammaXTRadiator.hh"
     79#include "G4StrawTubeXTRadiator.hh"
     80
     81#include "G4XTRGammaRadModel.hh"
     82#include "G4XTRRegularRadModel.hh"
     83#include "G4XTRTransparentRegRadModel.hh"
     84#include "Em10XTRTransparentRegRadModel.hh"
     85
     86#include "Em10StepCut.hh"
    5287
    5388/////////////////////////////////////////////////////////////
    … …  
    155190{
    156191  AddTransportation();
    157  
    158 // AddParameterisation();
    159 
    160192  ConstructEM();
    161193  ConstructGeneral();
    … …  
    165197//
    166198//
    167 
    168 #include "G4ComptonScattering.hh"
    169 #include "G4GammaConversion.hh"
    170 #include "G4PhotoElectricEffect.hh"
    171 
    172 #include "G4MultipleScattering.hh"
    173 
    174 #include "G4eIonisation.hh"
    175 #include "G4eBremsstrahlung.hh"
    176 #include "G4eplusAnnihilation.hh"
    177 #include "G4PAIModel.hh"
    178 #include "G4PAIPhotonModel.hh"
    179 
    180 #include "G4SynchrotronRadiation.hh"
    181 
    182 #include "G4MuIonisation.hh"
    183 #include "G4MuBremsstrahlung.hh"
    184 #include "G4MuPairProduction.hh"
    185 
    186 #include "G4hIonisation.hh"
    187 
    188 // #include "G4ForwardXrayTR.hh"
    189 #include "G4VXTRenergyLoss.hh"
    190 #include "G4RegularXTRadiator.hh"
    191 #include "G4TransparentRegXTRadiator.hh"
    192 #include "G4GammaXTRadiator.hh"
    193 #include "G4StrawTubeXTRadiator.hh"
    194 
    195 #include "G4XTRGammaRadModel.hh"
    196 #include "G4XTRRegularRadModel.hh"
    197 #include "G4XTRTransparentRegRadModel.hh"
    198 #include "Em10XTRTransparentRegRadModel.hh"
    199 
    200 #include "Em10StepCut.hh"
    201199
    202200void Em10PhysicsList::ConstructEM()
    … …  
    331329      eioni->AddEmModel(0,pai,pai,gas);
    332330
    333       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
     331      pmanager->AddProcess(new G4eMultipleScattering,-1,1,1);
    334332      pmanager->AddProcess(eioni,-1,2,2);
    335333      pmanager->AddProcess(new G4eBremsstrahlung,-1,3,3);
    … …  
    349347      eioni->AddEmModel(0,pai,pai,gas);
    350348
    351       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
     349      pmanager->AddProcess(new G4eMultipleScattering,-1,1,1);
    352350      pmanager->AddProcess(eioni,-1,2,2);
    353351      pmanager->AddProcess(new G4eBremsstrahlung,-1,3,3);
    … …  
    371369      muioni->AddEmModel(0,pai,pai,gas);
    372370
    373       pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
     371      pmanager->AddProcess(new G4MuMultipleScattering(),-1,1,1);
    374372      pmanager->AddProcess(muioni,-1,2,2);
    375373      pmanager->AddProcess(new G4MuBremsstrahlung(),-1,3,3);
    … …  
    394392      thehIonisation->AddEmModel(0,pai,pai,gas);
    395393
    396       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
     394      pmanager->AddProcess(new G4hMultipleScattering,-1,1,1);
    397395      pmanager->AddProcess(thehIonisation,-1,2,2);
    398396      pmanager->AddProcess( thehadronStepCut,-1,-1,3);
    … …  
    404402}
    405403
    406 #include "G4Decay.hh"
    407 
    408404void Em10PhysicsList::ConstructGeneral()
    409405{
    410406  // Add Decay Process
    411407
    412    G4Decay* theDecayProcess = new G4Decay();
     408  G4Decay* theDecayProcess = new G4Decay();
    413409  theParticleIterator->reset();
    414410

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsListMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10PhysicsListMessenger.cc,v 1.9 2006/06/29 16:38:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:38:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10PrimaryGeneratorMessenger.cc,v 1.4 2006/06/29 16:38:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10RunAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10RunAction.cc,v 1.9 2006/06/29 16:38:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10RunMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10RunMessenger.cc,v 1.5 2006/06/29 16:39:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10StepCut.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10StepCut.cc,v 1.3 2006/06/29 16:39:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10SteppingAction.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10SteppingAction.cc,v 1.6 2006/06/29 16:39:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10SteppingMessenger.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10SteppingMessenger.cc,v 1.4 2006/06/29 16:39:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2929//
    3030

  • trunk/examples/extended/electromagnetic/TestEm10/src/Em10SteppingVerbose.cc

    r1230 r1337  
    2626//
    2727// $Id: Em10SteppingVerbose.cc,v 1.6 2006/06/29 16:39:12 gunter 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/electromagnetic/TestEm10/src/StepMax.cc

    r1230 r1337  
    2525//
    2626// $Id: StepMax.cc,v 1.2 2006/06/29 16:39:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929///////////////////////////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.