Ignore:
Timestamp:
Jun 18, 2010, 11:42:07 AM (14 years ago)
Author:
garnier
Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:
trunk/source/physics_lists/lists/src
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/physics_lists/lists/src/CVS/Entries

    r1273 r1315  
    1 /G4HadronInelasticQLHEP.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    2 /G4VHadronPhysics.cc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    3 /HadronPhysicsCHIPS.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    4 /HadronPhysicsFTFC.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    5 /HadronPhysicsFTFP.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    6 /HadronPhysicsFTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    7 /HadronPhysicsFTFP_BERT_TRV.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    8 /HadronPhysicsFTF_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    9 /HadronPhysicsLHEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    10 /HadronPhysicsLHEP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    11 /HadronPhysicsLHEP_BERT_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    12 /HadronPhysicsLHEP_EMV.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    13 /HadronPhysicsLHEP_PRECO_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    14 /HadronPhysicsQGSC.cc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    15 /HadronPhysicsQGSC_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    16 /HadronPhysicsQGSC_CHIPS.cc/1.6/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    17 /HadronPhysicsQGSC_EFLOW.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    18 /HadronPhysicsQGSC_QGSC.cc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    19 /HadronPhysicsQGSP.cc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    20 /HadronPhysicsQGSP_BERT.cc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    21 /HadronPhysicsQGSP_BERT_CHIPS.cc/1.1/Wed May 26 15:06:49 2010//Tphys-lists-V09-03-03
    22 /HadronPhysicsQGSP_BERT_HP.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    23 /HadronPhysicsQGSP_BERT_NOLEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    24 /HadronPhysicsQGSP_BERT_TRV.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    25 /HadronPhysicsQGSP_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    26 /HadronPhysicsQGSP_BIC_HP.cc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    27 /HadronPhysicsQGSP_FTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    28 /HadronPhysicsQGSP_INCL_ABLA.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    29 /HadronPhysicsQGS_BIC.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    30 /MaxTimeCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    31 /MinEkineCuts.cc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    32 /SpecialCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
    33 /G4HadronInelasticQBBC.cc/1.26/Thu May 27 08:12:15 2010//Tphys-lists-V09-03-03
    34 /G4PhysListFactory.cc/1.13/Thu May 27 08:12:15 2010//Tphys-lists-V09-03-03
    35 /QBBC.cc/1.5/Thu May 27 08:12:15 2010//Tphys-lists-V09-03-03
     1/G4PhysListFactory.cc/1.13/Thu May 27 08:12:15 2010//Tgeant4-09-04-beta-cand-01
     2/G4VHadronPhysics.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-04-beta-cand-01
     3/MaxTimeCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-04-beta-cand-01
     4/MinEkineCuts.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-04-beta-cand-01
     5/SpecialCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-04-beta-cand-01
     6/G4HadronInelasticQBBC.cc/1.28/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     7/G4HadronInelasticQLHEP.cc/1.4/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     8/HadronPhysicsCHIPS.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     9/HadronPhysicsFTFC.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     10/HadronPhysicsFTFP.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     11/HadronPhysicsFTFP_BERT.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     12/HadronPhysicsFTFP_BERT_TRV.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     13/HadronPhysicsFTF_BIC.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     14/HadronPhysicsLHEP.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     15/HadronPhysicsLHEP_BERT.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     16/HadronPhysicsLHEP_BERT_HP.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     17/HadronPhysicsLHEP_EMV.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     18/HadronPhysicsLHEP_PRECO_HP.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     19/HadronPhysicsQGSC.cc/1.4/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     20/HadronPhysicsQGSC_BERT.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     21/HadronPhysicsQGSC_CHIPS.cc/1.7/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     22/HadronPhysicsQGSC_EFLOW.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     23/HadronPhysicsQGSC_QGSC.cc/1.5/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     24/HadronPhysicsQGSP.cc/1.5/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     25/HadronPhysicsQGSP_BERT.cc/1.4/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     26/HadronPhysicsQGSP_BERT_CHIPS.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     27/HadronPhysicsQGSP_BERT_HP.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     28/HadronPhysicsQGSP_BERT_NOLEP.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     29/HadronPhysicsQGSP_BERT_TRV.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     30/HadronPhysicsQGSP_BIC.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     31/HadronPhysicsQGSP_BIC_HP.cc/1.4/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     32/HadronPhysicsQGSP_FTFP_BERT.cc/1.3/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     33/HadronPhysicsQGSP_INCL_ABLA.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     34/HadronPhysicsQGS_BIC.cc/1.2/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
     35/QBBC.cc/1.7/Fri Jun 18 08:36:41 2010//Tgeant4-09-04-beta-cand-01
    3636D

  • trunk/source/physics_lists/lists/src/CVS/Tag

    r1273 r1315  
    1 Nphys-lists-V09-03-03
     1Ngeant4-09-04-beta-cand-01

  • trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc

    r1273 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.cc,v 1.26 2010/05/19 18:14:16 vnivanch Exp $
    27 // GEANT4 tag $Name: phys-lists-V09-03-03 $
     26// $Id: G4HadronInelasticQBBC.cc,v 1.28 2010/06/04 13:48:51 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4848#include "G4BGGNucleonInelasticXS.hh"
    4949#include "G4BGGPionInelasticXS.hh"
    50 //#include "G4UInelasticCrossSection.hh"
     50
    5151#include "G4NeutronInelasticXS.hh"
    5252#include "G4NeutronCaptureXS.hh"
    … …  
    7474enum QBBCType
    7575{
    76   fQBBC = 0,
    77   fQBBC_XGG,
    78   fQBBC_XGGSN
     76  fQBBC = 0,     // default QBBC
     77  fQBBC_XGG,     // neutron x-sections from BGG
     78  fQBBC_XGGSN    // n, p, pi+- x-sections from QGSP_BERT
    7979};
     80
     81G4HadronInelasticQBBC::G4HadronInelasticQBBC(G4int ver)
     82  : G4VHadronPhysics("hInelastic"),verbose(ver),wasActivated(false)
     83{
     84  htype = "QBBC";
     85  theHandler = 0;
     86  theEvaporation = 0;
     87}
    8088
    8189G4HadronInelasticQBBC::G4HadronInelasticQBBC(const G4String& name, G4int ver,
    … …  
    109117  }
    110118
    111   // PreCompound and Evaporation models
     119  // PreCompound and Evaporation models are instantiated here
    112120  theEvaporation = new G4Evaporation();
    113121  theEvaporation->SetCombinedChannel();
    … …  
    135143  G4HadronicInteraction* theBIC = NewModel(bic,0.0,1.5*GeV);
    136144
    137   //  G4HadronicInteraction* theCHIPS =
    138   //  NewModel(new G4QStringChipsParticleLevelInterface(),0.0,7.5*GeV);
    139 
    140145  G4QInelastic* theCHIPS = new G4QInelastic();
    141146  G4HadronicProcessStore* store = G4HadronicProcessStore::Instance();
    … …  
    148153    G4String pname = particle->GetParticleName();
    149154    G4ProcessManager* pmanager = particle->GetProcessManager();
    150     if(verbose > 1) { G4cout << "### HadronInelasticQBBC:  " << pname << G4endl; }
     155    if(verbose > 1) {
     156      G4cout << "### HadronInelasticQBBC:  " << pname << G4endl;
     157    }
    151158
    152159    //
    … …  
    155162    if(pname == "proton") {
    156163      G4HadronicProcess* hp = FindInelasticProcess(particle);
    157       if(fType == fQBBC) {
     164      if(fType == fQBBC_XGGSN) {
    158165        hp->AddDataSet(new G4ProtonInelasticCrossSection());
    159166      } else {
    … …  
    168175      G4HadronicProcess* hp = FindInelasticProcess(particle);
    169176      if(fType == fQBBC) {
    170         hp->AddDataSet(new G4NeutronInelasticCrossSection());
     177        hp->AddDataSet(new G4NeutronInelasticXS());
    171178      } else if(fType == fQBBC_XGG) {
    172179        hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
    173180      } else {
    174         hp->AddDataSet(new G4NeutronInelasticXS());
     181        hp->AddDataSet(new G4NeutronInelasticCrossSection());
    175182      }
    176183
    … …  
    184191      capture->RegisterMe(new G4NeutronRadCapture());
    185192      //capture->RegisterMe(new G4LCapture());
    186       if(fType == fQBBC_XGGSN) {
     193      if(fType == fQBBC) {
    187194        capture->AddDataSet(new G4NeutronCaptureXS());
    188195      }
    … …  
    190197    } else if(pname == "pi-" || pname == "pi+") {
    191198      G4HadronicProcess* hp = FindInelasticProcess(particle);
    192       if(fType == fQBBC) {
     199      if(fType == fQBBC_XGGSN) {
    193200        hp->AddDataSet(new G4PiNuclearCrossSection());
    194201      } else {

  • trunk/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQLHEP.cc,v 1.2 2008/05/19 10:21:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronInelasticQLHEP.cc,v 1.4 2010/06/08 08:58:03 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    114114#include "G4HEXiZeroInelastic.hh"
    115115
    116 G4HadronInelasticQLHEP::G4HadronInelasticQLHEP(const G4String& name,
     116G4HadronInelasticQLHEP::G4HadronInelasticQLHEP(G4int ver)
     117  : G4VPhysicsConstructor("hInelasticQLHEP"), verbose(ver), qgsFlag(false),
     118    bertFlag(false), bicFlag(false), hpFlag(false), wasActivated(false)
     119{
     120  if(verbose > 1) G4cout << "### HadronInelasticQLHEP" << G4endl;
     121  theCascade = 0;
     122  theQGStringDecay = 0;
     123  theQGStringModel = 0;
     124  thePreEquilib = 0;
     125  theHPXSecI = 0;
     126  theHPXSecC = 0;
     127  theHPXSecF = 0;
     128}
     129
     130G4HadronInelasticQLHEP::G4HadronInelasticQLHEP(const G4String&,
    117131    G4int ver, G4bool qgs, G4bool bert, G4bool bic, G4bool hp)
    118   : G4VPhysicsConstructor(name), verbose(ver), qgsFlag(qgs),
     132  : G4VPhysicsConstructor("hInelasticQLHEP"), verbose(ver), qgsFlag(qgs),
    119133    bertFlag(bert), bicFlag(bic), hpFlag(hp), wasActivated(false)
    120134{

  • trunk/source/physics_lists/lists/src/HadronPhysicsCHIPS.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsCHIPS.cc,v 1.2 2009/11/20 10:24:28 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsCHIPS.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4848#include "G4BaryonConstructor.hh"
    4949#include "G4ShortLivedConstructor.hh"
     50
     51HadronPhysicsCHIPS::HadronPhysicsCHIPS(G4int)
     52:  G4VPhysicsConstructor( "CHIPS hadronic")
     53//  , verbosity(verbose)
     54{}
    5055
    5156HadronPhysicsCHIPS::HadronPhysicsCHIPS(const G4String& name):  G4VPhysicsConstructor(name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFC.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFC.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsFTFC::HadronPhysicsFTFC(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic FTFC")
     55                     , QuasiElastic(false)
     56{}
    5257
    5358HadronPhysicsFTFC::HadronPhysicsFTFC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsFTFP::HadronPhysicsFTFP(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic FTFP")
     55                     , QuasiElastic(false)
     56{}
    5257
    5358HadronPhysicsFTFP::HadronPhysicsFTFP(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP_BERT.cc,v 1.1 2007/10/19 15:35:08 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP_BERT.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52#include "G4QHadronInelasticDataSet.hh"
     53
     54HadronPhysicsFTFP_BERT::HadronPhysicsFTFP_BERT(G4int)
     55                    :  G4VPhysicsConstructor("hInelastic FTFP_BERT")
     56                     , QuasiElastic(false)
     57{}
    5158
    5259HadronPhysicsFTFP_BERT::HadronPhysicsFTFP_BERT(const G4String& name, G4bool quasiElastic)
    … …  
    7986  theBertiniPiK->SetMaxEnergy(5*GeV);
    8087 
    81   theMiscLHEP=new G4MiscLHEPBuilder;
     88  theMiscCHIPS=new G4MiscCHIPSBuilder;
    8289}
    8390
    … …  
    96103  delete theFTFPPro;   
    97104   
    98   delete theMiscLHEP;
     105  delete theMiscCHIPS;
     106  delete theCHIPSInelastic;
    99107}
    100108
    … …  
    118126  thePro->Build();
    119127  thePiK->Build();
    120   theMiscLHEP->Build();
     128  // use CHIPS cross sections also for Kaons
     129  theCHIPSInelastic = new G4QHadronInelasticDataSet();
     130 
     131  FindInelasticProcess(G4KaonMinus::KaonMinus())->AddDataSet(theCHIPSInelastic);
     132  FindInelasticProcess(G4KaonPlus::KaonPlus())->AddDataSet(theCHIPSInelastic);
     133  FindInelasticProcess(G4KaonZeroShort::KaonZeroShort())->AddDataSet(theCHIPSInelastic);
     134  FindInelasticProcess(G4KaonZeroLong::KaonZeroLong())->AddDataSet(theCHIPSInelastic);
     135
     136  theMiscCHIPS->Build();
     137}
     138G4HadronicProcess*
     139HadronPhysicsFTFP_BERT::FindInelasticProcess(const G4ParticleDefinition* p)
     140{
     141  G4HadronicProcess* had = 0;
     142  if(p) {
     143     G4ProcessVector*  pvec = p->GetProcessManager()->GetProcessList();
     144     size_t n = pvec->size();
     145     if(0 < n) {
     146       for(size_t i=0; i<n; ++i) {
     147         if(fHadronInelastic == ((*pvec)[i])->GetProcessSubType()) {
     148           had = static_cast<G4HadronicProcess*>((*pvec)[i]);
     149           break;
     150         }
     151       }
     152     }
     153  }
     154  return had;
    121155}
    122156

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT_TRV.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP_BERT_TRV.cc,v 1.1 2009/06/02 16:51:59 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP_BERT_TRV.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsFTFP_BERT_TRV::HadronPhysicsFTFP_BERT_TRV(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic FTFP_BERT_TRV")
     54                     , QuasiElastic(false)
     55{}
    5156
    5257HadronPhysicsFTFP_BERT_TRV::HadronPhysicsFTFP_BERT_TRV(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsFTF_BIC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTF_BIC.cc,v 1.2 2008/04/25 14:53:34 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTF_BIC.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4848#include "G4BaryonConstructor.hh"
    4949#include "G4ShortLivedConstructor.hh"
     50
     51HadronPhysicsFTF_BIC::HadronPhysicsFTF_BIC(G4int)
     52                    :  G4VPhysicsConstructor("hInelastic FTF_BIC")
     53                     , QuasiElastic(false)
     54{}
    5055
    5156HadronPhysicsFTF_BIC::HadronPhysicsFTF_BIC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsLHEP::HadronPhysicsLHEP(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic LHEP")
     54{}
    5155
    5256HadronPhysicsLHEP::HadronPhysicsLHEP(const G4String& name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_BERT.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_BERT.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5151#include "G4BaryonConstructor.hh"
    5252#include "G4ShortLivedConstructor.hh"
     53
     54HadronPhysicsLHEP_BERT::HadronPhysicsLHEP_BERT(G4int)
     55                    :  G4VPhysicsConstructor("hInelastic LHEP_BERT")
     56{}
    5357
    5458HadronPhysicsLHEP_BERT::HadronPhysicsLHEP_BERT(const G4String& name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsLHEP_BERT_HP::HadronPhysicsLHEP_BERT_HP(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic LHEP_BERT_HP")
     55{}
    5256
    5357HadronPhysicsLHEP_BERT_HP::HadronPhysicsLHEP_BERT_HP(const G4String& name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_EMV.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_EMV.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4444#include "G4ios.hh"
    4545#include <iomanip>   
     46
     47HadronPhysicsLHEP_EMV::HadronPhysicsLHEP_EMV(G4int)
     48                    :  G4VPhysicsConstructor("hInelastic LHEP_EMV")
     49{}
    4650
    4751HadronPhysicsLHEP_EMV::HadronPhysicsLHEP_EMV(const G4String& name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsLHEP_PRECO_HP::HadronPhysicsLHEP_PRECO_HP(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic LHEP_PRECO_HP")
     55{}
    5256
    5357HadronPhysicsLHEP_PRECO_HP::HadronPhysicsLHEP_PRECO_HP(const G4String& name)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC.cc,v 1.3 2009/03/12 12:19:44 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC.cc,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5151#include "G4BaryonConstructor.hh"
    5252#include "G4ShortLivedConstructor.hh"
     53
     54HadronPhysicsQGSC::HadronPhysicsQGSC(G4int)
     55                    :  G4VPhysicsConstructor("hInelastic QGSC")
     56                     , QuasiElastic(true)
     57{}
    5358
    5459HadronPhysicsQGSC::HadronPhysicsQGSC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_BERT.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_BERT.cc,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_BERT.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsQGSC_BERT::HadronPhysicsQGSC_BERT(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic QGSC_BERT")
     54                      , QuasiElastic(true)
     55{}
    5156
    5257HadronPhysicsQGSC_BERT::HadronPhysicsQGSC_BERT(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_CHIPS.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_CHIPS.cc,v 1.6 2009/04/17 15:29:19 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_CHIPS.cc,v 1.7 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6767#include "G4BaryonConstructor.hh"
    6868#include "G4ShortLivedConstructor.hh"
     69
     70HadronPhysicsQGSC_CHIPS::HadronPhysicsQGSC_CHIPS(G4int)
     71                    :  G4VPhysicsConstructor("hInelastic QGSC_CHIPS")
     72                     , QuasiElastic(true)
     73{}
    6974
    7075HadronPhysicsQGSC_CHIPS::HadronPhysicsQGSC_CHIPS(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsQGSC_EFLOW::HadronPhysicsQGSC_EFLOW(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic QGSC_EFLOW")
     55                     , QuasiElastic(true)
     56{}
    5257
    5358HadronPhysicsQGSC_EFLOW::HadronPhysicsQGSC_EFLOW(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_QGSC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_QGSC.cc,v 1.4 2009/04/14 07:23:08 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_QGSC.cc,v 1.5 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsQGSC_QGSC::HadronPhysicsQGSC_QGSC(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic QGSC_QGSC")
     54                     , QuasiElastic(true)
     55{}
    5156
    5257HadronPhysicsQGSC_QGSC::HadronPhysicsQGSC_QGSC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP.cc

    r1228 r1315  
    2525//
    2626//
    27 // $Id: HadronPhysicsQGSP.cc,v 1.4 2007/11/13 10:16:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: HadronPhysicsQGSP.cc,v 1.5 2010/06/03 10:42:44 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    5252#include "G4BaryonConstructor.hh"
    5353#include "G4ShortLivedConstructor.hh"
     54
     55HadronPhysicsQGSP::HadronPhysicsQGSP(G4int)
     56                 :  G4VPhysicsConstructor("hInelastic QGSP")
     57                  , QuasiElastic(true)
     58{
     59   ProjectileDiffraction=false;
     60}
    5461
    5562HadronPhysicsQGSP::HadronPhysicsQGSP(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT.cc,v 1.3 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT.cc,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353#include "G4BaryonConstructor.hh"
    5454#include "G4ShortLivedConstructor.hh"
     55
     56HadronPhysicsQGSP_BERT::HadronPhysicsQGSP_BERT(G4int)
     57                    :  G4VPhysicsConstructor("hInelastic QGSP_BERT")
     58                     , QuasiElastic(true)
     59{
     60   ProjectileDiffraction=false;
     61}
    5562
    5663HadronPhysicsQGSP_BERT::HadronPhysicsQGSP_BERT(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_CHIPS.cc

    r1274 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_CHIPS.cc,v 1.1 2010/05/26 15:06:49 gunter Exp $
    27 // GEANT4 tag $Name: phys-lists-V09-03-03 $
     26// $Id: HadronPhysicsQGSP_BERT_CHIPS.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5252
    5353#include "G4QHadronInelasticDataSet.hh"
     54
     55HadronPhysicsQGSP_BERT_CHIPS::HadronPhysicsQGSP_BERT_CHIPS(G4int)
     56                    :  G4VPhysicsConstructor("hInelastic QGSP_BERT_CHIPS")
     57                     , QuasiElastic(true)
     58{
     59   ProjectileDiffraction=false;
     60}
    5461
    5562HadronPhysicsQGSP_BERT_CHIPS::HadronPhysicsQGSP_BERT_CHIPS(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5252#include "G4BaryonConstructor.hh"
    5353#include "G4ShortLivedConstructor.hh"
     54
     55HadronPhysicsQGSP_BERT_HP::HadronPhysicsQGSP_BERT_HP(G4int)
     56                    :  G4VPhysicsConstructor("hInelastic QGSP_BERT_HP")
     57                     , QuasiElastic(true)
     58{}
    5459
    5560HadronPhysicsQGSP_BERT_HP::HadronPhysicsQGSP_BERT_HP(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_NOLEP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_NOLEP.cc,v 1.1 2008/10/17 12:43:21 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_NOLEP.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsQGSP_BERT_NOLEP::HadronPhysicsQGSP_BERT_NOLEP(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic QGSP_BERT_NOLEP")
     54                     , QuasiElastic(true)
     55{
     56   ProjectileDiffraction=false;
     57}
    5158
    5259HadronPhysicsQGSP_BERT_NOLEP::HadronPhysicsQGSP_BERT_NOLEP(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_TRV.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.2 2009/11/27 17:27:38 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4BaryonConstructor.hh"
    5151#include "G4ShortLivedConstructor.hh"
     52
     53HadronPhysicsQGSP_BERT_TRV::HadronPhysicsQGSP_BERT_TRV(G4int)
     54                    :  G4VPhysicsConstructor("hInelastic QGSP_BERT_TRV")
     55                     , QuasiElastic(true)
     56{}
    5257
    5358HadronPhysicsQGSP_BERT_TRV::HadronPhysicsQGSP_BERT_TRV(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BIC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BIC.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5151#include "G4BaryonConstructor.hh"
    5252#include "G4ShortLivedConstructor.hh"
     53
     54HadronPhysicsQGSP_BIC::HadronPhysicsQGSP_BIC(G4int)
     55                    :  G4VPhysicsConstructor("hInelastic QGSP_BIC")
     56                     , QuasiElastic(true)
     57{}
    5358
    5459HadronPhysicsQGSP_BIC::HadronPhysicsQGSP_BIC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.3 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5151#include "G4BaryonConstructor.hh"
    5252#include "G4ShortLivedConstructor.hh"
     53
     54HadronPhysicsQGSP_BIC_HP::HadronPhysicsQGSP_BIC_HP(G4int)
     55                    :  G4VPhysicsConstructor("hInelastic QGSP_BIC_HP")
     56                     , QuasiElastic(true)
     57{}
    5358
    5459HadronPhysicsQGSP_BIC_HP::HadronPhysicsQGSP_BIC_HP(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_FTFP_BERT.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_FTFP_BERT.cc,v 1.1 2009/04/23 19:04:18 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_FTFP_BERT.cc,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4747#include "G4BaryonConstructor.hh"
    4848#include "G4ShortLivedConstructor.hh"
     49
     50#include "G4QHadronInelasticDataSet.hh"
     51
     52HadronPhysicsQGSP_FTFP_BERT::HadronPhysicsQGSP_FTFP_BERT(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic QGSP_FTFP_BERT")
     54                     , QuasiElastic(true)
     55{
     56   ProjectileDiffraction=false;
     57}
    4958
    5059HadronPhysicsQGSP_FTFP_BERT::HadronPhysicsQGSP_FTFP_BERT(const G4String& name, G4bool quasiElastic)
    … …  
    112121  theBertiniPiK->SetMaxEnergy(maxBERT);  //  was (9.9*GeV);
    113122 
    114   theMiscLHEP=new G4MiscLHEPBuilder;
     123  theMiscCHIPS=new G4MiscCHIPSBuilder;
    115124}
    116125
    117126HadronPhysicsQGSP_FTFP_BERT::~HadronPhysicsQGSP_FTFP_BERT()
    118127{
    119    delete theMiscLHEP;
     128   delete theMiscCHIPS;
    120129   delete theQGSPNeutron;
    121130   delete theFTFPNeutron;
    … …  
    129138   delete theBertiniPiK;
    130139   delete thePiK;
     140   delete theCHIPSInelastic;
    131141}
    132142
    … …  
    150160  thePro->Build();
    151161  thePiK->Build();
    152   theMiscLHEP->Build();
     162  // use CHIPS cross sections also for Kaons
     163  theCHIPSInelastic = new G4QHadronInelasticDataSet();
     164 
     165  FindInelasticProcess(G4KaonMinus::KaonMinus())->AddDataSet(theCHIPSInelastic);
     166  FindInelasticProcess(G4KaonPlus::KaonPlus())->AddDataSet(theCHIPSInelastic);
     167  FindInelasticProcess(G4KaonZeroShort::KaonZeroShort())->AddDataSet(theCHIPSInelastic);
     168  FindInelasticProcess(G4KaonZeroLong::KaonZeroLong())->AddDataSet(theCHIPSInelastic);
     169
     170  theMiscCHIPS->Build();
    153171}
    154172
     173
     174G4HadronicProcess*
     175HadronPhysicsQGSP_FTFP_BERT::FindInelasticProcess(const G4ParticleDefinition* p)
     176{
     177  G4HadronicProcess* had = 0;
     178  if(p) {
     179     G4ProcessVector*  pvec = p->GetProcessManager()->GetProcessList();
     180     size_t n = pvec->size();
     181     if(0 < n) {
     182       for(size_t i=0; i<n; ++i) {
     183         if(fHadronInelastic == ((*pvec)[i])->GetProcessSubType()) {
     184           had = static_cast<G4HadronicProcess*>((*pvec)[i]);
     185           break;
     186         }
     187       }
     188     }
     189  }
     190  return had;
     191}

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_INCL_ABLA.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_INCL_ABLA.cc,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_INCL_ABLA.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353#include "G4BaryonConstructor.hh"
    5454#include "G4ShortLivedConstructor.hh"
     55
     56HadronPhysicsQGSP_INCL_ABLA::HadronPhysicsQGSP_INCL_ABLA(G4int)
     57                    :  G4VPhysicsConstructor("hInelastic QGSP_INCL_ABLA")
     58                     , QuasiElastic(true)
     59{
     60   ProjectileDiffraction=false;
     61}
    5562
    5663HadronPhysicsQGSP_INCL_ABLA::HadronPhysicsQGSP_INCL_ABLA(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/HadronPhysicsQGS_BIC.cc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGS_BIC.cc,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGS_BIC.cc,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4ShortLivedConstructor.hh"
     51
     52HadronPhysicsQGS_BIC::HadronPhysicsQGS_BIC(G4int)
     53                    :  G4VPhysicsConstructor("hInelastic QGS_BIC")
     54                     , QuasiElastic(true)
     55{}
    5156
    5257HadronPhysicsQGS_BIC::HadronPhysicsQGS_BIC(const G4String& name, G4bool quasiElastic)

  • trunk/source/physics_lists/lists/src/QBBC.cc

    r1273 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QBBC.cc,v 1.5 2009/12/29 17:54:25 vnivanch Exp $
    27 // GEANT4 tag $Name: phys-lists-V09-03-03 $
     26// $Id: QBBC.cc,v 1.7 2010/06/04 13:34:42 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353#include "G4HadronInelasticQBBC.hh"
    5454#include "G4HadronElasticPhysics.hh"
     55#include "G4HadronElasticPhysicsXS.hh"
     56#include "G4HadronElasticPhysicsHP.hh"
    5557#include "G4HadronDElasticPhysics.hh"
    5658#include "G4HadronHElasticPhysics.hh"
    … …  
    7072  // EM Physics
    7173  //RegisterPhysics( new G4EmStandardPhysics(ver));
    72   RegisterPhysics( new G4EmStandardPhysics_option2(ver));
     74  RegisterPhysics( new G4EmStandardPhysics_option2(ver) );
    7375
    7476  // Synchroton Radiation & GN Physics
    75   RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     77  RegisterPhysics( new G4EmExtraPhysics(ver) );
    7678
    7779  // Decays
    78   RegisterPhysics( new G4DecayPhysics("decay",ver) );
     80  RegisterPhysics( new G4DecayPhysics(ver) );
    7981
    8082   // Hadron Physics
    81   RegisterPhysics( new G4HadronHElasticPhysics(ver,false,type));
    82   //RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
    83   RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
    84   RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     83  if(type == "QBBC") {
     84    RegisterPhysics( new G4HadronElasticPhysics(ver) );
     85  } else if(type == "QBBC_XGG") {
     86    RegisterPhysics( new G4HadronHElasticPhysics(ver) );
     87  } else if(type == "QBBC_XGGSN") {
     88    RegisterPhysics( new G4HadronElasticPhysicsXS(ver) );
     89  } else if(type == "QBBC_HP") {
     90    RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );
     91  }
     92
     93  RegisterPhysics( new G4QStoppingPhysics(ver) );
     94  RegisterPhysics( new G4IonBinaryCascadePhysics(ver) );
     95
    8596  RegisterPhysics( new G4HadronInelasticQBBC(type, ver));
    8697
    8798  // Neutron tracking cut
    88   RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     99  RegisterPhysics( new G4NeutronTrackingCut(ver) );
    89100}               
    90101
Note: See TracChangeset for help on using the changeset viewer.