Ignore:
Timestamp:
Jun 18, 2010, 11:42:07 AM (15 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
Files:
102 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/physics_lists/lists/include/CHIPS.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: CHIPS.icc,v 1.7 2009/11/20 16:49:03 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: CHIPS.icc,v 1.10 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 04.06.2010 G.Folger: Use new ctor for builders
    3637//
    3738//----------------------------------------------------------------------------
    … …  
    5556#include "G4QPhotoNuclearPhysics.hh"
    5657#include "G4QNeutrinoPhysics.hh"
    57 #include "G4IonPhysics.hh"
     58#include "G4QIonPhysics.hh"
    5859#include "G4QCaptureAtRestPhysics.hh"
    59 #include "G4HadronQElasticPhysics.hh"
     60#include "G4QElasticPhysics.hh"
    6061#include "G4NeutronTrackingCut.hh"
    6162
    … …  
    6869  // defaultCutValue = 1.0*mm;
    6970  G4DataQuestionaire it(photon);
    70   G4cout << "<<< Geant4 Physics List simulation engine: CHIPS 1.0"<<G4endl;
     71  G4cout << "<<< Geant4 Physics List simulation engine: CHIPS 1.1"<<G4endl;
    7172  G4cout <<G4endl<<G4endl;
    7273  this->defaultCutValue = 0.7*mm; 
    … …  
    7879
    7980  // Synchroton Radiation & Photo-Nuclear Physics
    80   this->RegisterPhysics( new G4QPhotoNuclearPhysics("photo-nuclear"));
     81  this->RegisterPhysics( new G4QPhotoNuclearPhysics(ver));
    8182
    8283  // Neutrino-Nuclear Physics
    83   this->RegisterPhysics( new G4QNeutrinoPhysics("weak"));
     84  this->RegisterPhysics( new G4QNeutrinoPhysics(ver));
    8485
    8586  // Decays
    86   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     87  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8788
    8889   // Hadron Elastic scattering, "CHIPS" version (to be replaced by G4QElasticPhysics)
    89   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     90  this->RegisterPhysics( new G4QElasticPhysics(ver));
    9091
    9192   // Hadron Physics (to be replaced by G4QInelasticPhysics)
    92   this->RegisterPhysics(  new HadronPhysicsCHIPS("inelastic"));
     93  this->RegisterPhysics(  new HadronPhysicsCHIPS(ver));
    9394
    9495  // Stopping Physics
    95   this->RegisterPhysics( new G4QCaptureAtRestPhysics("nuclear_capture",ver));
     96  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    9697
    9798  // Ion Physics
    98   this->RegisterPhysics( new G4IonPhysics("ion"));
     99  this->RegisterPhysics( new G4QIonPhysics(ver));
    99100 
    100101  // Neutron tracking cut
    101   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     102  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    102103
    103104}

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

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

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

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

  • trunk/source/physics_lists/lists/include/FTFC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFC.icc,v 1.7 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFC.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8686
    8787  // EM Physics
    88   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     88  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8989
    9090  // Synchroton Radiation & GN Physics
    91   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     91  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9292
    9393  // Decays
    94   this->RegisterPhysics( new G4DecayPhysics("decay", ver) );
     94  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9595
    9696   // Hadron Elastic scattering
    97   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     97  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9898
    9999   // Hadron Physics
    … …  
    102102
    103103  // Stopping Physics
    104   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     104  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    105105
    106106  // Ion Physics

  • trunk/source/physics_lists/lists/include/FTFP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP.icc,v 1.7 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFP.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8787
    8888  // EM Physics
    89   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     89  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    9090
    9191  // Synchroton Radiation & GN Physics
    92   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     92  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9393
    9494  // Decays
    95   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     95  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9696
    9797   // Hadron Elastic scattering
    98   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     98  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9999
    100100   // Hadron Physics
    … …  
    103103
    104104  // Stopping Physics
    105   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     105  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    106106
    107107  // Ion Physics

  • trunk/source/physics_lists/lists/include/FTFP_BERT.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP_BERT.icc,v 1.3 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFP_BERT.icc,v 1.6 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3838// 19.06.2008 G.Folger: don't use chips quasielastic in FTF
    3939// 27.11.2009 G.Folger: Remobe experimental status
     40// 04.06.2010 G.Folger: Use new ctor for builders
    4041//
    4142//----------------------------------------------------------------------------
    … …  
    7172  // defaultCutValue = 1.0*mm;
    7273  G4DataQuestionaire it(photon);
    73   G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT 1.0"<<G4endl;
     74  G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT 1.2"<<G4endl;
    7475  G4cout <<G4endl;
    7576  this->defaultCutValue = 0.7*mm; 
    … …  
    8081
    8182  // Synchroton Radiation & GN Physics
    82   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     83  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8384
    8485  // Decays
    85   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     86  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8687
    8788   // Hadron Elastic scattering
    88   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     89  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    8990
    9091   // Hadron Physics
    91    G4bool quasiElastic;
    92   this->RegisterPhysics(  new HadronPhysicsFTFP_BERT("hadron",quasiElastic=false));
     92  this->RegisterPhysics(  new HadronPhysicsFTFP_BERT(ver));
    9393
    9494  // Stopping Physics
    95   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     95  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9696
    9797  // Ion Physics
    98   this->RegisterPhysics( new G4IonPhysics("ion"));
     98  this->RegisterPhysics( new G4IonPhysics(ver));
    9999 
    100100  // Neutron tracking cut
    101   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     101  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    102102
    103103}

  • trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP_BERT_EMV.icc,v 1.2 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFP_BERT_EMV.icc,v 1.5 2010/06/08 08:58:16 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
    37 // 27.11.2009 G.Folger: Remobe experimental status
     37// 27.11.2009 G.Folger: Remove experimental status
     38// 04.06.2010 G.Folger: Use new ctor for builders
    3839//
    3940//----------------------------------------------------------------------------
    … …  
    6970  // defaultCutValue = 1.0*mm;
    7071  G4DataQuestionaire it(photon);
    71   G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_EMV 1.0"<<G4endl;
     72  G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_EMV 1.1"<<G4endl;
    7273  G4cout <<G4endl;
    7374  this->defaultCutValue = 0.7*mm; 
    … …  
    7576
    7677  // EM Physics
    77   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     78  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    7879
    7980  // Synchroton Radiation & GN Physics
    80   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     81  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8182
    8283  // Decays
    83   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     84  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8485
    8586   // Hadron Elastic scattering
    86   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     87  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    8788
    8889   // Hadron Physics
    89    G4bool quasiElastic;
    90   this->RegisterPhysics(  new HadronPhysicsFTFP_BERT("hadron",quasiElastic=false));
     90  this->RegisterPhysics( new HadronPhysicsFTFP_BERT(ver));
    9191
    9292  // Stopping Physics
    93   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     93  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9494
    9595  // Ion Physics
    96   this->RegisterPhysics( new G4IonPhysics("ion"));
     96  this->RegisterPhysics( new G4IonPhysics(ver));
    9797 
    9898  // Neutron tracking cut
    99   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     99  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    100100
    101101}

  • trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP_BERT_EMX.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFP_BERT_EMX.icc,v 1.4 2010/06/08 08:58:31 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3333// Author: 11 May 2009  V.Ivanchenko
    3434//   created from FTFP_BERT
     35//
     36// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3538//
    3639//----------------------------------------------------------------------------
    … …  
    6871  // defaultCutValue = 1.0*mm;
    6972  G4DataQuestionaire it(photon);
    70   G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_EMX 1.0"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_EMX 1.1"<<G4endl;
    7174  G4cout <<G4endl;
    7275  this->defaultCutValue = 0.7*mm; 
    … …  
    7780
    7881  // EM Physics
    79   this->RegisterPhysics( new G4EmStandardPhysics_option2(ver));
     82  this->RegisterPhysics( new G4EmStandardPhysics_option2(ver) );
    8083
    8184  // Synchroton Radiation & GN Physics
    82   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     85  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8386
    8487  // Decays
    85   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     88  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8689
    8790   // Hadron Elastic scattering
    88   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     91  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    8992
    9093   // Hadron Physics
    91    G4bool quasiElastic;
    92   this->RegisterPhysics(  new HadronPhysicsFTFP_BERT("hadron",quasiElastic=false));
     94  this->RegisterPhysics( new HadronPhysicsFTFP_BERT(ver));
    9395
    9496  // Stopping Physics
    95   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     97  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9698
    9799  // Ion Physics
    98   this->RegisterPhysics( new G4IonPhysics("ion"));
     100  this->RegisterPhysics( new G4IonPhysics(ver));
    99101 
    100102  // Neutron tracking cut
    101   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     103  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    102104
    103105}

  • trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP_BERT_TRV.icc,v 1.2 2009/06/02 16:51:58 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTFP_BERT_TRV.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6969  // defaultCutValue = 1.0*mm;
    7070  G4DataQuestionaire it(photon);
    71   G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_TRV 1.0"<<G4endl;
     71  G4cout << "<<< Geant4 Physics List simulation engine: FTFP_BERT_TRV 1.1"<<G4endl;
    7272  G4cout <<G4endl;
    7373  this->defaultCutValue = 0.7*mm; 
    … …  
    7878
    7979  // EM Physics
    80   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     80  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8181
    8282  // Synchroton Radiation & GN Physics
    83   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     83  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8484
    8585  // Decays
    86   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     86  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8787
    8888   // Hadron Elastic scattering
    89   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     89  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9090
    9191   // Hadron Physics
    92    G4bool quasiElastic;
    93   this->RegisterPhysics(  new HadronPhysicsFTFP_BERT_TRV("hadron",quasiElastic=false));
     92  this->RegisterPhysics(  new HadronPhysicsFTFP_BERT_TRV(ver));
    9493
    9594  // Stopping Physics
    96   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     95  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9796
    9897  // Ion Physics
    99   this->RegisterPhysics( new G4IonPhysics("ion"));
     98  this->RegisterPhysics( new G4IonPhysics(ver));
    10099 
    101100  // Neutron tracking cut
    102   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     101  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    103102
    104103}

  • trunk/source/physics_lists/lists/include/FTF_BIC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: FTF_BIC.icc,v 1.4 2009/06/02 16:51:35 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: FTF_BIC.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535// Modified:
    3636// 19.06.2008 G.Folger: don't use chips quasielastic in FTF
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    7071
    7172  G4DataQuestionaire it(photon);
    72   G4cout << "<<< Geant4 Physics List simulation engine: FTF_BIC 1.1"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: FTF_BIC 1.2"<<G4endl;
    7374  G4cout <<G4endl;
    7475
    … …  
    8081
    8182  // EM Physics
    82   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     83  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8384
    8485  // Synchroton Radiation & GN Physics
    85   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     86  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8687
    8788  // Decays
    88   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     89  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8990
    9091   // Hadron Elastic scattering
    91   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     92  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9293
    9394   // Hadron Physics
    94    G4bool quasiElastic;
    95   this->RegisterPhysics(  new HadronPhysicsFTF_BIC("hadron",quasiElastic=false));
     95  this->RegisterPhysics(  new HadronPhysicsFTF_BIC(ver));
    9696
    9797  // Stopping Physics
    98   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     98  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9999
    100100  // Ion Physics
    101   this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     101  this->RegisterPhysics( new G4IonBinaryCascadePhysics(ver));
    102102 
    103103  // Neutron tracking cut
    104   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     104  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    105105
    106106}

  • trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh

    r1273 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.hh,v 1.13 2009/12/29 17:54:25 vnivanch Exp $
    27 // GEANT4 tag $Name: phys-lists-V09-03-03 $
     26// $Id: G4HadronInelasticQBBC.hh,v 1.14 2010/06/04 08:40:36 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5252
    5353  // constructor
    54   G4HadronInelasticQBBC(const G4String& name = "QBBC",
     54  G4HadronInelasticQBBC(G4int ver = 1);
     55
     56  G4HadronInelasticQBBC(const G4String& name,
    5557                        G4int ver = 1, G4bool ftf = false, G4bool bert = false,
    5658                        G4bool chips = false, G4bool hp = false,

  • trunk/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronInelasticQLHEP.hh,v 1.2 2010/06/04 09:41:03 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6868public:
    6969
    70   G4HadronInelasticQLHEP(const G4String& name = "inelastic",
     70  G4HadronInelasticQLHEP(G4int ver = 1);
     71
     72  // obsolete
     73  G4HadronInelasticQLHEP(const G4String& name,
    7174                        G4int ver = 1, G4bool qgs = false, G4bool bert = false,
    7275                        G4bool bic = false, G4bool hp = false);
    7376
    7477  virtual ~G4HadronInelasticQLHEP();
    75 
    76 public:
    7778
    7879  // This method will be invoked in the Construct() method.

  • trunk/source/physics_lists/lists/include/HadronPhysicsCHIPS.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsCHIPS.hh,v 1.2 2009/11/20 10:24:28 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsCHIPS.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949{
    5050  public:
    51     HadronPhysicsCHIPS(const G4String& name ="CHIPS hadronic");
     51    HadronPhysicsCHIPS(G4int verbose =1);
     52    HadronPhysicsCHIPS(const G4String& name);
    5253    virtual ~HadronPhysicsCHIPS();
    5354
    … …  
    5758
    5859  private:
    59     G4QInelasticCHIPSBuilder* theInelasticCHIPS;   
     60    G4QInelasticCHIPSBuilder* theInelasticCHIPS;
     61//    G4int verbosity;   
    6062};
    6163

  • trunk/source/physics_lists/lists/include/HadronPhysicsFTFC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFC.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFC.hh,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6464{
    6565  public:
    66     HadronPhysicsFTFC(const G4String& name ="hadron",G4bool quasiElastic=false);
     66    HadronPhysicsFTFC(G4int verbose =1);
     67    HadronPhysicsFTFC(const G4String& name,G4bool quasiElastic=false);
    6768    virtual ~HadronPhysicsFTFC();
    6869

  • trunk/source/physics_lists/lists/include/HadronPhysicsFTFP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP.hh,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6464{
    6565  public:
    66     HadronPhysicsFTFP(const G4String& name ="hadron",G4bool quasiElastic=false);
     66    HadronPhysicsFTFP(G4int verbose =1);
     67    HadronPhysicsFTFP(const G4String& name,G4bool quasiElastic=false);
    6768    virtual ~HadronPhysicsFTFP();
    6869

  • trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP_BERT.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP_BERT.hh,v 1.5 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4747
    4848#include "G4VPhysicsConstructor.hh"
    49 #include "G4MiscLHEPBuilder.hh"
     49#include "G4MiscCHIPSBuilder.hh"
    5050
    5151#include "G4PiKBuilder.hh"
    … …  
    6666{
    6767  public:
    68     HadronPhysicsFTFP_BERT(const G4String& name ="hadron",G4bool quasiElastic=false);
     68    HadronPhysicsFTFP_BERT(G4int verbose =1);
     69    HadronPhysicsFTFP_BERT(const G4String& name, G4bool quasiElastic=false);
    6970    virtual ~HadronPhysicsFTFP_BERT();
    7071
    … …  
    7576  private:
    7677    void CreateModels();
     78    G4HadronicProcess* FindInelasticProcess(const G4ParticleDefinition*);
     79   
    7780    G4NeutronBuilder * theNeutrons;
    7881    G4BertiniNeutronBuilder * theBertiniNeutron;
    … …  
    8891    G4FTFPProtonBuilder * theFTFPPro;   
    8992   
    90     G4MiscLHEPBuilder * theMiscLHEP;
     93    G4MiscCHIPSBuilder * theMiscCHIPS;
    9194   
    9295    G4bool QuasiElastic;
     96    G4VCrossSectionDataSet * theCHIPSInelastic;
    9397};
    9498

  • trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT_TRV.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTFP_BERT_TRV.hh,v 1.1 2009/06/02 16:51:59 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTFP_BERT_TRV.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6666{
    6767  public:
    68     HadronPhysicsFTFP_BERT_TRV(const G4String& name ="hadron",G4bool quasiElastic=false);
     68    HadronPhysicsFTFP_BERT_TRV(G4int verbose =1);
     69    HadronPhysicsFTFP_BERT_TRV(const G4String& name, G4bool quasiElastic=false);
    6970    virtual ~HadronPhysicsFTFP_BERT_TRV();
    7071

  • trunk/source/physics_lists/lists/include/HadronPhysicsFTF_BIC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsFTF_BIC.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsFTF_BIC.hh,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565{
    6666  public:
    67     HadronPhysicsFTF_BIC(const G4String& name ="hadron",G4bool quasiElastic=false);
     67    HadronPhysicsFTF_BIC(G4int verbose =1);
     68    HadronPhysicsFTF_BIC(const G4String& name,G4bool quasiElastic=false);
    6869    virtual ~HadronPhysicsFTF_BIC();
    6970

  • trunk/source/physics_lists/lists/include/HadronPhysicsLHEP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6060{
    6161  public:
    62     HadronPhysicsLHEP(const G4String& name ="hadron");
     62    HadronPhysicsLHEP(G4int verbose =1);
     63    HadronPhysicsLHEP(const G4String& name);
    6364    virtual ~HadronPhysicsLHEP();
    6465

  • trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_BERT.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsLHEP_BERT(const G4String& name ="hadron");
     65    HadronPhysicsLHEP_BERT(G4int verbose =1);
     66    HadronPhysicsLHEP_BERT(const G4String& name);
    6667    virtual ~HadronPhysicsLHEP_BERT();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsLHEP_BERT_HP(const G4String& name ="hadron");
     65    HadronPhysicsLHEP_BERT_HP(G4int verbose =1);
     66    HadronPhysicsLHEP_BERT_HP(const G4String& name );
    6667    virtual ~HadronPhysicsLHEP_BERT_HP();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_EMV.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6060{
    6161  public:
    62     HadronPhysicsLHEP_EMV(const G4String& name ="hadron");
     62    HadronPhysicsLHEP_EMV(G4int verbose =1);
     63    HadronPhysicsLHEP_EMV(const G4String& name);
    6364    virtual ~HadronPhysicsLHEP_EMV();
    6465

  • trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsLHEP_PRECO_HP(const G4String& name ="hadron");
     65    HadronPhysicsLHEP_PRECO_HP(G4int verbose =1);
     66    HadronPhysicsLHEP_PRECO_HP(const G4String& name);
    6667    virtual ~HadronPhysicsLHEP_PRECO_HP();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6464{
    6565  public:
    66     HadronPhysicsQGSC(const G4String& name ="hadron",G4bool quasiElastic=true);
     66    HadronPhysicsQGSC(G4int verbose =1);
     67    HadronPhysicsQGSC(const G4String& name,G4bool quasiElastic=true);
    6768    virtual ~HadronPhysicsQGSC();
    6869

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_BERT.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_BERT.hh,v 1.2 2009/04/09 08:22:53 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_BERT.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsQGSC_BERT(const G4String& name ="hadron",G4bool quasiElastic=true);
     65    HadronPhysicsQGSC_BERT(G4int verbose =1);
     66    HadronPhysicsQGSC_BERT(const G4String& name,G4bool quasiElastic=true);
    6667    virtual ~HadronPhysicsQGSC_BERT();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_CHIPS.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_CHIPS.hh,v 1.6 2009/04/17 15:29:19 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_CHIPS.hh,v 1.7 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    7777{
    7878public:
    79   HadronPhysicsQGSC_CHIPS(const G4String& name ="hadron",G4bool quasiElastic=true);
     79  HadronPhysicsQGSC_CHIPS(G4int verbose =1);
     80  HadronPhysicsQGSC_CHIPS(const G4String& name, G4bool quasiElastic=true);
    8081  virtual ~HadronPhysicsQGSC_CHIPS();
    8182

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_EFLOW.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_EFLOW.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsQGSC_EFLOW(const G4String& name ="hadron",G4bool quasiElastic=true);
     65    HadronPhysicsQGSC_EFLOW(G4int);
     66    HadronPhysicsQGSC_EFLOW(const G4String& name, G4bool quasiElastic=true);
    6667    virtual ~HadronPhysicsQGSC_EFLOW();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_QGSC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_QGSC.hh,v 1.4 2009/04/14 07:23:08 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSC_QGSC.hh,v 1.5 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsQGSC_QGSC(const G4String& name ="hadron",G4bool quasiElastic=true);
     65    HadronPhysicsQGSC_QGSC(G4int verbose =1);
     66    HadronPhysicsQGSC_QGSC(const G4String& name, G4bool quasiElastic=true);
    6667    virtual ~HadronPhysicsQGSC_QGSC();
    6768

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP.hh,v 1.4 2007/11/13 10:16:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP.hh,v 1.5 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565{
    6666  public:
    67     HadronPhysicsQGSP(const G4String& name ="hadron",G4bool quasiElastic=true);
     67    HadronPhysicsQGSP(G4int verbose =1);
     68    HadronPhysicsQGSP(const G4String& name, G4bool quasiElastic=true);
    6869    virtual ~HadronPhysicsQGSP();
    6970

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT.hh,v 1.3 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT.hh,v 1.4 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6868{
    6969  public:
    70     HadronPhysicsQGSP_BERT(const G4String& name ="hadron",G4bool quasiElastic=true);
     70    HadronPhysicsQGSP_BERT(G4int verbose =1);
     71    HadronPhysicsQGSP_BERT(const G4String& name, G4bool quasiElastic=true);
    7172    virtual ~HadronPhysicsQGSP_BERT();
    7273

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_CHIPS.hh

    r1274 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_CHIPS.hh,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.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565{
    6666  public:
    67     HadronPhysicsQGSP_BERT_CHIPS(const G4String& name ="hadron",G4bool quasiElastic=true);
     67    HadronPhysicsQGSP_BERT_CHIPS(G4int verbose =1);
     68    HadronPhysicsQGSP_BERT_CHIPS(const G4String& name, G4bool quasiElastic=true);
    6869    virtual ~HadronPhysicsQGSP_BERT_CHIPS();
    6970

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.3 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.5 2010/06/03 11:01:46 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4646
    4747#include "G4VPhysicsConstructor.hh"
    48 #include "G4StoppingHadronBuilder.hh"
    4948#include "G4MiscLHEPBuilder.hh"
    5049
    … …  
    6867{
    6968  public:
    70     HadronPhysicsQGSP_BERT_HP(const G4String& name ="hadron",G4bool quasiElastic=true);
     69    HadronPhysicsQGSP_BERT_HP(G4int verbose =1);
     70    HadronPhysicsQGSP_BERT_HP(const G4String& name, G4bool quasiElastic=true);
    7171    virtual ~HadronPhysicsQGSP_BERT_HP();
    7272

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_NOLEP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_NOLEP.hh,v 1.1 2008/10/17 12:43:21 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_NOLEP.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464  public:
    65     HadronPhysicsQGSP_BERT_NOLEP(const G4String& name ="hadron",G4bool quasiElastic=true);
    66     virtual ~HadronPhysicsQGSP_BERT_NOLEP();
     65    HadronPhysicsQGSP_BERT_NOLEP(G4int verbose =1);
     66     HadronPhysicsQGSP_BERT_NOLEP(const G4String& name, G4bool quasiElastic=true);
     67   virtual ~HadronPhysicsQGSP_BERT_NOLEP();
    6768
    6869  public:

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_TRV.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BERT_TRV.hh,v 1.1 2007/05/07 14:34:29 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BERT_TRV.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565{
    6666  public:
    67     HadronPhysicsQGSP_BERT_TRV(const G4String& name ="hadron",G4bool quasiElastic=true);
     67    HadronPhysicsQGSP_BERT_TRV(G4int verbose =1);
     68    HadronPhysicsQGSP_BERT_TRV(const G4String& name,G4bool quasiElastic=true);
    6869    virtual ~HadronPhysicsQGSP_BERT_TRV();
    6970

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BIC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BIC.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6666{
    6767  public:
    68     HadronPhysicsQGSP_BIC(const G4String& name ="hadron",G4bool quasiElastic=true);
     68    HadronPhysicsQGSP_BIC(G4int verbose =1);
     69    HadronPhysicsQGSP_BIC(const G4String& name,G4bool quasiElastic=true);
    6970    virtual ~HadronPhysicsQGSP_BIC();
    7071

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_BIC_HP.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_BIC_HP.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6868{
    6969  public:
    70     HadronPhysicsQGSP_BIC_HP(const G4String& name ="hadron",G4bool quasiElastic=true);
     70    HadronPhysicsQGSP_BIC_HP(G4int verbose =1);
     71    HadronPhysicsQGSP_BIC_HP(const G4String& name, G4bool quasiElastic=true);
    7172    virtual ~HadronPhysicsQGSP_BIC_HP();
    7273

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_FTFP_BERT.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_FTFP_BERT.hh,v 1.1 2009/04/23 19:04:18 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_FTFP_BERT.hh,v 1.3 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4545
    4646#include "G4VPhysicsConstructor.hh"
    47 #include "G4MiscLHEPBuilder.hh"
     47#include "G4MiscCHIPSBuilder.hh"
    4848
    4949#include "G4PiKBuilder.hh"
    … …  
    6666{
    6767  public:
    68     HadronPhysicsQGSP_FTFP_BERT(const G4String& name ="hadron",G4bool quasiElastic=true);
     68    HadronPhysicsQGSP_FTFP_BERT(G4int verbose =1);
     69    HadronPhysicsQGSP_FTFP_BERT(const G4String& name,G4bool quasiElastic=true);
    6970    virtual ~HadronPhysicsQGSP_FTFP_BERT();
    7071
    … …  
    7879  private:
    7980    void CreateModels();
     81    G4HadronicProcess* FindInelasticProcess(const G4ParticleDefinition*);
    8082    G4NeutronBuilder * theNeutrons;
    8183    G4FTFPNeutronBuilder * theFTFPNeutron;
    … …  
    9496    G4BertiniProtonBuilder * theBertiniPro;
    9597   
    96     G4MiscLHEPBuilder * theMiscLHEP;
     98    G4MiscCHIPSBuilder * theMiscCHIPS;
    9799   
    98100    G4bool QuasiElastic;
    99101    G4bool ProjectileDiffraction;
     102    G4VCrossSectionDataSet * theCHIPSInelastic;
    100103};
    101104

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_INCL_ABLA.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSP_INCL_ABLA.hh,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGSP_INCL_ABLA.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    7878{
    7979  public:
    80     HadronPhysicsQGSP_INCL_ABLA(const G4String& name ="hadron",G4bool quasiElastic=true);
     80    HadronPhysicsQGSP_INCL_ABLA(G4int verbose =1);
     81    HadronPhysicsQGSP_INCL_ABLA(const G4String& name, G4bool quasiElastic=true);
    8182    virtual ~HadronPhysicsQGSP_INCL_ABLA();
    8283

  • trunk/source/physics_lists/lists/include/HadronPhysicsQGS_BIC.hh

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGS_BIC.hh,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: HadronPhysicsQGS_BIC.hh,v 1.2 2010/06/03 10:42:44 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565{
    6666  public:
    67     HadronPhysicsQGS_BIC(const G4String& name ="hadron",G4bool quasiElastic=true);
     67    HadronPhysicsQGS_BIC(G4int verbose =1);
     68    HadronPhysicsQGS_BIC(const G4String& name, G4bool quasiElastic=true);
    6869    virtual ~HadronPhysicsQGS_BIC();
    6970

  • trunk/source/physics_lists/lists/include/LHEP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: LHEP.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3939// 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic
    4040// 16.05.2007 V.Ivanchenko: rename EM builders
     41// 04.06.2010 G.Folger: Use new ctor for builders
    4142//
    4243//----------------------------------------------------------------------------
    … …  
    5960#include "G4EmExtraPhysics.hh"
    6061#include "G4IonPhysics.hh"
    61 #include "G4HadronElasticPhysics.hh"
     62#include "G4HadronElasticPhysicsLHEP.hh"
    6263
    6364#include "G4DataQuestionaire.hh"
    … …  
    6970  // defaultCutValue = 1.0*mm;
    7071  G4DataQuestionaire it(photon);
    71   G4cout << "<<< Geant4 Physics List simulation engine: LHEP 4.2"<<G4endl;
     72  G4cout << "<<< Geant4 Physics List simulation engine: LHEP 4.3"<<G4endl;
    7273  G4cout <<G4endl;
    7374  this->defaultCutValue = 0.7*mm; 
    … …  
    7576
    7677  // EM Physics
    77   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     78  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    7879
    7980  // Synchroton Radiation & GN Physics
    80   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     81  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8182
    8283  // General Physics - i.e. decay
    83   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     84  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8485
    8586   // Hadron Elastic scattering
    86   this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false));
     87  this-> RegisterPhysics( new G4HadronElasticPhysicsLHEP(ver) );
    8788
    8889   // Hadron Physics
    89   this->RegisterPhysics(  new HadronPhysicsLHEP("hadron"));
     90  this->RegisterPhysics(  new HadronPhysicsLHEP(ver));
    9091
    9192  // Ion Physics
    92   this->RegisterPhysics( new G4IonPhysics("ion"));
     93  this->RegisterPhysics( new G4IonPhysics(ver));
    9394
    9495}

  • trunk/source/physics_lists/lists/include/LHEP_BERT.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_BERT.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: LHEP_BERT.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6262#include "G4IonPhysics.hh"
    6363#include "G4QStoppingPhysics.hh"
    64 #include "G4HadronElasticPhysics.hh"
     64#include "G4HadronElasticPhysicsLHEP.hh"
    6565
    6666#include "G4DataQuestionaire.hh"
    … …  
    8585
    8686  // EM Physics
    87   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     87  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8888
    8989  // Synchroton Radiation & GN Physics
    90   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     90  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9191
    9292  // General Physics - i.e. decay
    93   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     93  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9494
    9595   // Hadron Elastic scattering
    96   this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false));
     96  this-> RegisterPhysics( new G4HadronElasticPhysicsLHEP(ver) );
    9797
    9898   // Hadron Physics
    … …  
    100100
    101101  // Stopping Physics
    102   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     102  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    103103
    104104  // Ion Physics

  • trunk/source/physics_lists/lists/include/LHEP_BERT_HP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_BERT_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: LHEP_BERT_HP.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6262#include "G4IonPhysics.hh"
    6363#include "G4QStoppingPhysics.hh"
    64 #include "G4HadronElasticPhysics.hh"
     64#include "G4HadronElasticPhysicsHP.hh"
    6565
    6666#include "G4DataQuestionaire.hh"
    … …  
    8383
    8484  // EM Physics
    85   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     85  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8686
    8787  // Synchroton Radiation & GN Physics
    88   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     88  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8989
    9090  // Decays
    91   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     91  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9292
    9393   // Hadron Elastic scattering
    94   this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,true));
     94  this-> RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );
    9595
    9696  // Hadron Physics
    … …  
    9898
    9999  // Stopping Physics
    100   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     100  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    101101
    102102  // Ion Physics

  • trunk/source/physics_lists/lists/include/LHEP_EMV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_EMV.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: LHEP_EMV.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3838// 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic
    3939// 16.05.2007 V.Ivanchenko: rename EM builders
     40// 04.06.2010 G.Folger: Use new ctor for builders
    4041//
    4142//----------------------------------------------------------------------------
    … …  
    6061#include "G4IonPhysics.hh"
    6162#include "G4QStoppingPhysics.hh"
    62 #include "G4HadronElasticPhysics.hh"
     63#include "G4HadronElasticPhysicsLHEP.hh"
    6364
    6465#include "G4DataQuestionaire.hh"
    … …  
    7071  // defaultCutValue = 1.0*mm;
    7172  G4DataQuestionaire it(photon);
    72   G4cout << "<<< Geant4 Physics List simulation engine: LHEP_EMV 3.2"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: LHEP_EMV 3.3"<<G4endl;
    7374  G4cout <<G4endl;
    7475  this->defaultCutValue = 0.7*mm; 
    … …  
    7677
    7778  // EM Physics - without multiple scattering limiting the step
    78   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     79  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    7980
    8081  // Synchroton Radiation & GN Physics
    81   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     82  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8283
    8384  // Decays
    84   this->RegisterPhysics( new G4DecayPhysics("general",ver) );
     85  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8586
    8687   // Hadron Elastic scattering
    87   this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false));
     88  this-> RegisterPhysics( new G4HadronElasticPhysicsLHEP(ver) );
    8889
    8990   // Hadron Physics
    90   this->RegisterPhysics(  new HadronPhysicsLHEP_EMV("hadron"));
     91  this->RegisterPhysics(  new HadronPhysicsLHEP_EMV(ver));
    9192
    9293  // Stopping Physics
    93   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     94  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9495
    9596  // Ion Physics
    96   this->RegisterPhysics( new G4IonPhysics("ion"));
     97  this->RegisterPhysics( new G4IonPhysics(ver));
    9798}
    9899

  • trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_PRECO_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: LHEP_PRECO_HP.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6161#include "G4IonPhysics.hh"
    6262#include "G4QStoppingPhysics.hh"
    63 #include "G4HadronElasticPhysics.hh"
     63#include "G4HadronElasticPhysicsHP.hh"
    6464
    6565#include "G4DataQuestionaire.hh"
    … …  
    8282
    8383  // EM Physics
    84   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     84  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8585
    8686  // Synchroton Radiation & GN Physics
    87   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     87  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8888
    8989  // Decays
    90   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     90  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9191
    9292   // Hadron Elastic scattering
    93   this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,true));
     93  this-> RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );
    9494
    9595   // Hadron Physics
    … …  
    9797
    9898  // Stopping Physics
    99   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     99  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    100100
    101101  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC.icc,v 1.9 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSC.icc,v 1.10 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6464#include "G4EmExtraPhysics.hh"
    6565#include "G4IonPhysics.hh"
    66 #include "G4QStoppingPhysics.hh"
     66#include "G4QCaptureAtRestPhysics.hh"
    6767#include "G4HadronQElasticPhysics.hh"
    6868#include "G4NeutronTrackingCut.hh"
    … …  
    8787
    8888  // EM Physics
    89   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     89  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    9090
    9191  // Synchroton Radiation & GN Physics
    92   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     92  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9393
    9494  // Decays
    95   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     95  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9696
    9797   // Hadron Elastic scattering, "CHIPS" version
    98   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     98  this-> RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9999
    100100   // Hadron Physics
    … …  
    103103
    104104  // Stopping Physics
    105   this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver,false));
     105  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    106106
    107107  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSC_BERT.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC_BERT.icc,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSC_BERT.icc,v 1.3 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3232//
    3333// Author: 2007 G.Folger
    34 //          cre4ated from QGSC by  J.P. Wellisch
     34//          created from QGSC by  J.P. Wellisch
    3535//
    3636// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    5556#include "G4EmExtraPhysics.hh"
    5657#include "G4IonPhysics.hh"
    57 #include "G4QStoppingPhysics.hh"
     58#include "G4QCaptureAtRestPhysics.hh"
    5859#include "G4HadronQElasticPhysics.hh"
    5960#include "G4NeutronTrackingCut.hh"
    … …  
    6768  // defaultCutValue = 1.0*mm;
    6869  G4DataQuestionaire it(photon);
    69   G4cout << "<<< Geant4 Physics List simulation engine: QGSC_BERT 1.0"<<G4endl;
     70  G4cout << "<<< Geant4 Physics List simulation engine: QGSC_BERT 1.1"<<G4endl;
    7071  G4cout <<G4endl<<G4endl;
    7172  this->defaultCutValue = 0.7*mm; 
    … …  
    7374
    7475  // EM Physics
    75   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     76  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    7677
    7778  // Synchroton Radiation & GN Physics
    78   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     79  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    7980
    8081  // Decays
    81   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     82  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8283
    8384   // Hadron Elastic scattering, "CHIPS" version
    84   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     85  this->RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    8586
    8687   // Hadron Physics
    87    G4bool quasiElastic;
    88   this->RegisterPhysics(  new HadronPhysicsQGSC_BERT("hadron",quasiElastic=true));
     88  this->RegisterPhysics(  new HadronPhysicsQGSC_BERT(ver));
    8989
    9090  // Stopping Physics
    91   this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver,false));
     91  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    9292
    9393  // Ion Physics
    94   this->RegisterPhysics( new G4IonPhysics("ion"));
     94  this->RegisterPhysics( new G4IonPhysics(ver));
    9595 
    9696  // Neutron tracking cut
    97   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     97  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    9898
    9999}

  • trunk/source/physics_lists/lists/include/QGSC_CHIPS.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC_CHIPS.icc,v 1.3 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSC_CHIPS.icc,v 1.5 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6565#include "G4EmExtraPhysics.hh"
    6666#include "G4IonPhysics.hh"
    67 #include "G4QStoppingPhysics.hh"
     67#include "G4QCaptureAtRestPhysics.hh"
    6868#include "G4HadronQElasticPhysics.hh"
    6969#include "G4NeutronTrackingCut.hh"
    … …  
    8787
    8888  // EM Physics
    89   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     89  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    9090
    9191  // Synchroton Radiation & GN Physics
    92   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     92  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9393
    9494  // Decays
    95   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     95  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9696
    9797   // Hadron Elastic scattering, "CHIPS" version
    98   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     98  this-> RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9999
    100100   // Hadron Physics, "CHIPS" version
    101   G4bool quasiElastic;
    102   this->RegisterPhysics(  new HadronPhysicsQGSC_CHIPS("hadron", quasiElastic=true));
     101  this->RegisterPhysics(  new HadronPhysicsQGSC_CHIPS(ver));
    103102
    104103  // Stopping Physics, "CHIPS" version
    105   this->RegisterPhysics( new G4QStoppingPhysics("stopping", ver, false) );
     104  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    106105
    107106  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSC_EMV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC_EMV.icc,v 1.5 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSC_EMV.icc,v 1.6 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6161#include "G4EmExtraPhysics.hh"
    6262#include "G4IonPhysics.hh"
    63 #include "G4QStoppingPhysics.hh"
     63#include "G4QCaptureAtRestPhysics.hh"
    6464#include "G4HadronQElasticPhysics.hh"
    6565#include "G4NeutronTrackingCut.hh"
    … …  
    8484
    8585  // EM Physics
    86   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     86  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    8787
    8888  // Synchroton Radiation & GN Physics
    89   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     89  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9090
    9191  // Decays
    92   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     92  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9393
    9494   // Hadron Elastic scattering, "CHIPS" version
    95   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     95  this-> RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9696
    9797   // Hadron Physics
    … …  
    100100
    101101  // Stopping Physics
    102   this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver,false));
     102  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    103103
    104104  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSC_QGSC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC_QGSC.icc,v 1.2 2009/11/27 17:28:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSC_QGSC.icc,v 1.3 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5555#include "G4EmExtraPhysics.hh"
    5656#include "G4IonPhysics.hh"
    57 #include "G4QStoppingPhysics.hh"
     57#include "G4QCaptureAtRestPhysics.hh"
    5858#include "G4HadronQElasticPhysics.hh"
    5959#include "G4NeutronTrackingCut.hh"
    … …  
    7878
    7979  // EM Physics
    80   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     80  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8181
    8282  // Synchroton Radiation & GN Physics
    83   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     83  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8484
    8585  // Decays
    86   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     86  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8787
    8888   // Hadron Elastic scattering, "CHIPS" version
    89   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     89  this->RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9090
    9191   // Hadron Physics
    … …  
    9494
    9595  // Stopping Physics
    96   this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver,false));
     96  this->RegisterPhysics( new G4QCaptureAtRestPhysics(ver) );
    9797
    9898  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP.icc,v 1.8 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP.icc,v 1.11 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4242// 16.05.2007 V.Ivanchenko: rename EM builders
    4343// 27.11.2009 G.Folger: Mark as obsolete
     44// 04.06.2010 G.Folger: Mark as replaced, use new ctor for Builders
    4445//
    4546//----------------------------------------------------------------------------
    … …  
    8586
    8687  G4WarnPLStatus obs;
    87   obs.Unsupported("QGSP", "QGSP_BERT");
     88  obs.Replaced("QGSP", "QGSP_BERT");
     89  G4cerr << "If you need to use QGSP, please edit QGSP.icc and remove G4Exception" << G4endl;
     90  G4Exception(" Crash for usage of replaced physics list");
    8891 
    8992  // EM Physics
    90   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     93  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    9194
    9295  // Synchroton Radiation & GN Physics
    93   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     96  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9497
    9598  // Decays
    96   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     99  this->RegisterPhysics( new G4DecayPhysics(ver) );
    97100
    98101   // Hadron Elastic scattering
    99   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     102  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    100103
    101104   // Hadron Physics
    102    G4bool quasiElastic;
    103   this->RegisterPhysics( new HadronPhysicsQGSP("hadron",quasiElastic=true));
     105  this->RegisterPhysics( new HadronPhysicsQGSP(ver));
    104106
    105107  // Stopping Physics
    106   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     108  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    107109
    108110  // Ion Physics
    109   this->RegisterPhysics( new G4IonPhysics("ion"));
     111  this->RegisterPhysics( new G4IonPhysics(ver));
    110112 
    111113  // Neutron tracking cut
    112   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     114  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    113115
    114116}

  • trunk/source/physics_lists/lists/include/QGSP_BERT.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4242// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
    4343// 16.05.2007 V.Ivanchenko: rename EM builders
     44// 04.06.2010 G.Folger: Use new ctor for builders
    4445//
    4546//----------------------------------------------------------------------------
    … …  
    7475
    7576  G4DataQuestionaire it(photon);
    76   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT 3.3"<<G4endl;
     77  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT 3.4"<<G4endl;
    7778  G4cout <<G4endl;
    7879
    … …  
    8182
    8283  // EM Physics
    83   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     84  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8485
    8586  // Synchroton Radiation & GN Physics
    86   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     87  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8788
    8889  // Decays
    89   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     90  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9091
    9192   // Hadron Elastic scattering
    92   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     93  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9394
    9495  // Hadron Physics
    95    G4bool quasiElastic;
    96   this->RegisterPhysics( new HadronPhysicsQGSP_BERT("hadron",quasiElastic=true));
     96  this->RegisterPhysics( new HadronPhysicsQGSP_BERT(ver));
    9797
    9898  // Stopping Physics
    99   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     99  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    100100
    101101  // Ion Physics
    102   this->RegisterPhysics( new G4IonPhysics("ion"));
     102  this->RegisterPhysics( new G4IonPhysics(ver));
    103103 
    104104  // Neutron tracking cut
    105   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     105  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    106106
    107107}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_CHIPS.icc

    r1274 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_CHIPS.icc,v 1.1 2010/05/26 15:06:49 gunter Exp $
    27 // GEANT4 tag $Name: phys-lists-V09-03-03 $
     26// $Id: QGSP_BERT_CHIPS.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    6364#include "HadronPhysicsQGSP_BERT_CHIPS.hh"
    6465
     66#include "G4WarnPLStatus.hh"
     67
    6568template<class T> TQGSP_BERT_CHIPS<T>::TQGSP_BERT_CHIPS(G4int ver):  T()
    6669{
    6770
    6871  G4DataQuestionaire it(photon);
    69   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_CHIPS 1.0"<<G4endl;
     72  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_CHIPS 1.1"<<G4endl;
    7073  G4cout <<G4endl;
    7174
    … …  
    7376  this->SetVerboseLevel(ver);
    7477
     78  G4WarnPLStatus exp;
     79  exp.Experimental("QGSP_BETT_CHIPS");
     80
    7581  // EM Physics
    76   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     82  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    7783
    7884  // Synchroton Radiation & GN Physics
    79   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     85  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8086
    8187  // Decays
    82   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     88  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8389
    8490   // Hadron Elastic scattering
    85   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     91  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    8692
    8793  // Hadron Physics
    88    G4bool quasiElastic;
    89   this->RegisterPhysics( new HadronPhysicsQGSP_BERT_CHIPS("hadron",quasiElastic=true));
     94  this->RegisterPhysics( new HadronPhysicsQGSP_BERT_CHIPS(ver));
    9095
    9196  // Stopping Physics
    92   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     97  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9398
    9499  // Ion Physics
    95   this->RegisterPhysics( new G4IonPhysics("ion"));
     100  this->RegisterPhysics( new G4IonPhysics(ver));
    96101 
    97102  // Neutron tracking cut
    98   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     103  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    99104
    100105}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_DIF.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_DIF.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8080
    8181  // EM Physics
    82   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     82  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8383
    8484  // Synchroton Radiation & GN Physics
    85   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     85  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8686
    8787  // Decays
    88   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     88  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8989
    9090   // Hadron Elastic scattering
    91   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     91  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9292
    9393  // Hadron Physics
    … …  
    9999
    100100  // Stopping Physics
    101   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     101  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    102102
    103103  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_EMV.icc,v 1.3 2009/10/04 16:06:39 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_EMV.icc,v 1.6 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    6869
    6970  G4DataQuestionaire it(photon);
    70   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_EMV 1.0"<<G4endl;
     71  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_EMV 1.1"<<G4endl;
    7172  G4cout <<G4endl;
    7273
    … …  
    7576
    7677  // EM Physics
    77   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     78  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    7879
    7980  // Synchroton Radiation & GN Physics
    80   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     81  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8182
    8283  // Decays
    83   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     84  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8485
    8586   // Hadron Elastic scattering
    86   //this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
    87   this-> RegisterPhysics( new G4HadronHElasticPhysics(ver,false));
     87  this->RegisterPhysics( new G4HadronHElasticPhysics(ver) );
    8888
    8989  // Hadron Physics
    90    G4bool quasiElastic;
    91   this->RegisterPhysics( new HadronPhysicsQGSP_BERT("hadron",quasiElastic=true));
     90  this->RegisterPhysics( new HadronPhysicsQGSP_BERT(ver));
    9291
    9392  // Stopping Physics
    94   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     93  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9594
    9695  // Ion Physics
    97   this->RegisterPhysics( new G4IonPhysics("ion"));
     96  this->RegisterPhysics( new G4IonPhysics(ver));
    9897 
    9998  // Neutron tracking cut
    100   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     99  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    101100
    102101}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_EMX.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_EMX.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3636// Modified:
    3737// 27.11.2009 G.Folger: Mark as experimental
     38// 04.06.2010 G.Folger: Use new ctor for builders
    3839//
    3940//----------------------------------------------------------------------------
    … …  
    7071
    7172  G4DataQuestionaire it(photon);
    72   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_EMX 1.0"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_EMX 1.1"<<G4endl;
    7374  G4cout <<G4endl;
    7475
    … …  
    8081
    8182  // EM Physics
    82   this->RegisterPhysics( new G4EmStandardPhysics_option2(ver));
     83  this->RegisterPhysics( new G4EmStandardPhysics_option2(ver) );
    8384
    8485  // Synchroton Radiation & GN Physics
    85   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     86  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8687
    8788  // Decays
    88   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     89  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8990
    9091   // Hadron Elastic scattering
    91   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     92  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9293
    9394  // Hadron Physics
    94    G4bool quasiElastic;
    95   this->RegisterPhysics( new HadronPhysicsQGSP_BERT("hadron",quasiElastic=true));
     95  this->RegisterPhysics( new HadronPhysicsQGSP_BERT(ver));
    9696
    9797  // Stopping Physics
    98   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     98  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9999
    100100  // Ion Physics
    101   this->RegisterPhysics( new G4IonPhysics("ion"));
     101  this->RegisterPhysics( new G4IonPhysics(ver));
    102102 
    103103  // Neutron tracking cut
    104   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     104  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    105105
    106106}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_HP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_HP.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_HP.icc,v 1.6 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4040// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
    4141// 16.05.2007 V.Ivanchenko: rename EM builders
     42// 04.06.2010 G.Folger: Use new ctor for builders
    4243//
    4344
    … …  
    6061#include "G4IonPhysics.hh"
    6162#include "G4QStoppingPhysics.hh"
    62 #include "G4HadronElasticPhysics.hh"
     63#include "G4HadronElasticPhysicsHP.hh"
    6364
    6465#include "G4DataQuestionaire.hh"
    … …  
    6970
    7071  G4DataQuestionaire it(photon, neutron);
    71   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_HP 2.3"<<G4endl;
     72  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_HP 2.4"<<G4endl;
    7273  G4cout <<G4endl<<G4endl;
    7374
    … …  
    7677
    7778  // EM Physics
    78   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     79  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    7980
    8081  // Synchroton Radiation & GN Physics
    81   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     82  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8283
    8384  // Decays
    84   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     85  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8586
    8687   // Hadron Elastic scattering
    87   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,true));
     88  this-> RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );
    8889
    8990  // Hadron Physics
    90    G4bool quasiElastic;
    91   this->RegisterPhysics( new HadronPhysicsQGSP_BERT_HP("hadron",quasiElastic=true));
     91  this->RegisterPhysics( new HadronPhysicsQGSP_BERT_HP(ver));
    9292
    9393  // Stopping Physics
    94   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     94  this->RegisterPhysics( new G4QStoppingPhysics(ver));
    9595
    9696  // Ion Physics
    97   this->RegisterPhysics( new G4IonPhysics("ion"));
     97  this->RegisterPhysics( new G4IonPhysics(ver));
    9898
    9999}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_NOLEP.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_NOLEP.icc,v 1.5 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3737// 15.10.2005 G.Folger: first version
    3838// 27.11.2009 G.Folger, Use QElastic directly
     39// 04.06.2010 G.Folger: Use new ctor for builders
    3940//
    4041//----------------------------------------------------------------------------
    … …  
    7980
    8081  // EM Physics
    81   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     82  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8283
    8384  // Synchroton Radiation & GN Physics
    84   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     85  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8586
    8687  // Decays
    87   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     88  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8889
    8990   // Hadron Elastic scattering
    90   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     91  this->RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9192
    9293  // Hadron Physics
    93    G4bool quasiElastic;
    94   this->RegisterPhysics( new HadronPhysicsQGSP_BERT_NOLEP("hadron",quasiElastic=true));
     94  this->RegisterPhysics( new HadronPhysicsQGSP_BERT_NOLEP(ver));
    9595
    9696  // Stopping Physics
    97   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     97  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9898
    9999  // Ion Physics
    100   this->RegisterPhysics( new G4IonPhysics("ion"));
     100  this->RegisterPhysics( new G4IonPhysics(ver));
    101101 
    102102  // Neutron tracking cut
    103   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     103  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    104104
    105105}

  • trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8484
    8585  // Synchroton Radiation & GN Physics
    86   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     86  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8787
    8888  // Decays
    89   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     89  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9090
    9191   // Hadron Elastic scattering
    92   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     92  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9393
    9494  // Hadron Physics
    … …  
    9797
    9898  // Stopping Physics
    99   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     99  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    100100
    101101  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_TRV.icc,v 1.3 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BERT_TRV.icc,v 1.6 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3737// 16.05.2007 V.Ivanchenko: rename EM builders
    3838// 27.11.2009 G.Folger: Mark as experimental
     39// 04.06.2010 G.Folger: Use new ctor for builders
    3940//
    4041//----------------------------------------------------------------------------
    … …  
    7172
    7273  G4DataQuestionaire it(photon);
    73   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_TRV 1.1"<<G4endl;
     74  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_TRV 1.2"<<G4endl;
    7475  G4cout <<G4endl;
    7576
    … …  
    8182
    8283  // EM Physics
    83   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     84  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8485
    8586  // Synchroton Radiation & GN Physics
    86   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     87  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8788
    8889  // Decays
    89   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     90  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9091
    9192   // Hadron Elastic scattering
    92   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     93  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9394
    9495  // Hadron Physics
    95    G4bool quasiElastic;
    96   this->RegisterPhysics( new HadronPhysicsQGSP_BERT_TRV("hadron",quasiElastic=true));
     96  this->RegisterPhysics( new HadronPhysicsQGSP_BERT_TRV(ver));
    9797
    9898  // Stopping Physics
    99   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     99  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    100100
    101101  // Ion Physics
    102   this->RegisterPhysics( new G4IonPhysics("ion"));
     102  this->RegisterPhysics( new G4IonPhysics(ver));
    103103 
    104104  // Neutron tracking cut
    105   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     105  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    106106
    107107}

  • trunk/source/physics_lists/lists/include/QGSP_BIC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BIC.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BIC.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    7676
    7777  G4DataQuestionaire it(photon);
    78   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC 3.3"<<G4endl;
     78  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC 3.4"<<G4endl;
    7979  G4cout <<G4endl;
    8080
    … …  
    8383
    8484  // EM Physics
    85   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     85  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8686
    8787  // Synchroton Radiation & GN Physics
    88   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     88  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8989
    9090  // Decays
    91   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     91  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9292
    9393   // Hadron Elastic scattering
    94   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     94  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9595
    9696   // Hadron Physics
    97    G4bool quasiElastic;
    98   this->RegisterPhysics(  new HadronPhysicsQGSP_BIC("hadron",quasiElastic=true));
     97  this->RegisterPhysics(  new HadronPhysicsQGSP_BIC(ver));
    9998
    10099  // Stopping Physics
    101   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     100  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    102101
    103102  // Ion Physics
    104   this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     103  this->RegisterPhysics( new G4IonBinaryCascadePhysics(ver));
    105104 
    106105  // Neutron tracking cut
    107   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     106  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    108107
    109108}

  • trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BIC_EMY.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BIC_EMY.icc,v 1.4 2010/06/07 15:34:32 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    6869
    6970  G4DataQuestionaire it(photon);
    70   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC_EMY 1.0"<<G4endl;
     71  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC_EMY 1.1"<<G4endl;
    7172  G4cout <<G4endl;
    7273
    … …  
    7576
    7677  // EM Physics
    77   this->RegisterPhysics( new G4EmStandardPhysics_option3(ver));
     78  this->RegisterPhysics( new G4EmStandardPhysics_option3(ver) );
    7879
    7980  // Synchroton Radiation & GN Physics
    80   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     81  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8182
    8283  // Decays
    83   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     84  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8485
    8586   // Hadron Elastic scattering
    86   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     87  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    8788
    8889   // Hadron Physics
    89    G4bool quasiElastic;
    90   this->RegisterPhysics(  new HadronPhysicsQGSP_BIC("hadron",quasiElastic=true));
     90  this->RegisterPhysics( new HadronPhysicsQGSP_BIC(ver));
    9191
    9292  // Stopping Physics
    93   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     93  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9494
    9595  // Ion Physics
    96   this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC_EMY"));
     96  this->RegisterPhysics( new G4IonBinaryCascadePhysics(ver));
    9797 
    9898  // Neutron tracking cut
    99   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     99  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    100100
    101101}

  • trunk/source/physics_lists/lists/include/QGSP_BIC_HP.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BIC_HP.icc,v 1.5 2007/05/24 11:32:57 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_BIC_HP.icc,v 1.7 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3737// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
    3838// 16.05.2007 V.Ivanchenko: rename EM builders
     39// 04.06.2010 G.Folger: Use new ctor for builders
    3940//
    4041//----------------------------------------------------------------------------
    … …  
    5859#include "G4IonBinaryCascadePhysics.hh"
    5960#include "G4QStoppingPhysics.hh"
    60 #include "G4HadronElasticPhysics.hh"
     61#include "G4HadronElasticPhysicsHP.hh"
    6162
    6263#include "G4DataQuestionaire.hh"
    … …  
    6970
    7071  G4DataQuestionaire it(photon);
    71   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC_HP 1.2"<<G4endl;
     72  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC_HP 1.3"<<G4endl;
    7273  G4cout <<G4endl;
    7374
    … …  
    7778
    7879  // EM Physics
    79   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     80  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8081
    8182  // Synchroton Radiation & GN Physics
    82   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     83  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8384
    8485  // Decays
    85   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     86  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8687
    8788   // Hadron Elastic scattering
    88   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,true));
     89  this->RegisterPhysics( new G4HadronElasticPhysicsHP(ver) );
    8990
    9091   // Hadron Physics
    91    G4bool quasiElastic;
    92   this->RegisterPhysics(  new HadronPhysicsQGSP_BIC_HP("hadron",quasiElastic=true));
     92  this->RegisterPhysics(  new HadronPhysicsQGSP_BIC_HP(ver));
    9393
    9494  // Stopping Physics
    95   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     95  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9696
    9797  // Ion Physics
    98   this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     98  this->RegisterPhysics( new G4IonBinaryCascadePhysics(ver));
    9999 
    100100}

  • trunk/source/physics_lists/lists/include/QGSP_DIF.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_DIF.icc,v 1.2 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_DIF.icc,v 1.3 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8585
    8686  // Synchroton Radiation & GN Physics
    87   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     87  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8888
    8989  // Decays
    90   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     90  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9191
    9292   // Hadron Elastic scattering
    93   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     93  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9494
    9595   // Hadron Physics
    … …  
    100100
    101101  // Stopping Physics
    102   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     102  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    103103
    104104  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_EMV.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_EMV.icc,v 1.7 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_EMV.icc,v 1.8 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8989
    9090  // EM Physics
    91   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     91  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    9292
    9393  // Synchroton Radiation & GN Physics
    94   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     94  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9595
    9696  // General Physics - i.e. decay
    97   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     97  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9898
    9999   // Hadron Elastic scattering
    100   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     100  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    101101
    102102   // Hadron Physics
    … …  
    105105
    106106  // Stopping Physics
    107   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     107  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    108108
    109109  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_EMV_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_EMV_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    7979
    8080  // EM Physics
    81   this->RegisterPhysics( new G4EmStandardPhysics_option1(ver));
     81  this->RegisterPhysics( new G4EmStandardPhysics_option1(ver) );
    8282
    8383  // Synchroton Radiation & GN Physics
    84   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     84  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8585
    8686  // General Physics - i.e. decay
    87   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     87  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8888
    8989   // Hadron Elastic scattering
    90   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     90  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9191
    9292   // Hadron Physics
    … …  
    9595
    9696  // Stopping Physics
    97   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     97  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9898
    9999  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_FTFP_BERT.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_FTFP_BERT.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535// Modified:
    3636// 27.11.2009 G.Folger: Mark as experimental
     37// 04.06.2010 G.Folger: Use new ctor for builders
     38// 04.06.2010 G.Folger: Remove experimental status
    3739//
    3840//----------------------------------------------------------------------------
    … …  
    6365#include "HadronPhysicsQGSP_FTFP_BERT.hh"
    6466
    65 #include "G4WarnPLStatus.hh"
    66 
    6767template<class T> TQGSP_FTFP_BERT<T>::TQGSP_FTFP_BERT(G4int ver):  T()
    6868{
    6969
    7070  G4DataQuestionaire it(photon);
    71   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_FTFP_BERT 3.3"<<G4endl;
     71  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_FTFP_BERT 3.5"<<G4endl;
    7272  G4cout <<G4endl;
    7373
    … …  
    7575  this->SetVerboseLevel(ver);
    7676
    77   G4WarnPLStatus exp;
    78   exp.Experimental("QGSP_FTFP_BERT");
    79 
    8077  // EM Physics
    81   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     78  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8279
    8380  // Synchroton Radiation & GN Physics
    84   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     81  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8582
    8683  // Decays
    87   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     84  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8885
    8986   // Hadron Elastic scattering
    90   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     87  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9188
    9289  // Hadron Physics
    93    G4bool quasiElastic;
    94   this->RegisterPhysics( new HadronPhysicsQGSP_FTFP_BERT("hadron",quasiElastic=true));
     90  this->RegisterPhysics( new HadronPhysicsQGSP_FTFP_BERT(ver));
    9591
    9692  // Stopping Physics
    97   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     93  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9894
    9995  // Ion Physics
    100   this->RegisterPhysics( new G4IonPhysics("ion"));
     96  this->RegisterPhysics( new G4IonPhysics(ver));
    10197 
    10298  // Neutron tracking cut
    103   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     99  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    104100
    105101}

  • trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_INCL_ABLA.icc,v 1.3 2009/12/03 14:31:35 kaitanie Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_INCL_ABLA.icc,v 1.5 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3636// Modified:
    3737// 27.11.2009 G.Folger: Mark as experimental
     38// 04.06.2010 G.Folger: Use new ctor for builders
    3839//
    3940//----------------------------------------------------------------------------
    … …  
    7071
    7172  G4DataQuestionaire it(photon);
    72   G4cout << "<<< Geant4 Physics List simulation engine: QGSP_INCL_ABLA 0.1"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_INCL_ABLA 0.2"<<G4endl;
    7374  G4cout <<G4endl;
    7475
    … …  
    8081
    8182  // EM Physics
    82   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     83  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8384
    8485  // Synchroton Radiation & GN Physics
    85   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     86  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8687
    8788  // Decays
    88   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     89  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8990
    9091   // Hadron Elastic scattering
    91   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     92  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9293
    9394  // Hadron Physics
    94    G4bool quasiElastic;
    95   this->RegisterPhysics( new HadronPhysicsQGSP_INCL_ABLA("hadron",quasiElastic=true));
     95  this->RegisterPhysics( new HadronPhysicsQGSP_INCL_ABLA(ver));
    9696
    9797  // Stopping Physics
    98   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     98  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9999
    100100  // Ion Physics
    101   this->RegisterPhysics( new G4IonInclAblaPhysics("ion"));
     101  this->RegisterPhysics( new G4IonInclAblaPhysics(ver));
    102102 
    103103  // Neutron tracking cut
    104   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     104  this->RegisterPhysics( new G4NeutronTrackingCut(ver));
    105105
    106106}

  • trunk/source/physics_lists/lists/include/QGSP_NQE.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_NQE.icc,v 1.4 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8383
    8484  // EM Physics
    85   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     85  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8686
    8787  // Synchroton Radiation & GN Physics
    88   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     88  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8989
    9090  // Decays
    91   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     91  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9292
    9393   // Hadron Elastic scattering
    94   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     94  this-> RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9595
    9696   // Hadron Physics
    … …  
    9999
    100100  // Stopping Physics
    101   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     101  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    102102
    103103  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGSP_QEL.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_QEL.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGSP_QEL.icc,v 1.5 2010/06/03 15:46:04 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8585
    8686  // EM Physics
    87   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     87  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8888
    8989  // Synchroton Radiation & GN Physics
    90   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     90  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    9191
    9292  // Decays
    93   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     93  this->RegisterPhysics( new G4DecayPhysics(ver) );
    9494
    9595   // Hadron Elastic scattering, "CHIPS" version
    96   this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
     96  this-> RegisterPhysics( new G4HadronQElasticPhysics(ver) );
    9797
    9898   // Hadron Physics
    … …  
    101101
    102102  // Stopping Physics
    103   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     103  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    104104
    105105  // Ion Physics

  • trunk/source/physics_lists/lists/include/QGS_BIC.icc

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: QGS_BIC.icc,v 1.2 2007/12/10 17:33:58 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: QGS_BIC.icc,v 1.4 2010/06/04 16:05:04 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 04.06.2010 G.Folger: Use new ctor for builders
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    7071
    7172  G4DataQuestionaire it(photon);
    72   G4cout << "<<< Geant4 Physics List simulation engine: QGS_BIC 1.0"<<G4endl;
     73  G4cout << "<<< Geant4 Physics List simulation engine: QGS_BIC 1.1"<<G4endl;
    7374  G4cout <<G4endl;
    7475
    … …  
    8081
    8182  // EM Physics
    82   this->RegisterPhysics( new G4EmStandardPhysics(ver));
     83  this->RegisterPhysics( new G4EmStandardPhysics(ver) );
    8384
    8485  // Synchroton Radiation & GN Physics
    85   this->RegisterPhysics( new G4EmExtraPhysics("extra EM"));
     86  this->RegisterPhysics( new G4EmExtraPhysics(ver) );
    8687
    8788  // Decays
    88   this->RegisterPhysics( new G4DecayPhysics("decay",ver) );
     89  this->RegisterPhysics( new G4DecayPhysics(ver) );
    8990
    9091   // Hadron Elastic scattering
    91   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     92  this->RegisterPhysics( new G4HadronElasticPhysics(ver) );
    9293
    9394   // Hadron Physics
    94    G4bool quasiElastic;
    95   this->RegisterPhysics(  new HadronPhysicsQGS_BIC("hadron",quasiElastic=true));
     95  this->RegisterPhysics(  new HadronPhysicsQGS_BIC(ver) );
    9696
    9797  // Stopping Physics
    98   this->RegisterPhysics( new G4QStoppingPhysics("stopping"));
     98  this->RegisterPhysics( new G4QStoppingPhysics(ver) );
    9999
    100100  // Ion Physics
    101   this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
     101  this->RegisterPhysics( new G4IonBinaryCascadePhysics(ver) );
    102102 
    103103  // Neutron tracking cut
    104   this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
     104  this->RegisterPhysics( new G4NeutronTrackingCut(ver) );
    105105
    106106}

  • 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.