Changeset 1273


Ignore:
Timestamp:
May 27, 2010, 10:22:31 AM (14 years ago)
Author:
garnier
Message:

cvs update phys-lists-V09-03-03

Location:
trunk/source/physics_lists
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/physics_lists/History

    r1228 r1273  
    1 q$Id: History,v 1.119 2009/12/04 13:09:12 gcosmo Exp $
     1q$Id: History,v 1.123 2010/05/26 15:06:32 gunter Exp $
    22-------------------------------------------------------------------
    33
     
    1515     * Reverse chronological order (last date on top), please *
    1616     ----------------------------------------------------------
     17
     1826-05-2010, G.Folger                    (phys-lists-V09-03-03)
     19- new physics list QGSP_BERT_CHIPS: Use CHIPS G4QInelastic for all
     20    "misc" particles, including anti-proton, anti-neutron  and hyperons.
     21    Also use interface to CHIPS cross sections G4QHadronInelasticDataSet
     22    for Kaons.
     23    added classes: QGSP_BERT_CHIPS, HadronPhysicsQGSP_BERT_CHIPS, and
     24                   G4MiscCHIPSBuilder
     25    modifed G4PhysListFactory to make new list available.
     26                     
     2719-05-2010, V.Ivanchenko                (phys-lists-V09-03-02)
     28- QBBC - disable multi fragmentation model of deexcitation
     29
     3012-04-2010, V.Ivanchenko                (phys-lists-V09-03-01)
     31- LBE - Substituted obsolete G4MultipleScattering by particle wise
     32        msc processes
     33
     3429-12-2009, V.Ivanchenko                (phys-lists-V09-03-00)
     35- QBBC - fixed hadron inelastic configuration; instantiated
     36         G4PreCompoundModel and its pointer propagated to
     37         all high energy models; use CHIPS for anti-protons
     38         to avoid crash in FTF
    1739
    184004-12-2009, K.Murakami                  (phys-lists-V09-02-46)
  • trunk/source/physics_lists/builders/include/G4FTFBuilder.hh

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4FTFBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4FTFBuilder.hh,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    4545class G4FTFModel;
    4646class G4ExcitedStringDecay;
     47class G4PreCompoundModel;
    4748
    4849class G4FTFBuilder : public G4VHadronModelBuilder
     
    5051public:
    5152
    52   G4FTFBuilder(const G4String& name ="");
     53  G4FTFBuilder(const G4String& name ="",
     54               G4PreCompoundModel* p = 0);
    5355
    5456  virtual ~G4FTFBuilder();
     
    6668  G4FTFModel*            theStringModel;
    6769  G4ExcitedStringDecay*  theStringDecay;
    68 
     70  G4PreCompoundModel*    thePreCompound;
    6971};
    7072
  • trunk/source/physics_lists/builders/include/G4QGSBuilder.hh

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QGSBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QGSBuilder.hh,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    4747class G4ExcitedStringDecay;
    4848class G4QuasiElasticChannel;
     49class G4PreCompoundModel;
    4950class G4ProjectileDiffractiveChannel;
    5051
     
    5354public:
    5455
    55   G4QGSBuilder(const G4String& name ="",
     56  G4QGSBuilder(const G4String& name ="",
     57               G4PreCompoundModel* p = 0,
    5658               G4bool quasiElastic=true,
    5759               G4bool projectileDiffraction=false);
     
    7577
    7678  G4ProjectileDiffractiveChannel* theProjectileDiffraction;
     79  G4PreCompoundModel* thePreCompound;
    7780
    7881  G4bool quasielFlag;
  • trunk/source/physics_lists/builders/src/G4FTFBuilder.cc

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4FTFBuilder.cc,v 1.2 2009/11/25 19:33:18 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4FTFBuilder.cc,v 1.3 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    4646#include "G4LundStringFragmentation.hh"
    4747#include "G4BinaryCascade.hh"
     48#include "G4PreCompoundModel.hh"
    4849
    4950
    50 G4FTFBuilder::G4FTFBuilder(const G4String& aName) : G4VHadronModelBuilder(aName)
     51G4FTFBuilder::G4FTFBuilder(const G4String& aName, G4PreCompoundModel* p)
     52  : G4VHadronModelBuilder(aName), thePreCompound(p)
    5153{}
    5254
     
    5456{
    5557  delete theStringDecay;
    56   //delete theStringModel; // is deleted by the model
    5758}                                     
    5859
     
    6566  theFTFModel->SetHighEnergyGenerator(theStringModel);
    6667
    67   if(GetName() == "FTFP") {
    68     theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface());
    69   } else if(GetName() == "FTFC") {
     68  if(!thePreCompound) {
     69    thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler());
     70  }
     71
     72  if(GetName() == "FTFC") {
    7073    theFTFModel->SetTransport(new G4QStringChipsParticleLevelInterface());
     74
    7175  } else if(GetName() == "FTFB") {
    72     theFTFModel->SetTransport(new G4BinaryCascade());
     76    G4BinaryCascade* bic = new G4BinaryCascade();
     77    bic->SetDeExcitation(thePreCompound);
     78    theFTFModel->SetTransport(bic);
     79
    7380  } else {
    74     theFTFModel->SetTransport(new G4GeneratorPrecompoundInterface());
     81    G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface();
     82    pint->SetDeExcitation(thePreCompound);
     83    theFTFModel->SetTransport(pint);
    7584  }
    7685
  • trunk/source/physics_lists/builders/src/G4QGSBuilder.cc

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QGSBuilder.cc,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QGSBuilder.cc,v 1.2 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    4848#include "G4ExcitedStringDecay.hh"
    4949#include "G4BinaryCascade.hh"
     50#include "G4PreCompoundModel.hh"
     51#include "G4ExcitationHandler.hh"
    5052
    5153
    52 G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4bool quasiel, G4bool diff)
    53   : G4VHadronModelBuilder(aName), quasielFlag(quasiel), diffFlag(diff)
     54G4QGSBuilder::G4QGSBuilder(const G4String& aName, G4PreCompoundModel* p,
     55                           G4bool quasiel, G4bool diff)
     56  : G4VHadronModelBuilder(aName), thePreCompound(p),
     57    quasielFlag(quasiel), diffFlag(diff)
    5458{
    5559  theProjectileDiffraction = 0;
     
    8286  }
    8387
    84   if(GetName() == "QGSP") {
    85     theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface());
    86   } else if(GetName() == "QGSC") {
     88  if(!thePreCompound) {
     89    thePreCompound = new G4PreCompoundModel(new G4ExcitationHandler());
     90  }
     91
     92  if(GetName() == "QGSC") {
    8793    theQGSModel->SetTransport(new G4QStringChipsParticleLevelInterface());
     94
    8895  } else if(GetName() == "QGSB") {
    89     theQGSModel->SetTransport(new G4BinaryCascade());
     96    G4BinaryCascade* bic = new G4BinaryCascade();
     97    bic->SetDeExcitation(thePreCompound);
     98    theQGSModel->SetTransport(bic);
     99
    90100  } else {
    91     theQGSModel->SetTransport(new G4GeneratorPrecompoundInterface());
     101    G4GeneratorPrecompoundInterface* pint = new G4GeneratorPrecompoundInterface();
     102    pint->SetDeExcitation(thePreCompound);
     103    theQGSModel->SetTransport(pint);
    92104  }
    93105
  • trunk/source/physics_lists/lists/include/CVS/Entries

    r1228 r1273  
    1 /CHIPS.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    2 /CHIPS.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    3 /FTFC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    4 /FTFC.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    5 /FTFP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    6 /FTFP.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    7 /FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    8 /FTFP_BERT.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    9 /FTFP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    10 /FTFP_BERT_EMV.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    11 /FTFP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    12 /FTFP_BERT_EMX.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    13 /FTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    14 /FTFP_BERT_TRV.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    15 /FTFP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    16 /FTFP_EMV.icc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    17 /FTF_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    18 /FTF_BIC.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    19 /G4HadronInelasticQBBC.hh/1.12/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    20 /G4HadronInelasticQLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    21 /G4PhysListFactory.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    22 /G4VHadronPhysics.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    23 /HadronPhysicsCHIPS.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    24 /HadronPhysicsFTFC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    25 /HadronPhysicsFTFP.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    26 /HadronPhysicsFTFP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    27 /HadronPhysicsFTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    28 /HadronPhysicsFTF_BIC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    29 /HadronPhysicsLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    30 /HadronPhysicsLHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    31 /HadronPhysicsLHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    32 /HadronPhysicsLHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    33 /HadronPhysicsLHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    34 /HadronPhysicsQGSC.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    35 /HadronPhysicsQGSC_BERT.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    36 /HadronPhysicsQGSC_CHIPS.hh/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    37 /HadronPhysicsQGSC_EFLOW.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    38 /HadronPhysicsQGSC_QGSC.hh/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    39 /HadronPhysicsQGSP.hh/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    40 /HadronPhysicsQGSP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    41 /HadronPhysicsQGSP_BERT_HP.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    42 /HadronPhysicsQGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    43 /HadronPhysicsQGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    44 /HadronPhysicsQGSP_BIC.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    45 /HadronPhysicsQGSP_BIC_HP.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    46 /HadronPhysicsQGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    47 /HadronPhysicsQGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    48 /HadronPhysicsQGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    49 /LBE.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    50 /LBE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    51 /LHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    52 /LHEP.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    53 /LHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    54 /LHEP_BERT.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    55 /LHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    56 /LHEP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    57 /LHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    58 /LHEP_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    59 /LHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    60 /LHEP_PRECO_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    61 /MaxTimeCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    62 /MinEkineCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    63 /QBBC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    64 /QGSC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    65 /QGSC.icc/1.9/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    66 /QGSC_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    67 /QGSC_BERT.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    68 /QGSC_CHIPS.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    69 /QGSC_CHIPS.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    70 /QGSC_EFLOW.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    71 /QGSC_EFLOW.icc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    72 /QGSC_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    73 /QGSC_EMV.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    74 /QGSC_QGSC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    75 /QGSC_QGSC.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    76 /QGSP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    77 /QGSP.icc/1.8/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    78 /QGSP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    79 /QGSP_BERT.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    80 /QGSP_BERT_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    81 /QGSP_BERT_DIF.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    82 /QGSP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    83 /QGSP_BERT_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    84 /QGSP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    85 /QGSP_BERT_EMX.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    86 /QGSP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    87 /QGSP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    88 /QGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    89 /QGSP_BERT_NOLEP.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    90 /QGSP_BERT_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    91 /QGSP_BERT_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    92 /QGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    93 /QGSP_BERT_TRV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    94 /QGSP_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    95 /QGSP_BIC.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    96 /QGSP_BIC_EMY.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    97 /QGSP_BIC_EMY.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    98 /QGSP_BIC_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    99 /QGSP_BIC_HP.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    100 /QGSP_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    101 /QGSP_DIF.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    102 /QGSP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    103 /QGSP_EMV.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    104 /QGSP_EMV_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    105 /QGSP_EMV_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    106 /QGSP_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    107 /QGSP_EMX.icc/1.8/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    108 /QGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    109 /QGSP_FTFP_BERT.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    110 /QGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    111 /QGSP_INCL_ABLA.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    112 /QGSP_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    113 /QGSP_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    114 /QGSP_QEL.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    115 /QGSP_QEL.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    116 /QGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    117 /QGS_BIC.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    118 /SpecialCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
     1/CHIPS.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     2/CHIPS.icc/1.7/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     3/FTFC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     4/FTFC.icc/1.7/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     5/FTFP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     6/FTFP.icc/1.7/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     7/FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     8/FTFP_BERT.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     9/FTFP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     10/FTFP_BERT_EMV.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     11/FTFP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     12/FTFP_BERT_EMX.icc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     13/FTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     14/FTFP_BERT_TRV.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     15/FTFP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     16/FTFP_EMV.icc/1.6/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     17/FTF_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     18/FTF_BIC.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     19/G4HadronInelasticQLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     20/G4PhysListFactory.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     21/G4VHadronPhysics.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     22/HadronPhysicsCHIPS.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     23/HadronPhysicsFTFC.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     24/HadronPhysicsFTFP.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     25/HadronPhysicsFTFP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     26/HadronPhysicsFTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     27/HadronPhysicsFTF_BIC.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     28/HadronPhysicsLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     29/HadronPhysicsLHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     30/HadronPhysicsLHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     31/HadronPhysicsLHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     32/HadronPhysicsLHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     33/HadronPhysicsQGSC.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     34/HadronPhysicsQGSC_BERT.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     35/HadronPhysicsQGSC_CHIPS.hh/1.6/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     36/HadronPhysicsQGSC_EFLOW.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     37/HadronPhysicsQGSC_QGSC.hh/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     38/HadronPhysicsQGSP.hh/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     39/HadronPhysicsQGSP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     40/HadronPhysicsQGSP_BERT_CHIPS.hh/1.1/Wed May 26 15:06:49 2010//Tphys-lists-V09-03-03
     41/HadronPhysicsQGSP_BERT_HP.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     42/HadronPhysicsQGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     43/HadronPhysicsQGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     44/HadronPhysicsQGSP_BIC.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     45/HadronPhysicsQGSP_BIC_HP.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     46/HadronPhysicsQGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     47/HadronPhysicsQGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     48/HadronPhysicsQGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     49/LBE.hh/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     50/LBE.icc/1.4/Thu May 27 08:12:02 2010//Tphys-lists-V09-03-03
     51/LHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     52/LHEP.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     53/LHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     54/LHEP_BERT.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     55/LHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     56/LHEP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     57/LHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     58/LHEP_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     59/LHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     60/LHEP_PRECO_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     61/MaxTimeCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     62/MinEkineCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     63/QBBC.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     64/QGSC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     65/QGSC.icc/1.9/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     66/QGSC_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     67/QGSC_BERT.icc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     68/QGSC_CHIPS.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     69/QGSC_CHIPS.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     70/QGSC_EFLOW.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     71/QGSC_EFLOW.icc/1.6/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     72/QGSC_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     73/QGSC_EMV.icc/1.5/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     74/QGSC_QGSC.hh/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     75/QGSC_QGSC.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     76/QGSP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     77/QGSP.icc/1.8/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     78/QGSP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     79/QGSP_BERT.icc/1.5/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     80/QGSP_BERT_CHIPS.hh/1.1/Wed May 26 15:06:49 2010//Tphys-lists-V09-03-03
     81/QGSP_BERT_CHIPS.icc/1.1/Wed May 26 15:06:49 2010//Tphys-lists-V09-03-03
     82/QGSP_BERT_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     83/QGSP_BERT_DIF.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     84/QGSP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     85/QGSP_BERT_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     86/QGSP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     87/QGSP_BERT_EMX.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     88/QGSP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     89/QGSP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     90/QGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     91/QGSP_BERT_NOLEP.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     92/QGSP_BERT_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     93/QGSP_BERT_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     94/QGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     95/QGSP_BERT_TRV.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     96/QGSP_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     97/QGSP_BIC.icc/1.5/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     98/QGSP_BIC_EMY.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     99/QGSP_BIC_EMY.icc/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     100/QGSP_BIC_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     101/QGSP_BIC_HP.icc/1.5/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     102/QGSP_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     103/QGSP_DIF.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     104/QGSP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     105/QGSP_EMV.icc/1.7/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     106/QGSP_EMV_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     107/QGSP_EMV_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     108/QGSP_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     109/QGSP_EMX.icc/1.8/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     110/QGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     111/QGSP_FTFP_BERT.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     112/QGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     113/QGSP_INCL_ABLA.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     114/QGSP_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     115/QGSP_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     116/QGSP_QEL.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     117/QGSP_QEL.icc/1.4/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     118/QGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     119/QGS_BIC.icc/1.2/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     120/SpecialCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tphys-lists-V09-03-03
     121/G4HadronInelasticQBBC.hh/1.13/Thu May 27 08:12:15 2010//Tphys-lists-V09-03-03
    119122D
  • trunk/source/physics_lists/lists/include/CVS/Tag

    r1228 r1273  
    1 Ngeant4-09-03
     1Nphys-lists-V09-03-03
  • trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.hh,v 1.12 2009/11/25 13:10:51 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronInelasticQBBC.hh,v 1.13 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    4343#include "globals.hh"
    4444#include "G4VHadronPhysics.hh"
     45
     46class G4ExcitationHandler;
     47class G4Evaporation;
    4548
    4649class G4HadronInelasticQBBC : public G4VHadronPhysics
     
    6770  G4HadronInelasticQBBC & operator=(const G4HadronInelasticQBBC &right);
    6871
     72  G4ExcitationHandler*  theHandler;
     73  G4Evaporation*        theEvaporation;
     74
    6975  G4String htype;
    7076  G4int    verbose;
  • trunk/source/physics_lists/lists/include/LBE.icc

    r825 r1273  
    6565#include "G4UserLimits.hh"
    6666#include "G4DataQuestionaire.hh"
     67#include "G4WarnPLStatus.hh"
    6768
    6869
     
    229230// Electromagnetic Processes ////////////////////////////////////////////////
    230231// all charged particles
    231 #include "G4MultipleScattering.hh"
     232
     233#include "G4eMultipleScattering.hh"
     234#include "G4MuMultipleScattering.hh"
     235#include "G4hMultipleScattering.hh"
    232236
    233237// gamma
     
    314318        // process ordering: AddProcess(name, at rest, along step, post step)
    315319        // -1 = not implemented, then ordering
    316         G4MultipleScattering* aMultipleScattering = new G4MultipleScattering();
     320        G4eMultipleScattering* aMultipleScattering = new G4eMultipleScattering();
    317321        pmanager->AddProcess(aMultipleScattering,     -1, 1, 1);
    318322        pmanager->AddProcess(loweIon,                 -1, 2, 2);
     
    322326      {
    323327        //positron
    324         G4MultipleScattering* aMultipleScattering = new G4MultipleScattering();
     328        G4eMultipleScattering* aMultipleScattering = new G4eMultipleScattering();
    325329        pmanager->AddProcess(aMultipleScattering,     -1, 1, 1);
    326330        pmanager->AddProcess(new G4eIonisation(),     -1, 2, 2);
     
    332336      {
    333337        //muon 
    334         G4MultipleScattering* aMultipleScattering = new G4MultipleScattering();
     338        G4MuMultipleScattering* aMultipleScattering = new G4MuMultipleScattering();
    335339        pmanager->AddProcess(aMultipleScattering,           -1, 1, 1);
    336340        pmanager->AddProcess(new G4MuIonisation(),          -1, 2, 2);
     
    351355        // G4Nucleus exists and therefore has particle type nucleus
    352356        // genericIon:
    353         G4MultipleScattering* aMultipleScattering = new G4MultipleScattering();
     357        G4hMultipleScattering* aMultipleScattering = new G4hMultipleScattering();
    354358        G4hLowEnergyIonisation* ahadronLowEIon = new G4hLowEnergyIonisation();
    355359        pmanager->AddProcess(aMultipleScattering,-1,1,1);
     
    367371      {
    368372        //all others charged particles except geantino
    369         G4MultipleScattering* aMultipleScattering = new G4MultipleScattering();
     373        G4hMultipleScattering* aMultipleScattering = new G4hMultipleScattering();
    370374        G4hLowEnergyIonisation* ahadronLowEIon = new G4hLowEnergyIonisation();
    371375        pmanager->AddProcess(aMultipleScattering,-1,1,1);
  • trunk/source/physics_lists/lists/src/CVS/Entries

    r1228 r1273  
    1 /G4HadronInelasticQBBC.cc/1.24/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    2 /G4HadronInelasticQLHEP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    3 /G4PhysListFactory.cc/1.12/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    4 /G4VHadronPhysics.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    5 /HadronPhysicsCHIPS.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    6 /HadronPhysicsFTFC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    7 /HadronPhysicsFTFP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    8 /HadronPhysicsFTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    9 /HadronPhysicsFTFP_BERT_TRV.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    10 /HadronPhysicsFTF_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    11 /HadronPhysicsLHEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    12 /HadronPhysicsLHEP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    13 /HadronPhysicsLHEP_BERT_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    14 /HadronPhysicsLHEP_EMV.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    15 /HadronPhysicsLHEP_PRECO_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    16 /HadronPhysicsQGSC.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    17 /HadronPhysicsQGSC_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    18 /HadronPhysicsQGSC_CHIPS.cc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    19 /HadronPhysicsQGSC_EFLOW.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    20 /HadronPhysicsQGSC_QGSC.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    21 /HadronPhysicsQGSP.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    22 /HadronPhysicsQGSP_BERT.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    23 /HadronPhysicsQGSP_BERT_HP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    24 /HadronPhysicsQGSP_BERT_NOLEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    25 /HadronPhysicsQGSP_BERT_TRV.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    26 /HadronPhysicsQGSP_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    27 /HadronPhysicsQGSP_BIC_HP.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    28 /HadronPhysicsQGSP_FTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    29 /HadronPhysicsQGSP_INCL_ABLA.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    30 /HadronPhysicsQGS_BIC.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    31 /MaxTimeCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    32 /MinEkineCuts.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    33 /QBBC.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
    34 /SpecialCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
     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
    3536D
  • trunk/source/physics_lists/lists/src/CVS/Tag

    r1228 r1273  
    1 Ngeant4-09-03
     1Nphys-lists-V09-03-03
  • trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.cc,v 1.24 2009/11/25 18:55:56 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronInelasticQBBC.cc,v 1.26 2010/05/19 18:14:16 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    5252#include "G4NeutronCaptureXS.hh"
    5353
     54#include "G4QInelastic.hh"
     55#include "G4HadronicProcessStore.hh"
     56
    5457#include "G4ProtonInelasticCrossSection.hh"
    5558#include "G4NeutronInelasticCrossSection.hh"
     
    6568#include "G4NeutronRadCapture.hh"
    6669
     70#include "G4PreCompoundModel.hh"
     71#include "G4ExcitationHandler.hh"
     72#include "G4Evaporation.hh"
     73
    6774enum QBBCType
    6875{
     
    7784{
    7885  htype = name;
     86  theHandler = 0;
     87  theEvaporation = 0;
    7988}
    8089
    8190G4HadronInelasticQBBC::~G4HadronInelasticQBBC()
    82 {}
     91{
     92  delete theHandler;
     93  delete theEvaporation;
     94}
    8395
    8496void G4HadronInelasticQBBC::ConstructProcess()
     
    97109  }
    98110
     111  // PreCompound and Evaporation models
     112  theEvaporation = new G4Evaporation();
     113  theEvaporation->SetCombinedChannel();
     114  theHandler = new G4ExcitationHandler();
     115  theHandler->SetEvaporation(theEvaporation);
     116  theHandler->SetMinEForMultiFrag(3.0*GeV);
     117  theHandler->SetMaxAandZForFermiBreakUp(17,9);
     118  G4PreCompoundModel* thePreCompound = new G4PreCompoundModel(theHandler);
     119
    99120  // configure models
    100121  G4HadronicInteraction* theQGSP =
    101     BuildModel(new G4QGSBuilder("QGSP",true,false),9.5*GeV,100.*TeV);
     122    BuildModel(new G4QGSBuilder("QGSP",thePreCompound,true,false),12.5*GeV,100.*TeV);
    102123  G4HadronicInteraction* theFTFP =
    103     BuildModel(new G4FTFBuilder("FTFP"),4.5*GeV,25.*GeV);
     124    BuildModel(new G4FTFBuilder("FTFP",thePreCompound),4.0*GeV,25.*GeV);
    104125  G4HadronicInteraction* theFTFP1 =
    105     BuildModel(new G4FTFBuilder("FTFP"),4.5*GeV,100.*TeV);
     126    BuildModel(new G4FTFBuilder("FTFP",thePreCompound),4.0*GeV,100.*TeV);
     127
    106128  G4HadronicInteraction* theBERT =
    107     NewModel(new G4CascadeInterface(),0.0,6.5*GeV);
    108   //G4HadronicInteraction* theBERT1 =
    109   //  NewModel(new G4CascadeInterface(),2.5*GeV,6.5*GeV);
    110   //G4HadronicInteraction* theBIC =
    111   //  NewModel(new G4BinaryCascade(),0.0,3.5*GeV);
    112   G4HadronicInteraction* theCHIPS =
    113     NewModel(new G4QStringChipsParticleLevelInterface(),0.0,7.5*GeV);
     129    NewModel(new G4CascadeInterface(),1.0*GeV,5.0*GeV);
     130  G4HadronicInteraction* theBERT1 =
     131    NewModel(new G4CascadeInterface(),0.0*GeV,5.0*GeV);
     132
     133  G4BinaryCascade* bic = new G4BinaryCascade();
     134  bic->SetDeExcitation(thePreCompound);
     135  G4HadronicInteraction* theBIC = NewModel(bic,0.0,1.5*GeV);
     136
     137  //  G4HadronicInteraction* theCHIPS =
     138  //  NewModel(new G4QStringChipsParticleLevelInterface(),0.0,7.5*GeV);
     139
     140  G4QInelastic* theCHIPS = new G4QInelastic();
     141  G4HadronicProcessStore* store = G4HadronicProcessStore::Instance();
     142  store->RegisterExtraProcess(theCHIPS);
    114143
    115144  // loop over particles
     
    118147    G4ParticleDefinition* particle = theParticleIterator->value();
    119148    G4String pname = particle->GetParticleName();
     149    G4ProcessManager* pmanager = particle->GetProcessManager();
    120150    if(verbose > 1) { G4cout << "### HadronInelasticQBBC:  " << pname << G4endl; }
    121     if(pname == "anti_lambda"  ||
    122        pname == "anti_neutron" ||
    123        pname == "anti_omega-"  ||
    124        pname == "anti_proton"  ||
    125        pname == "anti_sigma-"  ||
    126        pname == "anti_sigma+"  ||
    127        pname == "anti_xi-"  ||
    128        pname == "anti_xi0"  ||
    129        pname == "kaon-"     ||
    130        pname == "kaon+"     ||
    131        pname == "kaon0S"    ||
    132        pname == "kaon0L"    ||
    133        pname == "lambda"    ||
    134        pname == "neutron"   ||
    135        pname == "omega-"    ||
    136        pname == "pi-"       ||
    137        pname == "pi+"       ||
    138        pname == "proton"    ||
    139        pname == "sigma-"    ||
    140        pname == "sigma+"    ||
    141        pname == "sigma0"    ||
    142        pname == "xi-"       ||
    143        pname == "xi0") {
    144      
    145       // common for all particles
    146       G4HadronicProcess* hp = FindInelasticProcess(particle);
    147       if(!hp) { continue; }
    148       G4ProcessManager* pmanager = particle->GetProcessManager();
    149       pmanager->AddDiscreteProcess(hp);
    150 
    151       // model and X-section configuration
    152       if(pname == "proton") {
    153         if(fType == fQBBC) {
    154           hp->AddDataSet(new G4ProtonInelasticCrossSection());
    155         } else {
    156           hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
    157         }
    158         hp->RegisterMe(theQGSP);
    159         hp->RegisterMe(theFTFP);
    160         hp->RegisterMe(theBERT);
    161         //      hp->RegisterMe(theBERT1);
    162         //      hp->RegisterMe(theBIC);
    163 
    164       } else if(pname == "neutron") {
    165         if(fType == fQBBC) {
    166           hp->AddDataSet(new G4NeutronInelasticCrossSection());
    167         } else if(fType == fQBBC_XGG) {
    168           hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
    169         } else {
    170           hp->AddDataSet(new G4NeutronInelasticXS());
    171         }
    172 
    173         hp->RegisterMe(theQGSP);
    174         hp->RegisterMe(theFTFP);
    175         //      hp->RegisterMe(theBERT1);
     151
     152    //
     153    // model and X-section configuration per particle type
     154    //
     155    if(pname == "proton") {
     156      G4HadronicProcess* hp = FindInelasticProcess(particle);
     157      if(fType == fQBBC) {
     158        hp->AddDataSet(new G4ProtonInelasticCrossSection());
     159      } else {
     160        hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
     161      }
     162      hp->RegisterMe(theQGSP);
     163      hp->RegisterMe(theFTFP);
     164      hp->RegisterMe(theBERT);
     165      hp->RegisterMe(theBIC);
     166
     167    } else if(pname == "neutron") {
     168      G4HadronicProcess* hp = FindInelasticProcess(particle);
     169      if(fType == fQBBC) {
     170        hp->AddDataSet(new G4NeutronInelasticCrossSection());
     171      } else if(fType == fQBBC_XGG) {
     172        hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
     173      } else {
     174        hp->AddDataSet(new G4NeutronInelasticXS());
     175      }
     176
     177      hp->RegisterMe(theQGSP);
     178      hp->RegisterMe(theFTFP);
    176179       
    177         G4HadronicProcess* capture = FindCaptureProcess();
    178         pmanager->AddDiscreteProcess(capture);
    179 
    180         hp->RegisterMe(theBERT);
    181         //hp->RegisterMe(theBIC);
    182         capture->RegisterMe(new G4NeutronRadCapture());
    183         //capture->RegisterMe(new G4LCapture());
    184         if(fType == fQBBC_XGGSN) {
    185           capture->AddDataSet(new G4NeutronCaptureXS());
    186         }
    187 
    188       } else if(pname == "pi-" || pname == "pi+") {
    189         if(fType == fQBBC) {
    190           hp->AddDataSet(new G4PiNuclearCrossSection());
    191         } else {
    192           hp->AddDataSet(new G4BGGPionInelasticXS(particle));
    193         }
    194         hp->RegisterMe(theQGSP);
    195         hp->RegisterMe(theFTFP);
    196         hp->RegisterMe(theBERT);
    197 
    198       } else if(pname == "kaon-"     ||
    199                 pname == "kaon+"     ||
    200                 pname == "kaon0S"    ||
    201                 pname == "kaon0L"    ||
    202                 pname == "lambda"    ||
    203                 pname == "sigma-"    ||
    204                 pname == "sigma+"    ||
    205                 pname == "sigma0"    ||
    206                 pname == "xi-"       ||
    207                 pname == "xi0") {
    208         hp->RegisterMe(theFTFP1);
    209         hp->RegisterMe(theBERT);
    210 
     180      G4HadronicProcess* capture = FindCaptureProcess();
     181
     182      hp->RegisterMe(theBERT);
     183      hp->RegisterMe(theBIC);
     184      capture->RegisterMe(new G4NeutronRadCapture());
     185      //capture->RegisterMe(new G4LCapture());
     186      if(fType == fQBBC_XGGSN) {
     187        capture->AddDataSet(new G4NeutronCaptureXS());
     188      }
     189
     190    } else if(pname == "pi-" || pname == "pi+") {
     191      G4HadronicProcess* hp = FindInelasticProcess(particle);
     192      if(fType == fQBBC) {
     193        hp->AddDataSet(new G4PiNuclearCrossSection());
    211194      } else {
    212         hp->RegisterMe(theFTFP1);
    213         hp->RegisterMe(theCHIPS);
    214 
    215       }
    216 
    217       if(verbose > 1) {
    218         G4cout << "### HadronInelasticQBBC: " << hp->GetProcessName()
    219                << " added for " << pname << G4endl;
    220       }
    221     }
     195        hp->AddDataSet(new G4BGGPionInelasticXS(particle));
     196      }
     197      hp->RegisterMe(theQGSP);
     198      hp->RegisterMe(theFTFP);
     199      hp->RegisterMe(theBERT1);
     200
     201    } else if(pname == "kaon-"     ||
     202              pname == "kaon+"     ||
     203              pname == "kaon0S"    ||
     204              pname == "kaon0L"    ||
     205              pname == "lambda"    ||
     206              pname == "sigma-"    ||
     207              pname == "sigma+"    ||
     208              pname == "sigma0"    ||
     209              pname == "xi-"       ||
     210              pname == "xi0") {
     211      G4HadronicProcess* hp = FindInelasticProcess(particle);
     212      hp->RegisterMe(theFTFP1);
     213      hp->RegisterMe(theBERT1);
     214
     215    } else if(pname == "anti_lambda"  ||
     216              pname == "anti_neutron" ||
     217              pname == "anti_omega-"  ||
     218              pname == "anti_proton"  ||
     219              pname == "anti_sigma-"  ||
     220              pname == "anti_sigma+"  ||
     221              pname == "anti_xi-"  ||
     222              pname == "anti_xi0"  ||
     223              pname == "omega-") {
     224      //G4HadronicProcess* hp = FindInelasticProcess(particle);
     225      //hp->RegisterMe(theFTFP1);
     226      //hp->RegisterMe(theCHIPS);
     227      pmanager->AddDiscreteProcess(theCHIPS);
     228      store->RegisterParticleForExtraProcess(theCHIPS,particle);
     229    }
    222230  }
    223231}
  • trunk/source/physics_lists/lists/src/G4PhysListFactory.cc

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PhysListFactory.cc,v 1.12 2009/11/25 18:55:56 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4PhysListFactory.cc,v 1.13 2010/05/26 15:06:49 gunter Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    5757#include "QGSP_BERT_NOLEP.hh"
    5858#include "QGSP_BERT_TRV.hh"
     59#include "QGSP_BERT_CHIPS.hh"
    5960#include "QGSP_BIC.hh"
    6061#include "QGSP_BIC_EMY.hh"
     
    6768{
    6869  defName = "QGSP_BERT";
    69   nlists = 26;
    70   G4String s[26] = {
     70  nlists = 27;
     71  G4String s[27] = {
    7172    "CHIPS",
    7273    "FTFP_BERT","FTFP_BERT_EMV","FTFP_BERT_EMX","FTFP_BERT_TRV","FTF_BIC",
     
    7576    "QGSC_BERT","QGSC_CHIPS",
    7677    "QGSP_BERT","QGSP_BERT_EMV","QGSP_BERT_EMX","QGSP_BERT_HP",
    77     "QGSP_BERT_NOLEP","QGSP_BERT_TRV","QGSP_BIC","QGSP_BIC_EMY","QGSP_BIC_HP",
     78    "QGSP_BERT_NOLEP","QGSP_BERT_TRV","QGSP_BERT_CHIPS",
     79    "QGSP_BIC","QGSP_BIC_EMY","QGSP_BIC_HP",
    7880    "QGSP_FTFP_BERT","QGS_BIC", "QGSP_INCL_ABLA"};
    7981
     
    129131  else if(name == "QGSP_BERT_NOLEP") {p = new QGSP_BERT_NOLEP();}
    130132  else if(name == "QGSP_BERT_TRV") {p = new QGSP_BERT_TRV();}
     133  else if(name == "QGSP_BERT_CHIPS") {p = new QGSP_BERT_CHIPS();}
    131134  else if(name == "QGSP_BIC") {p = new QGSP_BIC();}
    132135  else if(name == "QGSP_BIC_EMY") {p = new QGSP_BIC_EMY();}
  • trunk/source/physics_lists/lists/src/QBBC.cc

    r1228 r1273  
    2424// ********************************************************************
    2525//
    26 // $Id: QBBC.cc,v 1.4 2009/11/28 17:35:01 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QBBC.cc,v 1.5 2009/12/29 17:54:25 vnivanch Exp $
     27// GEANT4 tag $Name: phys-lists-V09-03-03 $
    2828//
    2929//---------------------------------------------------------------------------
     
    6969
    7070  // EM Physics
     71  //RegisterPhysics( new G4EmStandardPhysics(ver));
    7172  RegisterPhysics( new G4EmStandardPhysics_option2(ver));
    7273
     
    7980   // Hadron Physics
    8081  RegisterPhysics( new G4HadronHElasticPhysics(ver,false,type));
     82  //RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
    8183  RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
    8284  RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
Note: See TracChangeset for help on using the changeset viewer.