Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (16 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/physics_lists/builders/src
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/physics_lists/builders/src/G4DecayPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4DecayPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4ElectroNuclearBuilder.cc

    r825 r850  
    2525//
    2626// $Id: G4ElectroNuclearBuilder.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4EmExtraPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4EmExtraPhysics.cc,v 1.3 2008/01/08 10:36:32 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4EmMessenger.cc

    r825 r850  
    2525//
    2626// $Id: G4EmMessenger.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics.cc,v 1.9 2007/05/18 17:47:17 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: G4EmStandardPhysics.cc,v 1.13 2008/04/22 18:28:37 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3939// 13.02.2007 V.Ivanchenko use G4hMultipleScattering for muons
    4040// 13.02.2007 V.Ivanchenko set skin=0.0
     41// 21.04.2008 V.Ivanchenko add long-lived D and B mesons
    4142//
    4243//----------------------------------------------------------------------------
    … …  
    177178      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
    178179
    179     } else if (particleName == "anti_omega-" ||
     180    } else if (particleName == "B+" ||
     181               particleName == "B-" ||
     182               particleName == "D+" ||
     183               particleName == "D-" ||
     184               particleName == "Ds+" ||
     185               particleName == "Ds-" ||
     186               particleName == "anti_lambda_c+" ||
     187               particleName == "anti_omega-" ||
    180188               particleName == "anti_proton" ||
    181189               particleName == "anti_sigma+" ||
    182190               particleName == "anti_sigma-" ||
     191               particleName == "anti_xi_c+" ||
    183192               particleName == "anti_xi-" ||
    184193               particleName == "deuteron" ||
    185194               particleName == "kaon+" ||
    186195               particleName == "kaon-" ||
     196               particleName == "lambda_c+" ||
    187197               particleName == "omega-" ||
    188198               particleName == "pi+" ||
    … …  
    194204               particleName == "tau-" ||
    195205               particleName == "triton" ||
     206               particleName == "xi_c+" ||
    196207               particleName == "xi-" ) {
    197208

  • trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option1.cc,v 1.3 2007/06/11 15:07:38 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: G4EmStandardPhysics_option1.cc,v 1.7 2008/04/22 18:28:38 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4141// 13.02.2007 V.Ivanchenko set skin=0.0
    4242// 15.05.2007 V.Ivanchenko rename to _option1
     43// 21.04.2008 V.Ivanchenko add long-lived D and B mesons
    4344//
    4445//----------------------------------------------------------------------------
    … …  
    189190      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
    190191
    191     } else if (particleName == "anti_omega-" ||
     192    } else if (particleName == "B+" ||
     193               particleName == "B-" ||
     194               particleName == "D+" ||
     195               particleName == "D-" ||
     196               particleName == "Ds+" ||
     197               particleName == "Ds-" ||
     198               particleName == "anti_lambda_c+" ||
     199               particleName == "anti_omega-" ||
    192200               particleName == "anti_proton" ||
    193201               particleName == "anti_sigma+" ||
    194202               particleName == "anti_sigma-" ||
     203               particleName == "anti_xi_c+" ||
    195204               particleName == "anti_xi-" ||
    196205               particleName == "deuteron" ||
    197206               particleName == "kaon+" ||
    198207               particleName == "kaon-" ||
     208               particleName == "lambda_c+" ||
    199209               particleName == "omega-" ||
    200210               particleName == "pi+" ||
    … …  
    206216               particleName == "tau-" ||
    207217               particleName == "triton" ||
     218               particleName == "xi_c+" ||
    208219               particleName == "xi-" ) {
    209220

  • trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option2.cc,v 1.3 2007/10/02 11:18:02 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: G4EmStandardPhysics_option2.cc,v 1.11 2008/08/05 10:24:44 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4040// 13.02.2007 V.Ivanchenko use default msc
    4141// 15.05.2007 V.Ivanchenko rename to _option2
     42// 13.03.2008 V.Ivanchenko use G4eMultipleScattering
     43// 21.04.2008 V.Ivanchenko add long-lived D and B mesons; use spline
     44// 28.05.2008 V.Ivanchenko linLossLimit=0.01; added hBrem and hPairProd processes
    4245//
    4346//----------------------------------------------------------------------------
    … …  
    4548
    4649#include "G4EmStandardPhysics_option2.hh"
     50
    4751#include "G4ParticleDefinition.hh"
    4852#include "G4ProcessManager.hh"
    … …  
    5458#include "G4PhotoElectricEffect.hh"
    5559
    56 #include "G4MultipleScattering.hh"
     60#include "G4eMultipleScattering.hh"
    5761#include "G4hMultipleScattering.hh"
     62#include "G4MuMultipleScattering.hh"
     63#include "G4CoulombScattering.hh"
    5864
    5965#include "G4eIonisation.hh"
    … …  
    6470#include "G4MuBremsstrahlung.hh"
    6571#include "G4MuPairProduction.hh"
     72#include "G4hBremsstrahlung.hh"
     73#include "G4hPairProduction.hh"
    6674
    6775#include "G4hIonisation.hh"
    … …  
    135143{
    136144  // Add standard EM Processes
    137   G4MultipleScattering* msc = 0;
    138145
    139146  theParticleIterator->reset();
    … …  
    154161    } else if (particleName == "e-") {
    155162
    156       msc = new G4MultipleScattering();
    157       pmanager->AddProcess(msc,                   -1, 1, 1);
    158       pmanager->AddProcess(new G4eIonisation,     -1, 2, 2);
    159       pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3);
     163      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
     164      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     165      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
     166      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    160167
    161168    } else if (particleName == "e+") {
    162169
    163       msc = new G4MultipleScattering();
    164       pmanager->AddProcess(msc,                     -1, 1, 1);
    165       pmanager->AddProcess(new G4eIonisation,       -1, 2, 2);
    166       pmanager->AddProcess(new G4eBremsstrahlung,   -1,-3, 3);
    167       pmanager->AddProcess(new G4eplusAnnihilation,  0,-1, 4);
     170      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
     171      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
     172      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
     173      pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
     174      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    168175
    169176    } else if (particleName == "mu+" ||
    170177               particleName == "mu-"    ) {
    171178
    172       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     179      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
    173180      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
    174181      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
    175182      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
     183      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    176184
    177185    } else if (particleName == "alpha" ||
    … …  
    182190      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
    183191
    184     } else if (particleName == "anti_omega-" ||
     192    } else if (particleName == "pi+" ||
     193               particleName == "pi-" ||
     194               particleName == "proton" ) {
     195
     196      pmanager->AddProcess(new G4MuMultipleScattering, -1, 1, 1);
     197      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
     198      pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
     199      pmanager->AddProcess(new G4hPairProduction,     -1,-4, 4);
     200
     201    } else if (particleName == "B+" ||
     202               particleName == "B-" ||
     203               particleName == "D+" ||
     204               particleName == "D-" ||
     205               particleName == "Ds+" ||
     206               particleName == "Ds-" ||
     207               particleName == "anti_lambda_c+" ||
     208               particleName == "anti_omega-" ||
    185209               particleName == "anti_proton" ||
    186210               particleName == "anti_sigma+" ||
    187211               particleName == "anti_sigma-" ||
     212               particleName == "anti_xi_c+" ||
    188213               particleName == "anti_xi-" ||
    189214               particleName == "deuteron" ||
    190                particleName == "kaon+" ||
     215               particleName == "kaon+" ||
    191216               particleName == "kaon-" ||
     217               particleName == "lambda_c+" ||
    192218               particleName == "omega-" ||
    193                particleName == "pi+" ||
    194                particleName == "pi-" ||
    195                particleName == "proton" ||
    196219               particleName == "sigma+" ||
    197220               particleName == "sigma-" ||
    … …  
    199222               particleName == "tau-" ||
    200223               particleName == "triton" ||
     224               particleName == "xi_c+" ||
    201225               particleName == "xi-" ) {
    202226
    … …  
    205229    }
    206230  }
     231   
     232  // Em options
     233  //   
    207234  G4EmProcessOptions opt;
    208235  opt.SetVerbose(verbose);
    209   opt.SetSubCutoff(true);
    210   opt.SetMinEnergy(0.1*keV);
    211   opt.SetMaxEnergy(10.*TeV);
    212   opt.SetDEDXBinning(220);
    213   opt.SetLambdaBinning(220);
    214   opt.SetLinearLossLimit(1.e-6);
     236  opt.SetApplyCuts(true);
     237 
     238  // Physics tables
     239  //
     240  opt.SetMinEnergy(100*eV);
     241  opt.SetMaxEnergy(100*TeV);
     242  opt.SetDEDXBinning(120);
     243  opt.SetLambdaBinning(120);
     244  opt.SetSplineFlag(true);
     245  opt.SetPolarAngleLimit(0.2);
     246 
     247  // Energy loss
     248  //
     249  opt.SetLinearLossLimit(0.01);
     250 
     251  // Ionization
     252  //
     253  //opt.SetSubCutoff(true); 
    215254}
    216255

  • trunk/source/physics_lists/builders/src/G4HadronDElasticPhysics.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronDElasticPhysics.cc,v 1.2 2007/11/14 18:45:37 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronDElasticPhysics.cc,v 1.3 2008/05/19 10:21:34 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363#include "G4Neutron.hh"
    6464
    65 #include "G4HadronProcessStore.hh"
    6665#include "G4VQCrossSection.hh"
    6766#include "G4UElasticCrossSection.hh"
    … …  
    9796  if(wasActivated) return;
    9897  wasActivated = true;
    99 
    100   G4HadronProcessStore* store = G4HadronProcessStore::Instance();
    10198
    10299  if(verbose > 1)
    … …  
    155152      hel->RegisterMe(model);
    156153      hel->RegisterMe(he);
    157       store->Register(hel,particle,he,"elastic");
    158       store->Register(hel,particle,model,mname);
    159154      pmanager->AddDiscreteProcess(hel);
    160155
    … …  
    171166        G4NeutronHPElastic* modelHP = new G4NeutronHPElastic();
    172167        hel->RegisterMe(modelHP);
    173         store->Register(hel,particle,modelHP,"HP");
    174168        hel->AddDataSet(new G4NeutronHPElasticData());
    175169      } else {
    176170        hel->RegisterMe(he);
    177         store->Register(hel,particle,he,"elastic");
    178171      }
    179172      hel->RegisterMe(model);
    180       store->Register(hel,particle,model,mname);
    181173      pmanager->AddDiscreteProcess(hel);
    182174

  • trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronElasticPhysics.cc,v 1.7 2007/03/06 17:52:06 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronElasticPhysics.cc,v 1.8 2008/05/19 10:21:34 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6262#include "G4Neutron.hh"
    6363
    64 #include "G4HadronProcessStore.hh"
    6564#include "G4VQCrossSection.hh"
    6665#include "G4UElasticCrossSection.hh"
    … …  
    103102  wasActivated = true;
    104103
    105   G4HadronProcessStore* store = G4HadronProcessStore::Instance();
    106 
    107   if(verbose > 1)
     104  if(verbose > 1) {
    108105    G4cout << "### HadronElasticPhysics Construct Processes with the model <"
    109106           << mname << ">" << G4endl;
    110 
     107  }
    111108  G4HadronicProcess* hel = 0;
    112109  G4VQCrossSection* man = 0;
    … …  
    161158      }
    162159      hel->RegisterMe(model);
    163       store->Register(hel,particle,model,mname);
    164160      pmanager->AddDiscreteProcess(hel);
    165161
    … …  
    186182        neutronHPModel = new G4NeutronHPElastic();
    187183        hel->RegisterMe(neutronHPModel);
    188         store->Register(hel,particle,neutronHPModel,"HP");
    189184        hel->AddDataSet(new G4NeutronHPElasticData());
    190185      }
    191186
    192187      hel->RegisterMe(neutronModel);
    193       store->Register(hel,particle,neutronModel,mname);
    194188      pmanager->AddDiscreteProcess(hel);
    195189

  • trunk/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronHElasticPhysics.cc,v 1.4 2007/11/15 18:08:11 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronHElasticPhysics.cc,v 1.5 2008/05/19 10:21:34 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5555#include "G4Neutron.hh"
    5656
    57 #include "G4HadronProcessStore.hh"
    5857#include "G4VQCrossSection.hh"
    5958#include "G4UElasticCrossSection.hh"
    … …  
    9796  wasActivated = true;
    9897
    99   G4HadronProcessStore* store = G4HadronProcessStore::Instance();
    100  
    10198  G4double elimit = 0.4*GeV;
    10299  //G4double elimit = 0.0;
    … …  
    157154      }
    158155      hel->RegisterMe(model);
    159       store->Register(hel,particle,model,mname);
    160156      pmanager->AddDiscreteProcess(hel);
    161157
    … …  
    176172        neutronHPModel = new G4NeutronHPElastic();
    177173        hel->RegisterMe(neutronHPModel);
    178         store->Register(hel,particle,neutronHPModel,"HP");
    179174        hel->AddDataSet(new G4NeutronHPElasticData());
    180175      }
    181176
    182177      hel->RegisterMe(neutronModel);
    183       store->Register(hel,particle,neutronModel,mname);
    184178      pmanager->AddDiscreteProcess(hel);
    185179

  • trunk/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronQElasticPhysics.cc,v 1.6 2006/11/29 14:33:30 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4HadronQElasticPhysics.cc,v 1.7 2008/05/19 10:21:34 vnivanch Exp $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4545#include "G4QElastic.hh"
    4646
    47 #include "G4HadronProcessStore.hh"
    4847#include "G4VQCrossSection.hh"
    4948
    … …  
    8584  if(wasActivated) return;
    8685  wasActivated = true;
    87 
    88   G4HadronProcessStore* store = G4HadronProcessStore::Instance();
    8986
    9087  G4double elimit = DBL_MAX;
    … …  
    132129      hel->SetQElasticCrossSection(man);
    133130      hel->RegisterMe(model);
    134       store->Register(hel,particle,model,mname);
    135131      pmanager->AddDiscreteProcess(hel);
    136132

  • trunk/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4IonBinaryCascadePhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4IonPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// GEANT4 tag $Name: HEAD $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4LEPPiKBuilder.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: $
     26// GEANT4 tag $Name: HEAD $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4LEPProtonBuilder.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: $
     26// GEANT4 tag $Name: HEAD $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4LHEPStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: $
     26// GEANT4 tag $Name: HEAD $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4NeutronBuilder.cc

    r825 r850  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: $
     26// GEANT4 tag $Name: HEAD $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4NeutronTrackingCut.cc

    r825 r850  
    2525//
    2626// $Id: G4NeutronTrackingCut.cc,v 1.4 2006/11/24 16:30:13 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4PiKBuilder.cc

    r825 r850  
    2525//
    2626// $Id: G4PiKBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4ProtonBuilder.cc

    r825 r850  
    2525//
    2626// $Id: G4ProtonBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4QEmExtraPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4QEmExtraPhysics.cc,v 1.1 2007/05/23 17:38:35 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4QStoppingPhysics.cc

    r825 r850  
    2525//
    2626// $Id: G4QStoppingPhysics.cc,v 1.2 2007/04/26 16:03:18 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc

    r825 r850  
    2525//
    2626// $Id: G4StoppingHadronBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929//---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.