Changeset 1205 for trunk


Ignore:
Timestamp:
Nov 27, 2009, 4:50:05 PM (15 years ago)
Author:
garnier
Message:

CVS update

Location:
trunk/source/physics_lists/lists
Files:
102 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/physics_lists/lists/GNUmakefile

    r850 r1205  
    1 # $Id: GNUmakefile,v 1.2 2008/05/30 11:01:37 vnivanch Exp $
     1# $Id: GNUmakefile,v 1.7 2009/11/20 10:24:28 mkossov Exp $
    22# ---------------------------------------------------------------------------
    33# GNUmakefile for physics_lists/lists library.  Gunter Folger 25-Oct-2006.
    … …  
    4848            -I$(G4BASE)/processes/hadronic/stopping/include \
    4949            -I$(G4BASE)/processes/hadronic/management/include \
     50            -I$(G4BASE)/processes/hadronic/models/management/include \
    5051            -I$(G4BASE)/processes/hadronic/processes/include \
    5152            -I$(G4BASE)/processes/hadronic/util/include \
    … …  
    5859            -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
    5960            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
     61            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
     62            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include \
     63            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/processes/include \
    6064            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
    6165            -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
    … …  
    7175            -I$(G4BASE)/processes/hadronic/models/high_energy/include \
    7276            -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
     77            -I$(G4BASE)/processes/hadronic/models/incl/include \
    7378            -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
    7479            -I$(G4BASE)/processes/hadronic/models/leading_particle/include \

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

    r988 r1205  
    2525//
    2626// $Id: FTFC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFC.icc,v 1.6 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: FTFC.icc,v 1.7 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 28.11.2005 G.Folger: migration to non static particles
    3738// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
    … …  
    6970#include "HadronPhysicsFTFC.hh"
    7071
     72#include "G4WarnPLStatus.hh"
     73
    7174template<class T> TFTFC<T>::TFTFC(G4int ver):  T()
    7275{
    … …  
    7881  this->defaultCutValue = 0.7*mm; 
    7982  this->SetVerboseLevel(ver);
     83
     84  G4WarnPLStatus obs;
     85  obs.Unsupported("FTFC");
    8086
    8187  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: FTFP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: FTFP.icc,v 1.6 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: FTFP_BERT.hh,v 1.1 2007/10/19 15:35:08 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: FTFP_BERT.icc,v 1.2 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: FTFP_EMV.hh,v 1.1 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: FTFP_EMV.icc,v 1.3 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: FTFP_EMV.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738// 28.11.2005 G.Folger: migration to non static particles
    3839// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
    … …  
    7172#include "HadronPhysicsFTFP.hh"
    7273
     74#include "G4WarnPLStatus.hh"
     75
    7376template<class T> TFTFP_EMV<T>::TFTFP_EMV(G4int ver):  T()
    7477{
    … …  
    8083  this->defaultCutValue = 0.7*mm; 
    8184  this->SetVerboseLevel(ver);
     85
     86  G4WarnPLStatus obs;
     87  obs.Unsupported("FTFP_EMV","FTFP_BERT_EMV");
     88  G4Exception(" Crash for usage of replaced physics list");
    8289
    8390  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: FTF_BIC.hh,v 1.1 2007/11/16 16:52:55 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: FTF_BIC.icc,v 1.2 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: FTF_BIC.icc,v 1.4 2009/06/02 16:51:35 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.hh,v 1.7 2008/09/24 18:10:51 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4HadronInelasticQBBC.hh,v 1.12 2009/11/25 13:10:51 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3131// ClassName:   G4HadronInelasticQBBC
    3232//
    33 // Author: 11 April 2006 V. Ivanchenko
     33// Author: 31 August 2009 V. Ivanchenko
    3434//
    3535// Modified:
    36 // 05.07.2006 V.Ivanchenko fix problem of initialisation of HP
    3736//
    3837//----------------------------------------------------------------------------
    … …  
    4342
    4443#include "globals.hh"
    45 #include "G4VPhysicsConstructor.hh"
    46 #include "G4QGSModel.hh"
    47 #include "G4QGSParticipants.hh"
    48 #include "G4FTFModel.hh"
    49 #include "G4CascadeInterface.hh"
     44#include "G4VHadronPhysics.hh"
    5045
    51 #include "G4PiNuclearCrossSection.hh"
    52 #include "G4ProtonInelasticCrossSection.hh"
    53 #include "G4NeutronInelasticCrossSection.hh"
    54 #include "G4NeutronHPInelasticData.hh"
    55 #include "G4NeutronHPCaptureData.hh"
    56 #include "G4NeutronHPFissionData.hh"
    57 
    58 class G4HadronicProcess;
    59 class G4TheoFSGenerator;
    60 class G4QStringChipsParticleLevelInterface;
    61 class G4ExcitedStringDecay;
    62 class G4HadronProcessStore;
    63 class G4GeneratorPrecompoundInterface;
    64 class G4BinaryCascade;
    65 class G4PreCompoundModel;
    66 class G4QuasiElasticChannel;
    67 
    68 class G4HadronInelasticQBBC : public G4VPhysicsConstructor
     46class G4HadronInelasticQBBC : public G4VHadronPhysics
    6947{
    7048public:
    7149
    72   G4HadronInelasticQBBC(const G4String& name = "inelastic",
     50  // constructor
     51  G4HadronInelasticQBBC(const G4String& name = "QBBC",
    7352                        G4int ver = 1, G4bool ftf = false, G4bool bert = false,
    7453                        G4bool chips = false, G4bool hp = false,
    … …  
    7756  virtual ~G4HadronInelasticQBBC();
    7857
    79 public:
    80 
    81   // This method will be invoked in the Construct() method.
    82   // each particle type will be instantiated
    83   virtual void ConstructParticle();
    84  
    8558  // This method will be invoked in the Construct() method.
    8659  // each physics process will be instantiated and
    … …  
    9063private:
    9164
    92   G4PiNuclearCrossSection thePiCross;
    93   G4ProtonInelasticCrossSection  theXSecP;
    94   G4NeutronInelasticCrossSection theXSecN;
     65  // copy constructor and hide assignment operator
     66  G4HadronInelasticQBBC(G4HadronInelasticQBBC &);
     67  G4HadronInelasticQBBC & operator=(const G4HadronInelasticQBBC &right);
    9568
    96   G4NeutronHPInelasticData*  theHPXSecI;
    97   G4NeutronHPCaptureData*    theHPXSecC;
    98   G4NeutronHPFissionData*    theHPXSecF;
    99 
    100   G4HadronProcessStore* store;
    101 
    102   G4PreCompoundModel* thePreEquilib;
    103   G4QuasiElasticChannel*    theQuasiElastic;
    104   G4GeneratorPrecompoundInterface* preCompound;
    105   G4BinaryCascade* theCascade;
    106   G4QStringChipsParticleLevelInterface * theCHIPSCascade;
    107   G4QGSModel< G4QGSParticipants > * theQGStringModel;
    108   G4ExcitedStringDecay* theQGStringDecay;
    109   G4ExcitedStringDecay* theFTFBStringDecay;
    110   G4ExcitedStringDecay* theFTFCStringDecay;
    111   G4FTFModel*           theFTFBStringModel;
    112   G4FTFModel*           theFTFCStringModel;
    113 
     69  G4String htype;
    11470  G4int    verbose;
    115   G4bool   ftfFlag;
    116   G4bool   bertFlag;
    117   G4bool   chipsFlag;
    118   G4bool   hpFlag;
    119   G4bool   glFlag;
    12071  G4bool   wasActivated;
    12172};

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

    r988 r1205  
    2525//
    2626// $Id: G4HadronInelasticQLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: G4PhysListFactory.hh,v 1.2 2008/11/21 16:50:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFC.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFP.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFP_BERT.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTF_BIC.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC_BERT.hh,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: HadronPhysicsQGSC_BERT.hh,v 1.2 2009/04/09 08:22:53 mkossov Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSC_EFLOW.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP.hh,v 1.4 2007/11/13 10:16:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT.hh,v 1.3 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.3 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_TRV.hh,v 1.1 2007/05/07 14:34:29 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC_HP.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGS_BIC.hh,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: LHEP.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: LHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_BERT.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: LHEP_BERT.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 30.11.2005 G.Folger: migration to non static particles
    3738// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
    … …  
    6667#include "HadronPhysicsLHEP_BERT.hh"
    6768
     69#include "G4WarnPLStatus.hh"
     70
    6871template<class T> TLHEP_BERT<T>::TLHEP_BERT(G4int ver):  T()
    6972{
    … …  
    7780  this->defaultCutValue = 0.7*mm; 
    7881  this->SetVerboseLevel(ver);
     82
     83  G4WarnPLStatus obs;
     84  obs.Unsupported("LHEP_BERT","QGSP_BERT");
    7985
    8086  // EM Physics

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_BERT_HP.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: LHEP_BERT_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 30.11.2005 G.Folger: migration to non static particles
    3738// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
    … …  
    6667#include "HadronPhysicsLHEP_BERT_HP.hh"
    6768
     69#include "G4WarnPLStatus.hh"
     70
    6871template<class T> TLHEP_BERT_HP<T>::TLHEP_BERT_HP(G4int ver):  T()
    6972{
    … …  
    7578  this->defaultCutValue = 0.7*mm; 
    7679  this->SetVerboseLevel(ver);
     80
     81  G4WarnPLStatus obs;
     82  obs.Unsupported("LHEP_BERT_HP","QGSP_BERT_HP");
    7783
    7884  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: LHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: LHEP_EMV.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: LHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: LHEP_PRECO_HP.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: LHEP_PRECO_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
    3738// 08.06.2006 V.Ivanchenko: migration to CHIPS stopping
    … …  
    6566#include "HadronPhysicsLHEP_PRECO_HP.hh"
    6667
     68#include "G4WarnPLStatus.hh"
     69
    6770template<class T> TLHEP_PRECO_HP<T>::TLHEP_PRECO_HP(G4int ver):  T()
    6871{
    … …  
    7477  this->defaultCutValue = 0.7*mm; 
    7578  this->SetVerboseLevel(ver);
     79
     80  G4WarnPLStatus obs;
     81  obs.Unsupported("LHEP_PRECO_HP","QGSP_BIC_HP");
    7682
    7783  // EM Physics

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

    r988 r1205  
    2626//
    2727// $Id: MinEkineCuts.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QBBC.hh,v 1.2 2007/04/16 11:57:40 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QBBC.hh,v 1.3 2009/10/04 16:05:10 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3737//----------------------------------------------------------------------------
    3838//
    39 #ifndef TQBBC_h
    40 #define TQBBC_h 1
     39#ifndef QBBC_h
     40#define QBBC_h 1
    4141
    4242#include "G4VModularPhysicsList.hh"
    4343#include "globals.hh"
    44 #include "CompileTimeConstraints.hh"
    4544
    46 template<class T>
    47 class TQBBC: public T
     45class QBBC : public G4VModularPhysicsList
    4846{
    4947public:
    5048
    51   TQBBC(G4int ver = 1, const G4String& type = "QBBC", G4bool glauber = true);
     49  QBBC(G4int ver = 1, const G4String& type = "QBBC");
    5250
    53   virtual ~TQBBC();
    54  
    55 public:
     51  virtual ~QBBC();
    5652
    5753  virtual void SetCuts();
    5854
    5955private:
    60   enum {ok = CompileTimeConstraints::IsA<T, G4VModularPhysicsList>::ok };
     56
     57  // copy constructor and hide assignment operator
     58  QBBC(QBBC &);
     59  QBBC & operator=(const QBBC &right);
     60
    6161};
    62 
    63 #include "QBBC.icc"
    64 typedef TQBBC<G4VModularPhysicsList> QBBC;
    6562
    6663#endif

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

    r988 r1205  
    2525//
    2626// $Id: QGSC.icc,v 1.8 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSC_BERT.icc,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSC_EFLOW.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSC_EFLOW.icc,v 1.5 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535// Created as copy of QGSC
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
    3839// 26.04.2007 G.Folger  Use QCaptureAtRest for muon
    … …  
    6566#include "HadronPhysicsQGSC_EFLOW.hh"
    6667
     68#include "G4WarnPLStatus.hh"
     69
    6770template<class T> TQGSC_EFLOW<T>::TQGSC_EFLOW(G4int ver):  T()
    6871{
    … …  
    7477  this->defaultCutValue = 0.7*mm; 
    7578  this->SetVerboseLevel(ver);
     79
     80  G4WarnPLStatus obs;
     81  obs.Unsupported("QGSC_EFLOW","QGSC_CHIPS");
     82  G4Exception(" Crash for usage of replaced physics list");
    7683
    7784  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSC_EMV.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2626//
    2727// $Id: QGSP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP.icc,v 1.7 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_DIF.hh,v 1.1 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_DIF.icc,v 1.2 2007/12/10 17:46:31 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_BERT_DIF.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    7576  this->SetVerboseLevel(ver);
    7677
    77   G4WarnPLStatus exp;
    78   exp.Experimental("QGSP_BERT_DIF");
     78  G4WarnPLStatus obs;
     79  obs.Unsupported("QGSP_BERT_DIF");
    7980
    8081  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_EMV.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_EMV.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_BERT_EMV.icc,v 1.3 2009/10/04 16:06:39 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5858#include "G4QStoppingPhysics.hh"
    5959#include "G4HadronElasticPhysics.hh"
     60#include "G4HadronHElasticPhysics.hh"
    6061#include "G4NeutronTrackingCut.hh"
    6162
    … …  
    8384
    8485   // Hadron Elastic scattering
    85   this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     86  //this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
     87  this-> RegisterPhysics( new G4HadronHElasticPhysics(ver,false));
    8688
    8789  // Hadron Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_HP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_HP.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_BERT_NQE.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_BERT_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738// 16.05.2007 V.Ivanchenko: rename EM builders
    3839//
    … …  
    6465#include "HadronPhysicsQGSP_BERT.hh"
    6566
     67#include "G4WarnPLStatus.hh"
     68
    6669template<class T> TQGSP_BERT_NQE<T>::TQGSP_BERT_NQE(G4int ver):  T()
    6770{
    … …  
    7376  this->defaultCutValue = 0.7*mm; 
    7477  this->SetVerboseLevel(ver);
     78
     79  G4WarnPLStatus obs;
     80  obs.Unsupported("QGSP_BERT_NQE");
    7581
    7682  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_TRV.hh,v 1.1 2007/05/07 14:34:29 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BERT_TRV.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BIC.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BIC.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BIC_HP.hh,v 1.1 2006/11/24 16:31:35 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_BIC_HP.icc,v 1.5 2007/05/24 11:32:57 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2626//
    2727// $Id: QGSP_DIF.hh,v 1.1 2007/11/13 10:20:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_DIF.icc,v 1.1 2007/11/13 10:20:32 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_DIF.icc,v 1.2 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    6364#include "HadronPhysicsQGSP.hh"
    6465
     66#include "G4WarnPLStatus.hh"
     67
    6568template<class T> TQGSP_DIF<T>::TQGSP_DIF(G4int ver):  T()
    6669{
    … …  
    7477  this->defaultCutValue = 0.7*mm; 
    7578  this->SetVerboseLevel(ver);
     79
     80  G4WarnPLStatus obs;
     81  obs.Unsupported("QGSP_DIF");
    7682
    7783  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_EMV.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_EMV.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_EMV.icc,v 1.6 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 23.11.2005 G.Folger: migration to non static particles
    3738// 30.11.2005 G.Folger: Register EmStandard first,
    … …  
    7475#include "HadronPhysicsQGSP.hh"
    7576
     77#include "G4WarnPLStatus.hh"
     78
    7679template<class T> TQGSP_EMV<T>::TQGSP_EMV(G4int ver):  T()
    7780{
    … …  
    8184  this->defaultCutValue = 0.7*mm; 
    8285  this->SetVerboseLevel(ver);
     86
     87  G4WarnPLStatus obs;
     88  obs.Unsupported("QGSP_EMV");
    8389
    8490  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_EMV_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_EMV_NQE.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_EMV_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738// 16.05.2007 V.Ivanchenko: rename EM builders
    3839//
    … …  
    6465#include "HadronPhysicsQGSP.hh"
    6566
     67#include "G4WarnPLStatus.hh"
     68
    6669template<class T> TQGSP_EMV_NQE<T>::TQGSP_EMV_NQE(G4int ver):  T()
    6770{
    … …  
    7174  this->defaultCutValue = 0.7*mm; 
    7275  this->SetVerboseLevel(ver);
     76
     77  G4WarnPLStatus obs;
     78  obs.Unsupported("QGSP_EMV_NQE");
    7379
    7480  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGSP_EMX.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_EMX.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_EMX.icc,v 1.7 2009/06/02 16:51:35 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 18.05.2009 G.Folger: obsoleted
    3637// 20.11.2006 G.Folger: add Tracking Cut for neutrons
    3738// 21.06.2006 V.Ivanchenko crerate from QGSP_EMV
    … …  
    6869#include "HadronPhysicsQGSP.hh"
    6970
     71#include "G4WarnPLStatus.hh"
     72
    7073template<class T> TQGSP_EMX<T>::TQGSP_EMX(G4int ver):  T()
    7174{
    … …  
    7578  this->defaultCutValue = 7.*mm; 
    7679  this->SetVerboseLevel(ver);
     80
     81  G4WarnPLStatus obs;
     82  obs.Unsupported("QGSP_EMX","QGSP_BERT_EMX");
     83  G4Exception(" Crash for usage of replaced physics list");
    7784
    7885  // EM Physics

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

    r988 r1205  
    2626//
    2727// $Id: QGSP_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_NQE.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535//
    3636// Modified:
     37// 18.05.2009 G.Folger: obsoleted
    3738// 16.05.2007 V.Ivanchenko: rename EM builders
    3839//
    … …  
    6465#include "HadronPhysicsQGSP.hh"
    6566
     67#include "G4WarnPLStatus.hh"
     68
    6669template<class T> TQGSP_NQE<T>::TQGSP_NQE(G4int ver):  T()
    6770{
    … …  
    7578  this->defaultCutValue = 0.7*mm; 
    7679  this->SetVerboseLevel(ver);
     80
     81  G4WarnPLStatus obs;
     82  obs.Unsupported("QGSP_NQE");
    7783
    7884  // EM Physics

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

    r988 r1205  
    2626//
    2727// $Id: QGSP_QEL.hh,v 1.1 2006/11/28 15:41:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: QGSP_QEL.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: QGSP_QEL.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3636// Created from QGSP
    3737// Modified:
     38// 18.05.2009 G.Folger: obsoleted
    3839// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
    3940// 16.05.2007 V.Ivanchenko: rename EM builders
    … …  
    6667#include "HadronPhysicsQGSP.hh"
    6768
     69#include "G4WarnPLStatus.hh"
     70
    6871template<class T> TQGSP_QEL<T>::TQGSP_QEL(G4int ver):  T()
    6972{
    … …  
    7780  this->defaultCutValue = 0.7*mm; 
    7881  this->SetVerboseLevel(ver);
     82
     83  G4WarnPLStatus obs;
     84  obs.Unsupported("QGSP_QEL");
    7985
    8086  // EM Physics

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

    r988 r1205  
    2525//
    2626// $Id: QGS_BIC.hh,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: QGS_BIC.icc,v 1.2 2007/12/10 17:33:58 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronInelasticQBBC.cc,v 1.16 2009/02/19 12:45:42 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4HadronInelasticQBBC.cc,v 1.24 2009/11/25 18:55:56 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3131// ClassName:   G4HadronInelasticQBBC
    3232//
    33 // Author: 11 April 2006 V. Ivanchenko
     33// Author: 2 October 2009 V. Ivanchenko
    3434//
    3535// Modified:
    36 // 05.07.2006 V.Ivanchenko fix problem of initialisation of HP
    37 // 15.04.2007 V.Ivanchenko include quasi-elastic and change FTF low energy
    3836//
    3937//----------------------------------------------------------------------------
    … …  
    4341
    4442#include "G4HadronInelasticProcess.hh"
     43#include "G4HadronicInteraction.hh"
    4544
    4645#include "G4ParticleDefinition.hh"
    4746#include "G4ProcessManager.hh"
    4847
    49 #include "G4MesonConstructor.hh"
    50 #include "G4BaryonConstructor.hh"
    51 
    52 #include "G4PiNuclearCrossSection.hh"
    5348#include "G4BGGNucleonInelasticXS.hh"
    5449#include "G4BGGPionInelasticXS.hh"
    55 
    56 #include "G4TheoFSGenerator.hh"
     50//#include "G4UInelasticCrossSection.hh"
     51#include "G4NeutronInelasticXS.hh"
     52#include "G4NeutronCaptureXS.hh"
     53
     54#include "G4ProtonInelasticCrossSection.hh"
     55#include "G4NeutronInelasticCrossSection.hh"
     56#include "G4PiNuclearCrossSection.hh"
     57
     58#include "G4QGSBuilder.hh"
     59#include "G4FTFBuilder.hh"
     60
    5761#include "G4QStringChipsParticleLevelInterface.hh"
    58 #include "G4StringChipsParticleLevelInterface.hh"
    59 #include "G4GeneratorPrecompoundInterface.hh"
    60 #include "G4QGSMFragmentation.hh"
    61 #include "G4LundStringFragmentation.hh"
    62 #include "G4ExcitedStringDecay.hh"
    63 
     62#include "G4CascadeInterface.hh"
    6463#include "G4BinaryCascade.hh"
    65 #include "G4HadronFissionProcess.hh"
    66 #include "G4HadronCaptureProcess.hh"
    67 #include "G4LFission.hh"
    6864#include "G4LCapture.hh"
    69 
    70 #include "G4NeutronHPInelastic.hh"
    71 #include "G4NeutronHPFission.hh"
    72 #include "G4NeutronHPCapture.hh"
    73 
    74 #include "G4UInelasticCrossSection.hh"
    75 
    76 G4HadronInelasticQBBC::G4HadronInelasticQBBC(const G4String& name,
    77     G4int ver, G4bool ftf, G4bool bert, G4bool chips, G4bool hp, G4bool glauber)
    78   : G4VPhysicsConstructor(name), verbose(ver), ftfFlag(ftf), bertFlag(bert),
    79     chipsFlag(chips), hpFlag(hp), glFlag(glauber), wasActivated(false)
     65#include "G4NeutronRadCapture.hh"
     66
     67enum QBBCType
    8068{
    81   if(verbose > 1) G4cout << "### HadronInelasticQBBC bertFlag= "
    82                          <<  bertFlag <<G4endl;
    83   theHPXSecI = 0;
    84   theHPXSecC = 0;
    85   theHPXSecF = 0;
    86   theCascade = 0;
    87   preCompound = 0;
    88   theCHIPSCascade   = 0;
    89   theQuasiElastic   = 0;
    90   theQGStringDecay  = 0;
    91   theQGStringModel  = 0;
    92   theFTFBStringDecay = 0;
    93   theFTFBStringModel = 0;
    94   theFTFCStringDecay = 0;
    95   theFTFCStringModel = 0;
     69  fQBBC = 0,
     70  fQBBC_XGG,
     71  fQBBC_XGGSN
     72};
     73
     74G4HadronInelasticQBBC::G4HadronInelasticQBBC(const G4String& name, G4int ver,
     75    G4bool, G4bool,G4bool, G4bool, G4bool)
     76  : G4VHadronPhysics("hInelastic"),verbose(ver),wasActivated(false)
     77{
     78  htype = name;
    9679}
    9780
    9881G4HadronInelasticQBBC::~G4HadronInelasticQBBC()
    99 {
    100   delete theCascade;
    101   delete preCompound;
    102   delete theCHIPSCascade;
    103   delete theQuasiElastic;
    104   delete theQGStringDecay;
    105   delete theQGStringModel;
    106   delete theFTFBStringDecay;
    107   delete theFTFCStringDecay;
    108   delete theFTFBStringModel;
    109   delete theFTFCStringModel;
    110   delete theHPXSecI;
    111   delete theHPXSecC;
    112   delete theHPXSecF;
    113 }
    114 
    115 void G4HadronInelasticQBBC::ConstructParticle()
    116 {
    117   G4MesonConstructor pMesonConstructor;
    118   pMesonConstructor.ConstructParticle();
    119 
    120   G4BaryonConstructor pBaryonConstructor;
    121   pBaryonConstructor.ConstructParticle();
    122 }
     82{}
    12383
    12484void G4HadronInelasticQBBC::ConstructProcess()
    … …  
    12787  wasActivated = true;
    12888
     89  // select type
     90  QBBCType fType = fQBBC;
     91  if("QBBC_XGG" == htype)        { fType = fQBBC_XGG; }
     92  else if("QBBC_XGGSN" == htype) { fType = fQBBC_XGGSN; }
     93
    12994  if(verbose > 1) {
    130     G4cout << "### HadronInelasticQBBC Construct Process"
    131            << " ftfFlag= " << ftfFlag << "  bertFlag= " << bertFlag
    132            << G4endl;
     95    G4cout << "### HadronInelasticQBBC Construct Process with type <"
     96           << htype << ">" << G4endl;
    13397  }
    134   G4double minEstring  = 9.5*GeV;
    135   G4double maxEcascade = 7.5*GeV;
    136   G4double minFTF      = 4.5*GeV;
    137   G4double maxFTF      = 25.*GeV;
    138 
    139   //Binary
    140   G4HadronicInteraction* theBIC = new G4BinaryCascade();
    141   theBIC->SetMinEnergy(0.0);
    142   theBIC->SetMaxEnergy(maxEcascade);
    143 
    144   //Bertini
    145   G4HadronicInteraction* theBERT = new G4CascadeInterface();
    146   theBERT->SetMinEnergy(0.0);
    147   theBERT->SetMaxEnergy(maxEcascade);
    148 
    149   //CHIPS
    150   G4HadronicInteraction* theCHIPS = new G4StringChipsParticleLevelInterface();
    151   theCHIPS->SetMinEnergy(0.0);
    152   theCHIPS->SetMaxEnergy(maxEcascade);
    153 
    154   //QGS
    155   theCascade = new G4BinaryCascade();
    156   preCompound = new G4GeneratorPrecompoundInterface();
    157 
    158   theCHIPSCascade = new G4QStringChipsParticleLevelInterface;
    159   G4TheoFSGenerator* theQGSModel = new G4TheoFSGenerator("QGSP");
    160   theQGStringModel  = new G4QGSModel< G4QGSParticipants >;
    161   theQGStringDecay  = new G4ExcitedStringDecay(new G4QGSMFragmentation());
    162   theQGStringModel->SetFragmentationModel(theQGStringDecay);
    163   theQGSModel->SetTransport(preCompound);
    164 
    165   theQuasiElastic = new G4QuasiElasticChannel();
    166   theQGSModel->SetQuasiElasticChannel(theQuasiElastic);
    167   theQGSModel->SetHighEnergyGenerator(theQGStringModel);
    168   theQGSModel->SetMinEnergy(minEstring);
    169   theQGSModel->SetMaxEnergy(100*TeV);
    170 
    171   //FTFB
    172   G4TheoFSGenerator* theFTFBModel = new G4TheoFSGenerator("FTFP");
    173   theFTFBStringModel = new G4FTFModel();
    174   theFTFBStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
    175   theFTFBStringModel->SetFragmentationModel(theFTFBStringDecay);
    176 
    177   //  theFTFBModel->SetTransport(theCascade);
    178   theFTFBModel->SetTransport(preCompound);
    179   theFTFBModel->SetHighEnergyGenerator(theFTFBStringModel);
    180   theFTFBModel->SetMinEnergy(minFTF);
    181   theFTFBModel->SetMaxEnergy(100*TeV);
    182 
    183   //FTFP
    184   G4TheoFSGenerator* theFTFCModel = new G4TheoFSGenerator("FTFP");
    185   theFTFCStringModel = new G4FTFModel();
    186   theFTFCStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation());
    187   theFTFCStringModel->SetFragmentationModel(theFTFCStringDecay);
    188 
    189   theFTFCModel->SetTransport(preCompound);
    190   theFTFCModel->SetHighEnergyGenerator(theFTFCStringModel);
    191   theFTFCModel->SetMinEnergy(minFTF);
    192   theFTFCModel->SetMaxEnergy(maxFTF);
    193 
     98
     99  // configure models
     100  G4HadronicInteraction* theQGSP =
     101    BuildModel(new G4QGSBuilder("QGSP",true,false),9.5*GeV,100.*TeV);
     102  G4HadronicInteraction* theFTFP =
     103    BuildModel(new G4FTFBuilder("FTFP"),4.5*GeV,25.*GeV);
     104  G4HadronicInteraction* theFTFP1 =
     105    BuildModel(new G4FTFBuilder("FTFP"),4.5*GeV,100.*TeV);
     106  G4HadronicInteraction* theBERT =
     107    NewModel(new G4CascadeInterface(),0.0,6.5*GeV);
     108  //G4HadronicInteraction* theBERT1 =
     109  //  NewModel(new G4CascadeInterface(),2.5*GeV,6.5*GeV);
     110  //G4HadronicInteraction* theBIC =
     111  //  NewModel(new G4BinaryCascade(),0.0,3.5*GeV);
     112  G4HadronicInteraction* theCHIPS =
     113    NewModel(new G4QStringChipsParticleLevelInterface(),0.0,7.5*GeV);
     114
     115  // loop over particles
    194116  theParticleIterator->reset();
    195117  while( (*theParticleIterator)() ) {
    196118    G4ParticleDefinition* particle = theParticleIterator->value();
    197119    G4String pname = particle->GetParticleName();
    198     if(verbose > 1) G4cout << "### HadronInelasticQBBC:  " << pname << G4endl;
     120    if(verbose > 1) { G4cout << "### HadronInelasticQBBC:  " << pname << G4endl; }
    199121    if(pname == "anti_lambda"  ||
    200122       pname == "anti_neutron" ||
    … …  
    217139       pname == "sigma-"    ||
    218140       pname == "sigma+"    ||
     141       pname == "sigma0"    ||
    219142       pname == "xi-"       ||
    220143       pname == "xi0") {
    221144     
     145      // common for all particles
     146      G4HadronicProcess* hp = FindInelasticProcess(particle);
     147      if(!hp) { continue; }
    222148      G4ProcessManager* pmanager = particle->GetProcessManager();
    223       G4HadronInelasticProcess* hp =
    224         new G4HadronInelasticProcess("hInelastic", particle);
    225149      pmanager->AddDiscreteProcess(hp);
    226150
     151      // model and X-section configuration
    227152      if(pname == "proton") {
    228         hp->AddDataSet(&theXSecP);
    229 
    230         hp->RegisterMe(theQGSModel);
    231         hp->RegisterMe(theFTFCModel);
    232         //if(ftfFlag) hp->RegisterMe(theFTFCModel);
    233         //else        hp->RegisterMe(theQGSModel);
    234  
    235         if(bertFlag) hp->RegisterMe(theBERT);
    236         else         hp->RegisterMe(theBIC);
    237      
    238         if(glFlag)
    239           hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
     153        if(fType == fQBBC) {
     154          hp->AddDataSet(new G4ProtonInelasticCrossSection());
     155        } else {
     156          hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
     157        }
     158        hp->RegisterMe(theQGSP);
     159        hp->RegisterMe(theFTFP);
     160        hp->RegisterMe(theBERT);
     161        //      hp->RegisterMe(theBERT1);
     162        //      hp->RegisterMe(theBIC);
    240163
    241164      } else if(pname == "neutron") {
    242         hp->AddDataSet(&theXSecN);
    243         hp->RegisterMe(theQGSModel);
    244         hp->RegisterMe(theFTFCModel);
    245         //if(ftfFlag) hp->RegisterMe(theFTFCModel);
    246         //else        hp->RegisterMe(theQGSModel);
    247 
    248         G4HadronCaptureProcess* theNeutronCapture =
    249           new G4HadronCaptureProcess("nCapture");
    250         G4HadronFissionProcess* theNeutronFission =
    251           new G4HadronFissionProcess("nFission");
    252         pmanager->AddDiscreteProcess(theNeutronCapture);
    253         pmanager->AddDiscreteProcess(theNeutronFission);
    254 
    255         G4double emin = 0.0;
    256         if(hpFlag) {
    257           emin = 19.5*MeV;
    258           theHPXSecI = new G4NeutronHPInelasticData;
    259           theHPXSecC = new G4NeutronHPCaptureData;
    260           theHPXSecF = new G4NeutronHPFissionData;
    261           hp->AddDataSet(theHPXSecI);
    262           theNeutronCapture->AddDataSet(theHPXSecC);
    263           theNeutronFission->AddDataSet(theHPXSecF);
    264           hp->RegisterMe(new G4NeutronHPInelastic());
    265           theNeutronCapture->RegisterMe(new G4NeutronHPCapture());
    266           theNeutronFission->RegisterMe(new G4NeutronHPFission());
    267         }
    268 
    269         G4HadronicInteraction* theB;
    270         if(bertFlag) theB = new G4CascadeInterface();
    271         else         theB = new G4BinaryCascade();
    272         theB->SetMinEnergy(emin);
    273         theB->SetMaxEnergy(maxEcascade);
    274         hp->RegisterMe(theB);
    275 
    276         if(glFlag)
    277           hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
    278 
    279         G4HadronicInteraction* theC = new G4LCapture();         
    280         theC->SetMinEnergy(emin);
    281         theNeutronCapture->RegisterMe(theC);
    282 
    283         G4HadronicInteraction* theF = new G4LFission();
    284         theF->SetMinEnergy(emin);
    285         theNeutronFission->RegisterMe(theF);
     165        if(fType == fQBBC) {
     166          hp->AddDataSet(new G4NeutronInelasticCrossSection());
     167        } else if(fType == fQBBC_XGG) {
     168          hp->AddDataSet(new G4BGGNucleonInelasticXS(particle));
     169        } else {
     170          hp->AddDataSet(new G4NeutronInelasticXS());
     171        }
     172
     173        hp->RegisterMe(theQGSP);
     174        hp->RegisterMe(theFTFP);
     175        //      hp->RegisterMe(theBERT1);
     176       
     177        G4HadronicProcess* capture = FindCaptureProcess();
     178        pmanager->AddDiscreteProcess(capture);
     179
     180        hp->RegisterMe(theBERT);
     181        //hp->RegisterMe(theBIC);
     182        capture->RegisterMe(new G4NeutronRadCapture());
     183        //capture->RegisterMe(new G4LCapture());
     184        if(fType == fQBBC_XGGSN) {
     185          capture->AddDataSet(new G4NeutronCaptureXS());
     186        }
    286187
    287188      } else if(pname == "pi-" || pname == "pi+") {
    288         hp->AddDataSet(&thePiCross);
    289         hp->RegisterMe(theQGSModel);
    290         hp->RegisterMe(theFTFCModel);
    291         //if(ftfFlag) hp->RegisterMe(theFTFCModel);
    292         //else        hp->RegisterMe(theQGSModel);
    293 
     189        if(fType == fQBBC) {
     190          hp->AddDataSet(new G4PiNuclearCrossSection());
     191        } else {
     192          hp->AddDataSet(new G4BGGPionInelasticXS(particle));
     193        }
     194        hp->RegisterMe(theQGSP);
     195        hp->RegisterMe(theFTFP);
    294196        hp->RegisterMe(theBERT);
    295         //if(bertFlag) hp->RegisterMe(theBERT);
    296         //else         hp->RegisterMe(theBIC);
    297 
    298         if(glFlag)
    299           hp->AddDataSet(new G4BGGPionInelasticXS(particle));
    300197
    301198      } else if(pname == "kaon-"     ||
    302199                pname == "kaon+"     ||
    303200                pname == "kaon0S"    ||
    304                 pname == "kaon0L") {
    305         hp->RegisterMe(theFTFBModel);
    306         hp->RegisterMe(theBERT);
    307         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    308 
    309       } else if(pname == "lambda"    ||
     201                pname == "kaon0L"    ||
     202                pname == "lambda"    ||
    310203                pname == "sigma-"    ||
    311204                pname == "sigma+"    ||
     205                pname == "sigma0"    ||
    312206                pname == "xi-"       ||
    313207                pname == "xi0") {
    314 
    315         hp->RegisterMe(theFTFBModel);
    316         hp->RegisterMe(theBERT);
    317         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    318 
    319       } else if(pname == "anti_proton" || pname == "anti_neutron") {
    320         hp->RegisterMe(theFTFBModel);
     208        hp->RegisterMe(theFTFP1);
     209        hp->RegisterMe(theBERT);
     210
     211      } else {
     212        hp->RegisterMe(theFTFP1);
    321213        hp->RegisterMe(theCHIPS);
    322         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
    323 
    324       } else {
    325         hp->RegisterMe(theFTFBModel);
    326         hp->RegisterMe(theCHIPS);
    327         //hp->AddDataSet(new G4UInelasticCrossSection(particle));
     214
    328215      }
    329216
    330       if(verbose > 1)
     217      if(verbose > 1) {
    331218        G4cout << "### HadronInelasticQBBC: " << hp->GetProcessName()
    332219               << " added for " << pname << G4endl;
     220      }
    333221    }
    334222  }

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

    r988 r1205  
    2525//
    2626// $Id: G4HadronInelasticQLHEP.cc,v 1.2 2008/05/19 10:21:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PhysListFactory.cc,v 1.6 2008/11/25 15:36:19 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4PhysListFactory.cc,v 1.12 2009/11/25 18:55:56 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3939
    4040#include "G4PhysListFactory.hh"
    41 #include "FTFC.hh"
    42 #include "FTFP.hh"
     41#include "CHIPS.hh"
    4342#include "FTFP_BERT.hh"
    44 #include "FTFP_EMV.hh"
     43#include "FTFP_BERT_EMV.hh"
     44#include "FTFP_BERT_EMX.hh"
     45#include "FTFP_BERT_TRV.hh"
    4546#include "FTF_BIC.hh"
    4647#include "LBE.hh"
    4748#include "LHEP.hh"
    48 #include "LHEP_BERT.hh"
    49 #include "LHEP_BERT_HP.hh"
    5049#include "LHEP_EMV.hh"
    51 #include "LHEP_PRECO_HP.hh"
    5250#include "QBBC.hh"
    53 #include "QGSC.hh"
    5451#include "QGSC_BERT.hh"
    55 #include "QGSC_EFLOW.hh"
    56 #include "QGSC_EMV.hh"
    57 #include "QGSP.hh"
     52#include "QGSC_CHIPS.hh"
    5853#include "QGSP_BERT.hh"
    59 #include "QGSP_BERT_DIF.hh"
    6054#include "QGSP_BERT_EMV.hh"
     55#include "QGSP_BERT_EMX.hh"
    6156#include "QGSP_BERT_HP.hh"
    62 #include "QGSP_BERT_NQE.hh"
     57#include "QGSP_BERT_NOLEP.hh"
    6358#include "QGSP_BERT_TRV.hh"
    6459#include "QGSP_BIC.hh"
     60#include "QGSP_BIC_EMY.hh"
    6561#include "QGSP_BIC_HP.hh"
    66 #include "QGSP_DIF.hh"
    67 #include "QGSP_EMV.hh"
    68 #include "QGSP_EMV_NQE.hh"
    69 #include "QGSP_EMX.hh"
    70 #include "QGSP_NQE.hh"
    71 #include "QGSP_QEL.hh"
     62#include "QGSP_FTFP_BERT.hh"
    7263#include "QGS_BIC.hh"
     64#include "QGSP_INCL_ABLA.hh"
    7365
    7466G4PhysListFactory::G4PhysListFactory()
    7567{
    7668  defName = "QGSP_BERT";
    77   nlists = 35;
    78   G4String s[35] = {
    79     "FTFC","FTFP","FTFP_BERY","FTFP_EMV","FTF_BIC",
    80     "LBE","LHEP","LHEP_BERT","LHEP_EMV","LHEP_PRECO_HP"
    81     "QBBB","QBBC","QBBCG","QBBCF","QBBC_HP","QGSC",
    82     "QGSC_BERT","QGSC_EFLOW","QGSC_EMV","QGSP","QGSP_BERT",
    83     "QGSP_BERT_DIF","QGSP_BERT_EMV","QGSP_BERT_HP","QGSP_BERT_NQE","QGSP_BERT_TRV",
    84     "QGSP_BIC","QGSP_BIC_HP","QGSP_DIF","QGSP_EMV","QGSP_EMV_NQE",
    85     "QGSP_EMX","QGSP_NQE","QGSP_QEL","QGS_BIC"};
     69  nlists = 26;
     70  G4String s[26] = {
     71    "CHIPS",
     72    "FTFP_BERT","FTFP_BERT_EMV","FTFP_BERT_EMX","FTFP_BERT_TRV","FTF_BIC",
     73    "LBE","LHEP","LHEP_EMV",
     74    "QBBC","QBBC_XGG","QBBC_XGGSN",
     75    "QGSC_BERT","QGSC_CHIPS",
     76    "QGSP_BERT","QGSP_BERT_EMV","QGSP_BERT_EMX","QGSP_BERT_HP",
     77    "QGSP_BERT_NOLEP","QGSP_BERT_TRV","QGSP_BIC","QGSP_BIC_EMY","QGSP_BIC_HP",
     78    "QGSP_FTFP_BERT","QGS_BIC", "QGSP_INCL_ABLA"};
    8679
    8780  for(size_t i=0; i<nlists; i++) {
    … …  
    116109{
    117110  G4VModularPhysicsList* p = 0;
    118   if     (name == "FTFC") {p = new FTFC();}
    119   else if(name == "FTFP") {p = new FTFP();}
     111  if(name == "CHIPS") {p = new CHIPS();}
    120112  else if(name == "FTFP_BERT") {p = new FTFP_BERT();}
    121   else if(name == "FTFP_EMV") {p = new FTFP_EMV();}
     113  else if(name == "FTFP_BERT_EMV") {p = new FTFP_BERT_EMV();}
     114  else if(name == "FTFP_BERT_EMX") {p = new FTFP_BERT_EMX();}
     115  else if(name == "FTFP_BERT_TRV") {p = new FTFP_BERT_TRV();}
    122116  else if(name == "FTF_BIC") {p = new FTF_BIC();}
    123117  else if(name == "LBE") {p = new LBE();}
    124118  else if(name == "LHEP") {p = new LHEP();}
    125   else if(name == "LHEP_BERT") {p = new LHEP_BERT();}
    126119  else if(name == "LHEP_EMV") {p = new LHEP_EMV();}
    127   else if(name == "LHEP_PRECO_HP") {p = new LHEP_PRECO_HP();}
    128   else if(name == "QBBBG") {p = new QBBC(1, "QBBBG");}
    129120  else if(name == "QBBC") {p = new QBBC();}
    130   else if(name == "QBBCG") {p = new QBBC(1, "QBBCG");}
    131   else if(name == "QBBCF") {p = new QBBC(1, "QBBCF");}
    132   else if(name == "QBBC_HP") {p = new QBBC(1, "QBBC_HP");}
    133   else if(name == "QGSC") {p = new QGSC();}
     121  else if(name == "QBBC_XGG") {p = new QBBC(1,"QBBC_XGG");}
     122  else if(name == "QBBC_XGGSN") {p = new QBBC(1,"QBBC_XGGSN");}
    134123  else if(name == "QGSC_BERT") {p = new QGSC_BERT();}
    135   else if(name == "QGSC_EFLOW") {p = new QGSC_EFLOW();}
    136   else if(name == "QGSC_EMV") {p = new QGSC_EMV();}
    137   else if(name == "QGSP") {p = new QGSP();}
     124  else if(name == "QGSC_CHIPS") {p = new QGSC_CHIPS();}
    138125  else if(name == "QGSP_BERT") {p = new QGSP_BERT();}
    139   else if(name == "QGSP_BERT_DIF") {p = new QGSP_BERT_DIF();}
    140126  else if(name == "QGSP_BERT_EMV") {p = new QGSP_BERT_EMV();}
     127  else if(name == "QGSP_BERT_EMX") {p = new QGSP_BERT_EMX();}
    141128  else if(name == "QGSP_BERT_HP") {p = new QGSP_BERT_HP();}
    142   else if(name == "QGSP_BERT_NQE") {p = new QGSP_BERT_NQE();}
     129  else if(name == "QGSP_BERT_NOLEP") {p = new QGSP_BERT_NOLEP();}
    143130  else if(name == "QGSP_BERT_TRV") {p = new QGSP_BERT_TRV();}
    144131  else if(name == "QGSP_BIC") {p = new QGSP_BIC();}
     132  else if(name == "QGSP_BIC_EMY") {p = new QGSP_BIC_EMY();}
    145133  else if(name == "QGSP_BIC_HP") {p = new QGSP_BIC_HP();}
    146   else if(name == "QGSP_DIF") {p = new QGSP_DIF();}
    147   else if(name == "QGSP_EMV") {p = new QGSP_EMV();}
    148   else if(name == "QGSP_EMV_NQE") {p = new QGSP_EMV_NQE();}
    149   else if(name == "QGSP_EMX") {p = new QGSP_EMX();}
    150   else if(name == "QGSP_NQE") {p = new QGSP_NQE();}
    151   else if(name == "QGSP_QEL") {p = new QGSP_QEL();}
     134  else if(name == "QGSP_FTFP_BERT") {p = new QGSP_FTFP_BERT();}
    152135  else if(name == "QGS_BIC") {p = new QGS_BIC();}
     136  else if(name == "QGSP_INCL_ABLA") {p = new QGSP_INCL_ABLA();}
    153137  else {
    154138    G4cout << "### G4PhysListFactory WARNING: "

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFC.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFP.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTFP_BERT.cc,v 1.1 2007/10/19 15:35:08 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsFTF_BIC.cc,v 1.2 2008/04/25 14:53:34 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_EMV.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2424// ********************************************************************
    2525//
    26 // $Id: HadronPhysicsQGSC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: HadronPhysicsQGSC.cc,v 1.3 2009/03/12 12:19:44 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    8282   delete theLEPPro;
    8383   delete thePro;
     84   delete theQGSCNeutron;
     85   delete theNeutrons;
    8486   delete theQGSCPiK;
    8587   delete theLEPPiK;

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSC_BERT.cc,v 1.1 2007/11/15 16:58:16 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2626//
    2727// $Id: HadronPhysicsQGSP.cc,v 1.4 2007/11/13 10:16:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2929//
    3030//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT.cc,v 1.3 2007/12/10 17:34:44 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.1 2007/05/07 14:34:29 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.3 2007/04/26 14:47:11 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626// $Id: HadronPhysicsQGS_BIC.cc,v 1.1 2007/11/13 10:23:24 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------

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

    r988 r1205  
    2525//
    2626//
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//
Note: See TracChangeset for help on using the changeset viewer.