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/TestEm17/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

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

    r807 r1230  
    2626//
    2727// $Id: DetectorConstruction.cc,v 1.3 2007/05/12 16:33:53 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

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

  • trunk/examples/extended/electromagnetic/TestEm17/src/EventAction.cc

    r807 r1230  
    2525//
    2626// $Id: EventAction.cc,v 1.2 2006/06/29 16:48:53 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/TestEm17/src/EventActionMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:48: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/TestEm17/src/HistoManager.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: HistoManager.cc,v 1.2 2006/06/29 16:48:58 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: HistoManager.cc,v 1.4 2008/09/26 20:15:04 maire Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    5454 
    5555  fileName[0] = "testem17";
    56   fileType    = "hbook";
    57   fileOption  = "--noErrors uncompress";   
     56  fileType    = "root";
     57  fileOption  = "--noErrors export=root uncompress";   
    5858  // histograms
    5959  for (G4int k=0; k<MaxHisto; k++) {
    … …  
    164164  }
    165165 
    166   const G4String id[] = { "0", "1", "2", "3", "4"};
     166  const G4String id[] = { "0", "1", "2", "3", "4", "5", "6", "7"};
    167167  const G4String title[] =
    168168                { "dummy",                                              //0
    … …  
    170170                  "log10(Etransfert/Emu) Pair",                         //2
    171171                  "log10(Etransfert/Emu) Brems",                        //3
    172                   "log10(Etransfert/Emu) Nuclear"                       //4
     172                  "log10(Etransfert/Emu) Nuclear",                      //4
     173                  "log10(Etransfert/Emu) Ionization",                   //5
     174                  "log10(Etransfert/Emu) Pair",                         //6
     175                  "log10(Etransfert/Emu) Brems"                         //7
    173176                 };
    174177

  • trunk/examples/extended/electromagnetic/TestEm17/src/HistoMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: HistoMessenger.cc,v 1.2 2006/06/29 16:49:01 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/TestEm17/src/MuCrossSections.cc

    r807 r1230  
    2525//
    2626// $Id: MuCrossSections.cc,v 1.2 2006/06/29 16:49:03 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/TestEm17/src/MuNuclearBuilder.cc

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

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

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:49:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: PhysListEmStandard.cc,v 1.4 2008/05/07 13:57:56 maire Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3535#include "G4MuonPlus.hh"
    3636#include "G4MuonMinus.hh"
     37#include "G4PionPlus.hh"
     38#include "G4PionMinus.hh"
     39#include "G4Proton.hh"
    3740
    3841#include "G4ProcessManager.hh"
    … …  
    4043#include "G4MuBremsstrahlung.hh"
    4144#include "G4MuPairProduction.hh"
     45#include "G4hIonisation.hh"
     46#include "G4hBremsstrahlung.hh"
     47#include "G4hPairProduction.hh"
    4248#include "G4LossTableManager.hh"
    4349
    … …  
    5763void PhysListEmStandard::ConstructProcess()
    5864{
    59   // Common processes for mu+ and mu-
    60   //
    61   G4MuIonisation*       muioni = new G4MuIonisation();
    62   G4MuBremsstrahlung*   mubrem = new G4MuBremsstrahlung();
    63   G4MuPairProduction*   mupair = new G4MuPairProduction();
    64 
     65  // mu+
    6566  G4ParticleDefinition* particle = G4MuonPlus::MuonPlus();
    6667  G4ProcessManager* pmanager = particle->GetProcessManager();   
    67   //
    68   pmanager->AddProcess(muioni, -1, 2,2);
    69   pmanager->AddProcess(mubrem, -1,-1,3);
    70   pmanager->AddProcess(mupair, -1,-1,4);
     68  pmanager->AddProcess(new G4MuIonisation(),     -1, 2, 2);
     69  pmanager->AddProcess(new G4MuBremsstrahlung(), -1, 3, 3);
     70  pmanager->AddProcess(new G4MuPairProduction(), -1, 4, 4);
    7171
     72  // mu-
    7273  particle = G4MuonMinus::MuonMinus();
    7374  pmanager = particle->GetProcessManager();   
    74   //
    75   pmanager->AddProcess(muioni, -1, 2,2);
    76   pmanager->AddProcess(mubrem, -1,-1,3);
    77   pmanager->AddProcess(mupair, -1,-1,4);
    78    
     75  pmanager->AddProcess(new G4MuIonisation(),     -1, 2, 2);
     76  pmanager->AddProcess(new G4MuBremsstrahlung(), -1, 3, 3);
     77  pmanager->AddProcess(new G4MuPairProduction(), -1, 4, 4);
     78
     79  // pi+
     80  particle = G4PionPlus::PionPlus();
     81  pmanager = particle->GetProcessManager();   
     82  pmanager->AddProcess(new G4hIonisation(),     -1, 2, 2);
     83  pmanager->AddProcess(new G4hBremsstrahlung(), -1, 3, 3);
     84  pmanager->AddProcess(new G4hPairProduction(), -1, 4, 4);
     85
     86  // pi-
     87  particle = G4PionMinus::PionMinus();
     88  pmanager = particle->GetProcessManager();   
     89  pmanager->AddProcess(new G4hIonisation(),     -1, 2, 2);
     90  pmanager->AddProcess(new G4hBremsstrahlung(), -1, 3, 3);
     91  pmanager->AddProcess(new G4hPairProduction(), -1, 4, 4);
     92
     93  // proton
     94  particle = G4Proton::Proton();
     95  pmanager = particle->GetProcessManager();   
     96  pmanager->AddProcess(new G4hIonisation(),     -1, 2, 2);
     97  pmanager->AddProcess(new G4hBremsstrahlung(), -1, 3, 3);
     98  pmanager->AddProcess(new G4hPairProduction(), -1, 4, 4);
     99
    79100  //extend binning of PhysicsTables
    80101  //
    81   G4LossTableManager::Instance()->SetMaxEnergy(1000.0*PeV);
    82   G4LossTableManager::Instance()->SetDEDXBinning(220);
    83   G4LossTableManager::Instance()->SetLambdaBinning(220);
    84   G4LossTableManager::Instance()->SetVerbose(0);
     102  G4LossTableManager::Instance()->SetMinEnergy(100*eV); 
     103  G4LossTableManager::Instance()->SetMaxEnergy(1000*PeV);
     104  G4LossTableManager::Instance()->SetDEDXBinning(160);
     105  G4LossTableManager::Instance()->SetLambdaBinning(160);
     106  G4LossTableManager::Instance()->SetSplineFlag(true); 
     107  G4LossTableManager::Instance()->SetVerbose(1);
    85108}
    86109

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

    r807 r1230  
    2626//
    2727// $Id: PhysicsList.cc,v 1.4 2006/10/24 10:06:21 maire Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r807 r1230  
    2525//
    2626// $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:49:13 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/TestEm17/src/PrimaryGeneratorAction.cc

    r807 r1230  
    2525//
    2626// $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:49:15 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/TestEm17/src/RunAction.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.2 2006/06/29 16:49:17 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: RunAction.cc,v 1.4 2008/03/31 10:22:59 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    139139  //compute theoritical predictions
    140140  //
    141   totalCrossSection = 0.;
    142   for (size_t i=0; i< ProcCounter->size();i++) {
    143      G4String procName = (*ProcCounter)[i]->GetName();
    144      if (procName != "Transportation")
    145        totalCrossSection += ComputeTheory(procName, NbOfEvents);
    146   }
    147  
    148   MeanFreePath     = 1./totalCrossSection;
    149   massCrossSection = totalCrossSection/density;
    150  
    151   G4cout << " Theory:     "
    152          <<    "total CrossSection = " << totalCrossSection*cm << " /cm"
    153          << "\t MeanFreePath = "       << G4BestUnit(MeanFreePath,"Length")
    154          << "\t massicCrossSection = " << massCrossSection*g/cm2 << " cm2/g"
    155          << G4endl;
    156                  
     141  if(particle == "mu+" || particle == "mu-") {
     142    totalCrossSection = 0.;
     143    for (size_t i=0; i< ProcCounter->size();i++) {
     144      G4String procName = (*ProcCounter)[i]->GetName();
     145      if (procName != "Transportation")
     146        totalCrossSection += ComputeTheory(procName, NbOfEvents);
     147    }
     148 
     149    MeanFreePath     = 1./totalCrossSection;
     150    massCrossSection = totalCrossSection/density;
     151 
     152    G4cout << " Theory:     "
     153           <<    "total CrossSection = " << totalCrossSection*cm << " /cm"
     154           << "\t MeanFreePath = "       << G4BestUnit(MeanFreePath,"Length")
     155           << "\t massicCrossSection = " << massCrossSection*g/cm2 << " cm2/g"
     156           << G4endl;
     157  }
    157158                                                                   
    158159  G4cout.setf(mode,std::ios::floatfield);
    … …  
    183184
    184185  G4int id = 0; G4double cut = 0.;
    185   if (process == "muIoni")     {id = 1; cut =    GetEnergyCut(material,1); }
    186   if (process == "muPairProd") {id = 2; cut = 2*(GetEnergyCut(material,1)
     186  if (process == "muIoni")          {id = 1; cut =    GetEnergyCut(material,1);}
     187  else if (process == "muPairProd") {id = 2; cut = 2*(GetEnergyCut(material,1)
    187188                                                      + electron_mass_c2); }
    188   if (process == "muBrems")    {id = 3; cut =    GetEnergyCut(material,0); }
    189   if (process == "muNucl")      id = 4;
     189  else if (process == "muBrems")    {id = 3; cut =    GetEnergyCut(material,0);}
     190  else if (process == "muNucl")      id = 4;
     191  else if (process == "hIoni")      {id = 5; cut =    GetEnergyCut(material,1);}
     192  else if (process == "hPairProd")  {id = 6; cut = 2*(GetEnergyCut(material,1)
     193                                                      + electron_mass_c2); }
     194  else if (process == "hBrems")     {id = 7; cut =    GetEnergyCut(material,0);}
    190195  if (id == 0) return 0.;
    191196 

  • trunk/examples/extended/electromagnetic/TestEm17/src/StackingAction.cc

    r807 r1230  
    2525//
    2626// $Id: StackingAction.cc,v 1.2 2006/06/29 16:49: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/TestEm17/src/SteppingAction.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: SteppingAction.cc,v 1.2 2006/06/29 16:49:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: SteppingAction.cc,v 1.4 2008/03/31 10:22:59 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    7070
    7171  G4int id = 0;
    72   if (procName == "muIoni")     id = 1;
    73   if (procName == "muPairProd") id = 2;
    74   if (procName == "muBrems")    id = 3;
    75   if (procName == "muNucl")     id = 4;   
     72  if (procName == "muIoni")          id = 1;
     73  else if (procName == "muPairProd") id = 2;
     74  else if (procName == "muBrems")    id = 3;
     75  else if (procName == "muNucl")     id = 4;   
     76  else if (procName == "hIoni")      id = 5;
     77  else if (procName == "hPairProd")  id = 6;
     78  else if (procName == "hBrems")     id = 7;
    7679  histoManager->FillHisto(id,lgepsE);                 
    7780}

  • trunk/examples/extended/electromagnetic/TestEm17/src/SteppingVerbose.cc

    r807 r1230  
    2525//
    2626// $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:49:25 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.