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

update to geant4.9.3

Location:
trunk/examples/extended/electromagnetic/TestEm2/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: DetectorConstruction.cc,v 1.12 2006/10/20 16:03:40 maire Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: DetectorConstruction.cc,v 1.14 2009/09/16 18:07:30 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4343#include "G4LogicalVolumeStore.hh"
    4444#include "G4SolidStore.hh"
     45
     46#include "G4FieldManager.hh"
     47#include "G4TransportationManager.hh"
     48
     49#include "G4NistManager.hh"
     50#include "G4RunManager.hh"
    4551
    4652#include "G4UnitsTable.hh"
    … …  
    5662{
    5763  DefineMaterials();
    58   SetMaterial("PbWO4");
     64  SetMaterial("G4_PbWO4");
    5965  detectorMessenger = new DetectorMessenger(this);
    6066}
    … …  
    7783{
    7884  //
    79   // define few Elements
     85  // define few Elements by hand
    8086  //
    8187  G4double a, z;
    8288   
    8389  G4Element* H  = new G4Element("Hydrogen",  "H", z= 1., a=   1.01*g/mole);
    84   G4Element* N  = new G4Element("Nitrogen",  "N", z= 7., a=  14.01*g/mole);
    8590  G4Element* O  = new G4Element("Oxygen"  ,  "O", z= 8., a=  16.00*g/mole);
    8691  G4Element* Ge = new G4Element("Germanium", "Ge",z=32., a=  72.59*g/mole);
    87   G4Element* W  = new G4Element("Tungsten",  "W", z=74., a= 183.84*g/mole);
    88   G4Element* Pb = new G4Element("Lead",      "Pb",z=82., a= 207.19*g/mole);
    8992  G4Element* Bi = new G4Element("Bismuth",   "Bi",z=83., a= 208.98*g/mole);
    9093
    … …  
    9396  //
    9497  G4double density;
    95   G4double fractionmass;  G4int ncomponents, natoms;
    96 
    97   G4Material* Air =
    98   new G4Material("Air", density= 1.29*mg/cm3, ncomponents=2);
    99   Air->AddElement(N, fractionmass=0.7);
    100   Air->AddElement(O, fractionmass=0.3);
    101 
     98  G4int ncomponents, natoms;
     99
     100  // water with ionisation potential 75 eV
    102101  G4Material* H2O =
    103102  new G4Material("Water", density= 1.00*g/cm3, ncomponents=2);
    … …  
    106105  H2O->GetIonisation()->SetMeanExcitationEnergy(75.0*eV);
    107106
     107  // pure materails
    108108  new G4Material("liquidArgon", z=18., a= 39.95*g/mole, density= 1.390*g/cm3);
    109 
    110109  new G4Material("Aluminium",   z=13., a= 26.98*g/mole, density= 2.7*g/cm3);
    111 
    112   new G4Material("Iron",        z=26., a= 55.85*g/mole, density= 7.87*g/cm3);
    113  
    114   new G4Material("Copper"     , z=29., a= 63.55*g/mole, density= 8.960*g/cm3);
    115  
    116   new G4Material("Lead",        z=82., a=207.19*g/mole, density=11.35*g/cm3);
    117  
     110  new G4Material("Iron",        z=26., a= 55.85*g/mole, density= 7.87*g/cm3); 
     111  new G4Material("Copper",      z=29., a= 63.55*g/mole, density= 8.960*g/cm3);
     112  new G4Material("Tungsten",    z=74., a=183.84*g/mole, density=19.35*g/cm3);   
     113  new G4Material("Lead",        z=82., a=207.19*g/mole, density=11.35*g/cm3); 
    118114  new G4Material("Uranium"    , z=92., a=238.03*g/mole, density= 18.95*g/cm3);
    119    
     115
     116  // compound material
    120117  G4Material* BGO =
    121118  new G4Material("BGO", density= 7.10*g/cm3, ncomponents=3);
    … …  
    124121  BGO->AddElement(Bi, natoms= 4);
    125122
    126   G4Material* PbWO =
    127   new G4Material("PbWO4", density= 8.28*g/cm3, ncomponents=3);
    128   PbWO->AddElement(O , natoms=4);
    129   PbWO->AddElement(Pb, natoms=1);
    130   PbWO->AddElement(W , natoms=1);
    131 
    132123  G4cout << *(G4Material::GetMaterialTable()) << G4endl;
    133124}
    … …  
    171162{
    172163  // search the material by its name
    173   G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice);
    174   if (pttoMaterial) myMaterial = pttoMaterial;
     164  G4Material* pttoMaterial =
     165    G4NistManager::Instance()->FindOrBuildMaterial(materialChoice);
     166
     167  if (pttoMaterial) {
     168    myMaterial = pttoMaterial;
     169    if(logicEcal) logicEcal->SetMaterial(myMaterial);
     170    G4RunManager::GetRunManager()->PhysicsHasBeenModified();
     171  }
    175172}
    176173
    … …  
    202199
    203200//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    204 
    205 #include "G4FieldManager.hh"
    206 #include "G4TransportationManager.hh"
    207201
    208202void DetectorConstruction::SetMagField(G4double fieldValue)
    … …  
    226220//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    227221
    228 #include "G4RunManager.hh"
    229 
    230222void DetectorConstruction::UpdateGeometry()
    231223{

  • trunk/examples/extended/electromagnetic/TestEm2/src/DetectorMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.8 2006/06/29 16:50:20 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/TestEm2/src/EmAcceptance.cc

    r807 r1230  
    2525//
    2626// $Id: EmAcceptance.cc,v 1.5 2006/06/29 16:50:22 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/TestEm2/src/EventAction.cc

    r807 r1230  
    2525//
    2626// $Id: EventAction.cc,v 1.3 2006/06/29 16:50:24 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/TestEm2/src/EventActionMessenger.cc

    r807 r1230  
    2626//
    2727// $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:50:26 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: PhysListEmStandard.cc,v 1.6 2007/06/21 14:21:46 maire Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: PhysListEmStandard.cc,v 1.13 2009/11/13 16:01:10 maire Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3939#include "G4PhotoElectricEffect.hh"
    4040
    41 #include "G4MultipleScattering.hh"
    42 
     41#include "G4eMultipleScattering.hh"
     42#include "G4UrbanMscModel93.hh"
    4343#include "G4eIonisation.hh"
    4444#include "G4eBremsstrahlung.hh"
    4545#include "G4eplusAnnihilation.hh"
    4646
     47#include "G4MuMultipleScattering.hh"
    4748#include "G4MuIonisation.hh"
    4849#include "G4MuBremsstrahlung.hh"
    4950#include "G4MuPairProduction.hh"
    5051
     52#include "G4hMultipleScattering.hh"
    5153#include "G4hIonisation.hh"
     54#include "G4hBremsstrahlung.hh"
     55#include "G4hPairProduction.hh"
     56
    5257#include "G4ionIonisation.hh"
    5358
    … …  
    8792    } else if (particleName == "e-") {
    8893      //electron
    89       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
    90       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
    91       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3,3);
     94      G4eMultipleScattering* msc = new G4eMultipleScattering();
     95      msc->AddEmModel(0, new G4UrbanMscModel93());
     96      pmanager->AddProcess(msc,                       -1, 1, 1);
     97      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     98      pmanager->AddProcess(new G4eBremsstrahlung,     -1, 3, 3);
    9299           
    93100    } else if (particleName == "e+") {
    94101      //positron
    95       pmanager->AddProcess(new G4MultipleScattering, -1, 1,1);
    96       pmanager->AddProcess(new G4eIonisation,        -1, 2,2);
    97       pmanager->AddProcess(new G4eBremsstrahlung,    -1, 3,3);
    98       pmanager->AddProcess(new G4eplusAnnihilation,   0,-1,4);
     102      G4eMultipleScattering* msc = new G4eMultipleScattering();
     103      msc->AddEmModel(0, new G4UrbanMscModel93());
     104      pmanager->AddProcess(msc,                       -1, 1, 1);
     105      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     106      pmanager->AddProcess(new G4eBremsstrahlung,     -1, 3, 3);
     107      pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
    99108           
    100109    } else if( particleName == "mu+" ||
    101110               particleName == "mu-"    ) {
    102111      //muon 
    103       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    104       pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    105       pmanager->AddProcess(new G4MuBremsstrahlung,  -1, 3,3);
    106       pmanager->AddProcess(new G4MuPairProduction,  -1, 4,4);       
     112      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
     113      pmanager->AddProcess(new G4MuIonisation,         -1, 2, 2);
     114      pmanager->AddProcess(new G4MuBremsstrahlung,     -1, 3, 3);
     115      pmanager->AddProcess(new G4MuPairProduction,     -1, 4, 4);       
     116             
     117    } else if( particleName == "proton" ||
     118               particleName == "pi-" ||
     119               particleName == "pi+"    ) {
     120      //proton 
     121      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     122      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
     123      pmanager->AddProcess(new G4hBremsstrahlung,     -1, 3, 3);
     124      pmanager->AddProcess(new G4hPairProduction,     -1, 4, 4);       
    107125     
    108     } else if( particleName == "GenericIon" ) {
    109       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
    110       pmanager->AddProcess(new G4ionIonisation,     -1, 2,2);
     126    } else if( particleName == "alpha" ||
     127               particleName == "He3" ||
     128               particleName == "GenericIon" ) {
     129      //Ions
     130      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     131      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
    111132
    112133    } else if ((!particle->IsShortLived()) &&
    … …  
    114135               (particle->GetParticleName() != "chargedgeantino")) {
    115136      //all others charged particles except geantino
    116       pmanager->AddProcess(new G4MultipleScattering,-1,1,1);
    117       pmanager->AddProcess(new G4hIonisation,       -1,2,2);
     137      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     138      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
    118139    }
    119140  }
    120    
     141
    121142  // Em options
    122143  //
     144  // Main options and setting parameters are shown here.
     145  // Several of them have default values.
     146  //
    123147  G4EmProcessOptions emOptions;
    124    
    125   //coulomb scattering
     148 
     149  //physics tables
    126150  //
    127   emOptions.SetMscStepLimitation(fUseDistanceToBoundary);   
    128   emOptions.SetSkin(2.);
    129  
     151  emOptions.SetMinEnergy(100*eV);       //default   
     152  emOptions.SetMaxEnergy(100*TeV);      //default 
     153  emOptions.SetDEDXBinning(12*20);      //default=12*7 
     154  emOptions.SetLambdaBinning(12*20);    //default=12*7
     155  emOptions.SetSplineFlag(true);        //default
     156     
     157  //multiple coulomb scattering
     158  //
     159  emOptions.SetMscStepLimitation(fUseDistanceToBoundary);  //default=fUseSafety
     160  emOptions.SetMscRangeFactor(0.04);    //default
     161  emOptions.SetMscGeomFactor (2.5);     //default       
     162  emOptions.SetSkin(3.);                //default
     163     
    130164  //energy loss
    131165  //
    132   emOptions.SetLinearLossLimit(1.e-6);
    133   emOptions.SetStepFunction(0.2, 100*um);
     166  emOptions.SetStepFunction(0.2, 100*um);       //default=(0.2, 1*mm)   
     167  emOptions.SetLinearLossLimit(1.e-2);          //default
    134168   
    135169  //ionization
    136170  //
    137   emOptions.SetSubCutoff(true);
    138    
    139   // define high energy threshold for bremstrahlung
    140   //
    141   emOptions.SetBremsstrahlungTh(10.*GeV);
     171  emOptions.SetSubCutoff(false);                //default=false   
    142172}
    143173

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

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysicsList.cc,v 1.13 2007/06/22 16:35:07 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: PhysicsList.cc,v 1.16 2009/09/16 18:07:30 maire Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3434
    3535#include "PhysListEmStandard.hh"
    36 #include "PhysListEmLivermore.hh"
    37 #include "PhysListEmPenelope.hh"
    3836
    3937#include "G4EmStandardPhysics.hh"
    4038#include "G4EmStandardPhysics_option1.hh"
    4139#include "G4EmStandardPhysics_option2.hh"
     40#include "G4EmStandardPhysics_option3.hh"
     41#include "G4EmLivermorePhysics.hh"
     42#include "G4EmPenelopePhysics.hh"
     43
     44#include "G4Decay.hh"
     45#include "StepMax.hh"
    4246
    4347#include "G4LossTableManager.hh"
     48#include "G4ProcessManager.hh"
     49
    4450#include "G4UnitsTable.hh"
    45 
    46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    47 
    48 PhysicsList::PhysicsList() : G4VModularPhysicsList()
    49 {
    50   G4LossTableManager::Instance();
    51   defaultCutValue = 1.*mm;
    52   cutForGamma     = defaultCutValue;
    53   cutForElectron  = defaultCutValue;
    54   cutForPositron  = defaultCutValue;
    55 
    56   pMessenger = new PhysicsListMessenger(this);
    57 
    58   SetVerboseLevel(1);
    59 
    60   // EM physics
    61   emPhysicsList = new PhysListEmStandard(emName = "standard");
    62 
    63 }
    64 
    65 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    66 
    67 PhysicsList::~PhysicsList()
    68 {
    69   delete pMessenger;
    70   delete emPhysicsList;
    71 }
    72 
    73 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    7451
    7552// Bosons
    … …  
    7754#include "G4Geantino.hh"
    7855#include "G4Gamma.hh"
    79 #include "G4OpticalPhoton.hh"
    8056
    8157// leptons
     58#include "G4Electron.hh"
     59#include "G4Positron.hh"
    8260#include "G4MuonPlus.hh"
    8361#include "G4MuonMinus.hh"
    … …  
    11997//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    12098
     99PhysicsList::PhysicsList() : G4VModularPhysicsList()
     100{
     101  G4LossTableManager::Instance();
     102  defaultCutValue = 1.*mm;
     103  cutForGamma     = defaultCutValue;
     104  cutForElectron  = defaultCutValue;
     105  cutForPositron  = defaultCutValue;
     106
     107  pMessenger = new PhysicsListMessenger(this);
     108
     109  SetVerboseLevel(1);
     110
     111  // EM physics
     112  ///emName = "emstandard_opt0"; 
     113  ///emPhysicsList = new G4EmStandardPhysics();
     114  emName = "local";   
     115  emPhysicsList = new PhysListEmStandard(emName);   
     116}
     117
     118//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     119
     120PhysicsList::~PhysicsList()
     121{
     122  delete pMessenger;
     123  delete emPhysicsList;
     124}
     125
     126//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     127
    121128void PhysicsList::ConstructParticle()
    122129{
    123 // pseudo-particles
     130  // pseudo-particles
    124131  G4Geantino::GeantinoDefinition();
    125132  G4ChargedGeantino::ChargedGeantinoDefinition();
    126133 
    127 // gamma
     134  // gamma
    128135  G4Gamma::GammaDefinition();
    129136 
    130 // optical photon
    131   G4OpticalPhoton::OpticalPhotonDefinition();
    132 
    133 // leptons
     137  // leptons
    134138  G4Electron::ElectronDefinition();
    135139  G4Positron::PositronDefinition();
    … …  
    142146  G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); 
    143147
    144 // mesons
     148  // mesons
    145149  G4PionPlus::PionPlusDefinition();
    146150  G4PionMinus::PionMinusDefinition();
    … …  
    155159  G4KaonZeroShort::KaonZeroShortDefinition();
    156160
    157 // barions
     161  // barions
    158162  G4Proton::ProtonDefinition();
    159163  G4AntiProton::AntiProtonDefinition();
    … …  
    161165  G4AntiNeutron::AntiNeutronDefinition();
    162166
    163 // ions
     167  // ions
    164168  G4Deuteron::DeuteronDefinition();
    165169  G4Triton::TritonDefinition();
    … …  
    170174
    171175//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    172 
    173 #include "G4ProcessManager.hh"
    174176
    175177void PhysicsList::ConstructProcess()
    … …  
    202204  if (name == emName) return;
    203205
    204   if (name == "standard") {
     206  if (name == "local") {
    205207
    206208    emName = name;
    … …  
    208210    emPhysicsList = new PhysListEmStandard(name);
    209211   
    210   } else if (name == "emstandard") {
     212  } else if (name == "emstandard_opt0") {
    211213
    212214    emName = name;
    … …  
    226228    emPhysicsList = new G4EmStandardPhysics_option2();
    227229
    228   } else if (name == "livermore") {
    229 
    230     emName = name;
    231     delete emPhysicsList;
    232     emPhysicsList = new PhysListEmLivermore(name);
     230  } else if (name == "emstandard_opt3") {
     231
     232    emName = name;
     233    delete emPhysicsList;
     234    emPhysicsList = new G4EmStandardPhysics_option3();
    233235   
    234   } else if (name == "penelope") {
    235 
    236     emName = name;
    237     delete emPhysicsList;
    238     emPhysicsList = new PhysListEmPenelope(name);
    239        
     236  } else if (name == "empenelope"){
     237    emName = name;
     238    delete emPhysicsList;
     239    emPhysicsList = new G4EmPenelopePhysics();
     240
     241  } else if (name == "emlivermore"){
     242    emName = name;
     243    delete emPhysicsList;
     244    emPhysicsList = new G4EmLivermorePhysics();
     245
    240246  } else {
    241247
    … …  
    247253
    248254//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    249 
    250 #include "G4Decay.hh"
    251255
    252256void PhysicsList::AddDecay()
    … …  
    275279//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    276280
    277 #include "StepMax.hh"
    278 
    279281void PhysicsList::AddStepMax()
    280282{
    … …  
    295297
    296298//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    297 
    298 #include "G4Gamma.hh"
    299 #include "G4Electron.hh"
    300 #include "G4Positron.hh"
    301299
    302300void PhysicsList::SetCuts()

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

    r807 r1230  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.5 2006/06/29 16:50:41 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/TestEm2/src/PrimaryGeneratorAction.cc

    r807 r1230  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:50:44 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/TestEm2/src/RunAction.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.21 2006/06/29 16:50:47 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: RunAction.cc,v 1.24 2009/09/16 18:07:30 maire Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    8787   
    8888  histoName[0] = "testem2";
    89   histoType    = "hbook"; 
     89  histoType    = "root";
    9090}
    9191
    … …  
    112112  G4bool readOnly  = false;
    113113  G4bool createNew = true;
    114   G4String options = "--noErrors uncompress";
     114  G4String options = "--noErrors export=root uncompress";
    115115  AIDA::ITreeFactory* tf  = af->createTreeFactory(); 
    116116  tree = tf->create(histoName[1], histoType, readOnly, createNew, options);
    … …  
    291291#ifdef G4ANALYSIS_USE
    292292    if(tree) {
    293       G4double bin = i*dLradl;
     293      G4double bin = (i+0.5)*dLradl;
    294294      histo[3]->fill(bin,MeanELongit[i]/dLradl);
    295295      bin = (i+1)*dLradl;
    … …  
    319319#ifdef G4ANALYSIS_USE
    320320    if(tree) {
    321       G4double bin = i*dRradl;
     321      G4double bin = (i+0.5)*dRradl;
    322322      histo[6]->fill(bin,MeanERadial[i]/dRradl);
    323323      bin = (i+1)*dRradl;

  • trunk/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: RunActionMessenger.cc,v 1.4 2006/06/29 16:50:50 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/TestEm2/src/StepMax.cc

    r807 r1230  
    2525//
    2626// $Id: StepMax.cc,v 1.2 2006/06/29 16:50: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/TestEm2/src/StepMaxMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:50:54 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/TestEm2/src/SteppingAction.cc

    r807 r1230  
    2525//
    2626// $Id: SteppingAction.cc,v 1.6 2006/06/29 16:50:57 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/TestEm2/src/SteppingVerbose.cc

    r807 r1230  
    2525//
    2626// $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:50:59 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/TestEm2/src/TrackingAction.cc

    r807 r1230  
    2525//
    2626// $Id: TrackingAction.cc,v 1.3 2006/06/29 16:51:01 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.