Changeset 1203 for trunk


Ignore:
Timestamp:
Nov 27, 2009, 11:46:04 AM (15 years ago)
Author:
garnier
Message:

update CVS

Location:
trunk/source/physics_lists/builders
Files:
60 added
2 deleted
116 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/physics_lists/builders/GNUmakefile

    r921 r1203  
    1 # $Id: GNUmakefile,v 1.5 2008/10/15 18:24:11 vnivanch Exp $
     1# $Id: GNUmakefile,v 1.10 2009/11/20 10:24:28 mkossov Exp $
    22# ---------------------------------------------------------------------------
    33# GNUmakefile for physics_lists/builders library.  Gunter Folger 25-Oct-2006.
    … …  
    1414CPPFLAGS += -I$(G4BASE)/global/management/include \
    1515            -I$(G4BASE)/global/HEPRandom/include \
     16            -I$(G4BASE)/global/HEPNumerics/include \
    1617            -I$(G4BASE)/global/HEPGeometry/include \
    1718            -I$(G4BASE)/geometry/volumes/include \
    … …  
    5051            -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
    5152            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
     53            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
     54            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/processes/include \
     55            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include \
    5256            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
    5357            -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
    … …  
    6165            -I$(G4BASE)/processes/hadronic/models/high_energy/include \
    6266            -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
     67            -I$(G4BASE)/processes/hadronic/models/incl/include \
    6368            -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
    6469            -I$(G4BASE)/processes/hadronic/models/low_energy/include \

  • trunk/source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BertiniNeutronBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniNeutronBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4BertiniNeutronBuilder_h
    2741#define G4BertiniNeutronBuilder_h 1
    … …  
    3650
    3751#include "G4CascadeInterface.hh"   
    38 #include "G4NeutronInelasticCrossSection.hh"
    3952
    4053class G4BertiniNeutronBuilder : public G4VNeutronBuilder
    … …  
    5568  private:
    5669    G4CascadeInterface * theModel;   
    57     G4NeutronInelasticCrossSection theXSec;
    5870    G4double theMin;
    5971    G4double theMax;

  • trunk/source/physics_lists/builders/include/G4BertiniPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4BertiniPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniPiKBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4BertiniPiKBuilder_h
    … …  
    5771
    5872  private:
    59     G4PiNuclearCrossSection thePiData;
     73    G4PiNuclearCrossSection* thePiData;
    6074    G4CascadeInterface * theModel;   
    6175    G4double theMin;

  • trunk/source/physics_lists/builders/include/G4BertiniProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BertiniProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniProtonBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4BertiniProtonBuilder_h
    2741#define G4BertiniProtonBuilder_h
    … …  
    3650
    3751#include "G4CascadeInterface.hh"   
    38 #include "G4ProtonInelasticCrossSection.hh"
    3952
    4053class G4BertiniProtonBuilder : public G4VProtonBuilder
    … …  
    5265
    5366  private:
    54     G4ProtonInelasticCrossSection theXSec;
     67
    5568    G4CascadeInterface * theModel;   
    5669    G4double theMin;

  • trunk/source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BinaryNeutronBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryNeutronBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4BinaryNeutronBuilder_h
    2741#define G4BinaryNeutronBuilder_h 1
    … …  
    3650
    3751#include "G4BinaryCascade.hh"   
    38 #include "G4NeutronInelasticCrossSection.hh"
    3952
    4053class G4BinaryNeutronBuilder : public G4VNeutronBuilder
    … …  
    5568  private:
    5669    G4BinaryCascade * theModel;   
    57     G4NeutronInelasticCrossSection theXSec;
    5870    G4double theMin;
    5971    G4double theMax;

  • trunk/source/physics_lists/builders/include/G4BinaryPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4BinaryPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryPiKBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4BinaryPiKBuilder_h
    … …  
    5771
    5872  private:
    59     G4PiNuclearCrossSection thePiData;
     73    G4PiNuclearCrossSection* thePiData;
    6074    G4BinaryCascade * theModel;   
    6175    G4double theMin;

  • trunk/source/physics_lists/builders/include/G4BinaryProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BinaryProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryProtonBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4BinaryProtonBuilder_h
    2741#define G4BinaryProtonBuilder_h
    … …  
    3650
    3751#include "G4BinaryCascade.hh"   
    38 #include "G4ProtonInelasticCrossSection.hh"
    3952
    4053class G4BinaryProtonBuilder : public G4VProtonBuilder
    … …  
    5265
    5366  private:
    54     G4ProtonInelasticCrossSection theXSec;
     67
    5568    G4BinaryCascade * theModel;   
    5669    G4double theMin;

  • trunk/source/physics_lists/builders/include/G4ChargeExchangePhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4ChargeExchangePhysics.hh,v 1.1 2008/11/20 12:38:11 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/builders/include/G4DecayPhysics.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DecayPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4DecayPhysics.hh,v 1.2 2009/11/05 01:24:47 gum Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6464  virtual void ConstructProcess();
    6565
     66  virtual G4Decay* GetDecayProcess() { return fDecayProcess; }
     67
    6668private:
    6769  G4Decay* fDecayProcess;

  • trunk/source/physics_lists/builders/include/G4EmExtraPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4EmExtraPhysics.hh,v 1.2 2007/11/15 18:08:11 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/builders/include/G4EmMessenger.hh

    r988 r1203  
    2525//
    2626// $Id: G4EmMessenger.hh,v 1.1 2006/10/31 11:35:01 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/builders/include/G4EmStandardPhysics.hh

    r988 r1203  
    2626//
    2727// $Id: G4EmStandardPhysics.hh,v 1.4 2007/05/16 11:35:36 vnivanch 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/builders/include/G4EmStandardPhysics_option1.hh

    r988 r1203  
    2626//
    2727// $Id: G4EmStandardPhysics_option1.hh,v 1.1 2007/05/16 11:35:36 vnivanch 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/builders/include/G4EmStandardPhysics_option2.hh

    r988 r1203  
    2626//
    2727// $Id: G4EmStandardPhysics_option2.hh,v 1.1 2007/05/16 11:35:36 vnivanch 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/builders/include/G4EmStandardPhysics_option3.hh

    r988 r1203  
    2626//
    2727// $Id: G4EmStandardPhysics_option3.hh,v 1.1 2008/03/13 12:11:02 vnivanch 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/builders/include/G4FTFBinaryNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFBinaryNeutronBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryNeutronBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFBinaryNeutronBuilder_h
    2741#define G4FTFBinaryNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    6679    G4QuasiElasticChannel * theQuasiElastic;
    6780
    68     G4NeutronInelasticCrossSection theXSec;
    6981    G4double theMin;
    7082

  • trunk/source/physics_lists/builders/include/G4FTFBinaryPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4FTFBinaryPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryPiKBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4FTFBinaryPiKBuilder_h
    … …  
    7185    G4QuasiElasticChannel * theQuasiElastic;
    7286
    73     G4PiNuclearCrossSection thePiData;
     87    G4PiNuclearCrossSection* thePiData;
    7488    G4double theMin;
    7589

  • trunk/source/physics_lists/builders/include/G4FTFBinaryProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFBinaryProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryProtonBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFBinaryProtonBuilder_h
    2741#define G4FTFBinaryProtonBuilder_h
    … …  
    3549#include "G4VProtonBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    4457#include "G4ExcitedStringDecay.hh"
    4558#include "G4QuasiElasticChannel.hh"
    46 
    47 #include "G4ProtonInelasticCrossSection.hh"
    4859
    4960class G4FTFBinaryProtonBuilder : public G4VProtonBuilder
    … …  
    6778    G4QuasiElasticChannel * theQuasiElastic;
    6879
    69     G4ProtonInelasticCrossSection theXSec;
    7080    G4double theMin;
    7181

  • trunk/source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFCNeutronBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFCNeutronBuilder_h
    2741#define G4FTFCNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4StringChipsParticleLevelInterface.hh"
    … …  
    6477    G4QuasiElasticChannel * theQuasiElastic;
    6578
    66     G4NeutronInelasticCrossSection theXSec;
    6779    G4double theMin;
    6880

  • trunk/source/physics_lists/builders/include/G4FTFCPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4FTFCPiKBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4FTFCPiKBuilder_h
    … …  
    6882    G4QuasiElasticChannel * theQuasiElastic;
    6983
    70     G4PiNuclearCrossSection thePiData;
     84    G4PiNuclearCrossSection* thePiData;
    7185    G4double theMin;
    7286

  • trunk/source/physics_lists/builders/include/G4FTFCProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFCProtonBuilder.hh,v 1.4 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFCProtonBuilder_h
    2741#define G4FTFCProtonBuilder_h
    … …  
    3549#include "G4VProtonBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4StringChipsParticleLevelInterface.hh"
    … …  
    4356#include "G4QuasiElasticChannel.hh"
    4457
    45 #include "G4ProtonInelasticCrossSection.hh"
    46 
    4758class G4FTFCProtonBuilder : public G4VProtonBuilder
    4859{
    4960  public:
    5061    G4FTFCProtonBuilder(G4bool quasiElastic=false);
    51     virtual ~G4FTFCProtonBuilder(){};
     62    virtual ~G4FTFCProtonBuilder();
    5263
    5364  public:
    54     virtual void Build(G4HadronElasticProcess * ){};
     65    virtual void Build(G4HadronElasticProcess * );
    5566    virtual void Build(G4ProtonInelasticProcess * aP);
    5667   
    … …  
    5869
    5970  private:
    60     G4ProtonInelasticCrossSection theXSec;
     71
    6172    G4TheoFSGenerator * theModel;
     73    G4StringChipsParticleLevelInterface * theCascade;
     74    G4FTFModel * theStringModel;
     75    G4ExcitedStringDecay * theStringDecay;
    6276    G4QuasiElasticChannel * theQuasiElastic;
    6377

  • trunk/source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFPNeutronBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFPNeutronBuilder_h
    2741#define G4FTFPNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    5871   
    5972    void SetMinEnergy(G4double aM) {theMin = aM;}
     73    void SetMaxEnergy(G4double aM) {theMax = aM;}
    6074
    6175  private:
    … …  
    6781    G4QuasiElasticChannel * theQuasiElastic;
    6882
    69     G4NeutronInelasticCrossSection theXSec;
    7083    G4double theMin;
    71 
     84    G4double theMax;
    7285};
    7386

  • trunk/source/physics_lists/builders/include/G4FTFPPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4FTFPPiKBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4FTFPPiKBuilder_h
    … …  
    6276   
    6377    void SetMinEnergy(G4double aM) {theMin = aM;}
     78    void SetMaxEnergy(G4double aM) {theMax = aM;}
    6479
    6580  private:
    … …  
    7186    G4QuasiElasticChannel * theQuasiElastic;
    7287
    73     G4PiNuclearCrossSection thePiData;
     88    G4PiNuclearCrossSection* thePiData;
    7489    G4double theMin;
     90    G4double theMax;
    7591
    7692};

  • trunk/source/physics_lists/builders/include/G4FTFPProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFPProtonBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4FTFPProtonBuilder_h
    2741#define G4FTFPProtonBuilder_h
    … …  
    3549#include "G4VProtonBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    4457#include "G4ExcitedStringDecay.hh"
    4558#include "G4QuasiElasticChannel.hh"
    46 
    47 #include "G4ProtonInelasticCrossSection.hh"
    4859
    4960class G4FTFPProtonBuilder : public G4VProtonBuilder
    … …  
    5869   
    5970    void SetMinEnergy(G4double aM) {theMin = aM;}
     71    void SetMaxEnergy(G4double aM) {theMax = aM;}
    6072
    6173  private:
    … …  
    6779    G4QuasiElasticChannel * theQuasiElastic;
    6880
    69     G4ProtonInelasticCrossSection theXSec;
    7081    G4double theMin;
     82    G4double theMax;
    7183
    7284};

  • trunk/source/physics_lists/builders/include/G4HadronDElasticPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4HadronDElasticPhysics.hh,v 1.1 2007/11/13 16:19:52 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/builders/include/G4HadronElasticPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4HadronElasticPhysics.hh,v 1.4 2006/11/23 15:46:04 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/builders/include/G4HadronHElasticPhysics.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronHElasticPhysics.hh,v 1.2 2007/11/15 18:08:11 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4HadronHElasticPhysics.hh,v 1.3 2009/10/04 16:03:38 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6666private:
    6767
    68   G4HadronicInteraction* model;
    69   G4HadronicInteraction* neutronModel;
    70   G4HadronicInteraction* neutronHPModel;
    71 
    72   G4String mname;
    73 
    7468  G4int    verbose;
    7569  G4bool   hpFlag;

  • trunk/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4HadronQElasticPhysics.hh,v 1.1 2006/11/17 19:19:40 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/builders/include/G4IonBinaryCascadePhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4IonBinaryCascadePhysics.hh,v 1.1 2006/10/31 11:35:01 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/builders/include/G4IonPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4IonPhysics.hh,v 1.1 2006/10/31 11:35:01 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/builders/include/G4LEPNeutronBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4LEPPiKBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4LEPProtonBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4LHEPStoppingPhysics.hh,v 1.1 2006/10/31 11:35:01 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/builders/include/G4MiscLHEPBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4NeutronBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4NeutronTrackingCut.hh

    r988 r1203  
    2525//
    2626// $Id: G4NeutronTrackingCut.hh,v 1.2 2008/09/17 18:19:15 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/builders/include/G4PiKBuilder.hh

    r988 r1203  
    2525//
    2626// $Id: G4PiKBuilder.hh,v 1.1 2006/10/31 11:35:01 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/builders/include/G4PrecoNeutronBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4PrecoNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4PrecoNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4PrecoNeutronBuilder_h
    … …  
    5569  private:
    5670    G4PreCompoundModel * theModel;   
    57     G4NeutronInelasticCrossSection theXSec;
    5871    G4double theMin;
    5972    G4double theMax;

  • trunk/source/physics_lists/builders/include/G4PrecoProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4PrecoProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4PrecoProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4PrecoProtonBuilder_h
    2741#define G4PrecoProtonBuilder_h
    … …  
    3650
    3751#include "G4PreCompoundModel.hh"   
    38 #include "G4ProtonInelasticCrossSection.hh"
    3952
    4053class G4PrecoProtonBuilder : public G4VProtonBuilder
    … …  
    5164
    5265  private:
    53     G4ProtonInelasticCrossSection theXSec;
     66
    5467    G4PreCompoundModel * theModel;   
    5568    G4double theMin;

  • trunk/source/physics_lists/builders/include/G4ProtonBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

  • trunk/source/physics_lists/builders/include/G4QEmExtraPhysics.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QEmExtraPhysics.hh,v 1.1 2007/05/23 17:38:35 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4QEmExtraPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3333// Author: 11 April 2006 V. Ivanchenko
    3434//
    35 // Modified:
     35// Modified: 19 Nov 2009 M.Kosov: G4QInelastic instead of G4QCollision
    3636//
    3737//----------------------------------------------------------------------------
    … …  
    4444#include "G4VPhysicsConstructor.hh"
    4545
    46 class G4QCollision;
     46class G4QInelastic;
    4747
    4848class G4QEmExtraPhysics : public G4VPhysicsConstructor
    … …  
    6464private:
    6565
    66   G4QCollision* hProcess;
     66  G4QInelastic* hProcess;
    6767
    6868  G4int    verbose;

  • trunk/source/physics_lists/builders/include/G4QGSBinaryNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSBinaryNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryNeutronBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSBinaryNeutronBuilder_h
    2741#define G4QGSBinaryNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    6881    G4QuasiElasticChannel * theQuasiElastic;
    6982
    70     G4NeutronInelasticCrossSection theXSec;
    7183    G4double theMin;
    7284

  • trunk/source/physics_lists/builders/include/G4QGSBinaryPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4QGSBinaryPiKBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryPiKBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4QGSBinaryPiKBuilder_h
    … …  
    6579
    6680  private:
    67     G4PiNuclearCrossSection thePiData;
     81    G4PiNuclearCrossSection* thePiData;
    6882    G4TheoFSGenerator * theModel;
    6983    G4PreCompoundModel * thePreEquilib;

  • trunk/source/physics_lists/builders/include/G4QGSBinaryProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSBinaryProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryProtonBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSBinaryProtonBuilder_h
    2741#define G4QGSBinaryProtonBuilder_h
    … …  
    3549#include "G4VProtonBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4ExcitationHandler.hh"
    … …  
    4558#include "G4ExcitedStringDecay.hh"
    4659#include "G4QuasiElasticChannel.hh"
    47 
    48 #include "G4ProtonInelasticCrossSection.hh"
    4960
    5061class G4QGSBinaryProtonBuilder : public G4VProtonBuilder
    … …  
    6172
    6273  private:
    63     G4ProtonInelasticCrossSection theXSec;
     74
    6475    G4TheoFSGenerator * theModel;
    6576    G4PreCompoundModel * thePreEquilib;

  • trunk/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCEflowNeutronBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowNeutronBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSCEflowNeutronBuilder_h
    2741#define G4QGSCEflowNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4StringChipsParticleLevelInterface.hh"
    … …  
    6578    G4QuasiElasticChannel * theQuasiElastic;
    6679
    67     G4NeutronInelasticCrossSection theXSec;
    6880    G4double theMin;
    6981

  • trunk/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4QGSCEflowPiKBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowPiKBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4QGSCEflowPiKBuilder_h
    … …  
    6377
    6478  private:
    65     G4PiNuclearCrossSection thePiCross;
     79    G4PiNuclearCrossSection* thePiCross;
    6680   
    6781    G4TheoFSGenerator * theModel;

  • trunk/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCEflowProtonBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowProtonBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSCEflowProtonBuilder_h
    2741#define G4QGSCEflowProtonBuilder_h
    … …  
    4458#include "G4QuasiElasticChannel.hh"
    4559
    46 #include "G4ProtonInelasticCrossSection.hh"
    47 
    4860class G4QGSCEflowProtonBuilder : public G4VProtonBuilder
    4961{
    … …  
    5971
    6072  private:
    61     G4ProtonInelasticCrossSection theXSec;
     73
    6274    G4TheoFSGenerator * theModel;
    6375    G4StringChipsParticleLevelInterface * theCascade;

  • trunk/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCNeutronBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSCNeutronBuilder_h
    2741#define G4QGSCNeutronBuilder_h 1
    … …  
    3549#include "G4VNeutronBuilder.hh"
    3650
    37 #include "G4NeutronInelasticCrossSection.hh"
    3851#include "G4TheoFSGenerator.hh"
    3952#include "G4QStringChipsParticleLevelInterface.hh"
    … …  
    6578    G4QuasiElasticChannel * theQuasiElastic;
    6679
    67     G4NeutronInelasticCrossSection theXSec;
    6880    G4double theMin;
    69 
    7081};
    7182

  • trunk/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4QGSCPiKBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4QGSCPiKBuilder_h
    … …  
    6377
    6478  private:
    65     G4PiNuclearCrossSection thePiCross;
     79    G4PiNuclearCrossSection* thePiCross;
    6680   
    6781    G4TheoFSGenerator * theModel;

  • trunk/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCProtonBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSCProtonBuilder_h
    2741#define G4QGSCProtonBuilder_h
    … …  
    4458#include "G4QuasiElasticChannel.hh"
    4559
    46 #include "G4ProtonInelasticCrossSection.hh"
    47 
    4860class G4QGSCProtonBuilder : public G4VProtonBuilder
    4961{
    … …  
    5971
    6072  private:
    61     G4ProtonInelasticCrossSection theXSec;
     73
    6274    G4TheoFSGenerator * theModel;
    6375    G4QStringChipsParticleLevelInterface * theCascade;

  • trunk/source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSPNeutronBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSPNeutronBuilder_h
    2741#define G4QGSPNeutronBuilder_h 1
    … …  
    4559#include "G4QuasiElasticChannel.hh"
    4660#include "G4ProjectileDiffractiveChannel.hh"
    47 
    48 #include "G4NeutronInelasticCrossSection.hh"
    4961
    5062class G4QGSPNeutronBuilder : public G4VNeutronBuilder
    … …  
    7284    G4ProjectileDiffractiveChannel * theProjectileDiffraction;
    7385
    74     G4NeutronInelasticCrossSection theXSec;
    7586    G4double theMin;
    7687

  • trunk/source/physics_lists/builders/include/G4QGSPPiKBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSPPiKBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#ifndef G4QGSPPiKBuilder_h
    2741#define G4QGSPPiKBuilder_h 1
    … …  
    4559#include "G4QuasiElasticChannel.hh"
    4660#include "G4ProjectileDiffractiveChannel.hh"
    47 
    48 #include "G4PiNuclearCrossSection.hh"
     61#include "G4VCrossSectionDataSet.hh"
    4962
    5063class G4QGSPPiKBuilder : public G4VPiKBuilder
    … …  
    6780
    6881  private:
    69     G4PiNuclearCrossSection thePiData;
     82    G4VCrossSectionDataSet* thePiData;
    7083    G4TheoFSGenerator * theModel;
    7184    G4PreCompoundModel * thePreEquilib;

  • trunk/source/physics_lists/builders/include/G4QGSPProtonBuilder.hh

    r825 r1203  
    2323// * acceptance of all terms of the Geant4 Software license.          *
    2424// ********************************************************************
     25//
     26// $Id: G4QGSPProtonBuilder.hh,v 1.5 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
    2539//
    2640#ifndef G4QGSPProtonBuilder_h
    … …  
    6377
    6478  private:
    65     G4ProtonInelasticCrossSection theXSec;
     79
    6680    G4TheoFSGenerator * theModel;
    6781    G4PreCompoundModel * thePreEquilib;

  • trunk/source/physics_lists/builders/include/G4QStoppingPhysics.hh

    r988 r1203  
    2525//
    2626// $Id: G4QStoppingPhysics.hh,v 1.2 2007/04/26 16:03:18 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/builders/include/G4StoppingHadronBuilder.hh

    r988 r1203  
    2525//
    2626// $Id: G4StoppingHadronBuilder.hh,v 1.1 2006/10/31 11:35:02 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/builders/include/G4VNeutronBuilder.hh

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4VNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4VNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 21.11.2005 G.Folger: don't  keep processes as data members, but new these
     37// 30.03.2009 V.Ivanchenko move constructor and destructor to source
     38//
     39//----------------------------------------------------------------------------
     40//
    2641#ifndef G4VNeutronBuilder_h
    2742#define G4VNeutronBuilder_h
    … …  
    3449class G4VNeutronBuilder
    3550{
    36   public:
    37     G4VNeutronBuilder() {}
    38     virtual ~G4VNeutronBuilder() {}
    39     virtual void Build(G4HadronElasticProcess * aP) = 0;
    40     virtual void Build(G4HadronFissionProcess * aP) = 0;
    41     virtual void Build(G4HadronCaptureProcess * aP) = 0;
    42     virtual void Build(G4NeutronInelasticProcess * aP) = 0;
     51public:
     52  G4VNeutronBuilder();
     53  virtual ~G4VNeutronBuilder();
     54  virtual void Build(G4HadronElasticProcess * aP) = 0;
     55  virtual void Build(G4HadronFissionProcess * aP) = 0;
     56  virtual void Build(G4HadronCaptureProcess * aP) = 0;
     57  virtual void Build(G4NeutronInelasticProcess * aP) = 0;
    4358};
    4459// 2002 by J.P. Wellisch

  • trunk/source/physics_lists/builders/include/G4VPiKBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VPiKBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4VPiKBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535// Modified:
    3636// 16.11.2005 G.Folger: don't  keep processes as data members, but new these
     37// 30.03.2009 V.Ivanchenko move constructor and destructor to source
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    5152class G4VPiKBuilder
    5253{
    53   public:
    54     G4VPiKBuilder() {}
    55     virtual ~G4VPiKBuilder() {}
    56     virtual void Build(G4HadronElasticProcess * aP) = 0;
    57     virtual void Build(G4PionPlusInelasticProcess * aP) = 0;
    58     virtual void Build(G4PionMinusInelasticProcess * aP) = 0;
    59     virtual void Build(G4KaonPlusInelasticProcess * aP) = 0;
    60     virtual void Build(G4KaonMinusInelasticProcess * aP) = 0;
    61     virtual void Build(G4KaonZeroLInelasticProcess * aP) = 0;
    62     virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
     54public:
     55  G4VPiKBuilder();
     56  virtual ~G4VPiKBuilder();
     57  virtual void Build(G4HadronElasticProcess * aP) = 0;
     58  virtual void Build(G4PionPlusInelasticProcess * aP) = 0;
     59  virtual void Build(G4PionMinusInelasticProcess * aP) = 0;
     60  virtual void Build(G4KaonPlusInelasticProcess * aP) = 0;
     61  virtual void Build(G4KaonMinusInelasticProcess * aP) = 0;
     62  virtual void Build(G4KaonZeroLInelasticProcess * aP) = 0;
     63  virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
    6364};
    6465// 2002 by J.P. Wellisch

  • trunk/source/physics_lists/builders/include/G4VProtonBuilder.hh

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VProtonBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4VProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3535// Modified:
    3636// 21.11.2005 G.Folger: don't  keep processes as data members, but new these
     37// 30.03.2009 V.Ivanchenko move constructor and destructor to source
    3738//
    3839//----------------------------------------------------------------------------
    … …  
    4647class G4VProtonBuilder
    4748{
    48   public:
    49     G4VProtonBuilder() {}
    50     virtual ~G4VProtonBuilder() {}
    51     virtual void Build(G4HadronElasticProcess * aP) = 0;
    52     virtual void Build(G4ProtonInelasticProcess * aP) = 0;
     49public:
     50  G4VProtonBuilder();
     51  virtual ~G4VProtonBuilder();
     52  virtual void Build(G4HadronElasticProcess * aP) = 0;
     53  virtual void Build(G4ProtonInelasticProcess * aP) = 0;
    5354};
    5455// 2002 by J.P. Wellisch

  • trunk/source/physics_lists/builders/include/G4WarnPLStatus.hh

    r825 r1203  
    2727#define  G4WarnPLStatus_hh
    2828
    29 #include "G4String.hh"
     29#include "globals.hh"
    3030
    3131class  G4WarnPLStatus
    … …  
    3333public:
    3434  G4WarnPLStatus();
     35  ~G4WarnPLStatus();
     36
     37  void Replaced(const G4String aPL, const G4String Replacement) const ;
    3538  void Unsupported(const G4String aPL, const G4String Replacement ="") const ;
    3639  void Experimental(const G4String aPL) const ;
    3740};
    3841
    39 inline
    40 G4WarnPLStatus::G4WarnPLStatus()
    41 {}
    42 
    43 inline
    44 void G4WarnPLStatus::Unsupported(const G4String aPL, const G4String Replacement) const
    45 {
    46     G4cout <<
    47 "*=====================================================================" <<G4endl <<
    48 "*                                                                     " <<G4endl <<
    49 "*   The Physics list "<<aPL<<" is NO LONGER SUPPORTED !   " <<G4endl <<
    50 "*   and is likely to be deleted in a future release of Geant4             " <<G4endl <<
    51 "*                                                                     " <<G4endl;
    52    if (Replacement.size() > 0)
    53    {
    54    G4cout <<
    55 "*    We recommend you try the physics lists "<<Replacement<< ","         <<G4endl <<
    56 "*      this offers similar functionality for most use cases            " <<G4endl <<
    57 "*                                                                      " <<G4endl;
    58    
    59    }
    60    G4cout <<
    61 "*                                                                      " <<G4endl <<
    62 "*   We invite you to report your use case for, and your experience with" <<G4endl <<
    63 "*    this physics list on the Geant4 User Forum dedicated to physics   " <<G4endl <<
    64 "*    lists:                                                            " <<G4endl <<
    65 "*  http://geant4-hn.slac.stanford.edu:5090/HyperNews/public/get/phys-list.html"<<G4endl <<
    66 "*                                                                      " <<G4endl <<
    67 "*=====================================================================*" <<G4endl<<
    68 G4endl;   
    69 }
    70 void G4WarnPLStatus::Experimental(const G4String aPL) const
    71 {
    72     G4cout <<
    73 "*=====================================================================" <<G4endl <<
    74 "*                                                                     " <<G4endl <<
    75 "*   The Physics list "<<aPL<<" is an experimental physics list !   " <<G4endl <<
    76 "*                                                                      " <<G4endl <<
    77 "*   Please  report your use case for, and your experience with this    " <<G4endl <<
    78 "*    physics list on the Geant4 User Forum dedicated to physics lists: " <<G4endl <<
    79 "*  http://geant4-hn.slac.stanford.edu:5090/HyperNews/public/get/phys-list.html"<<G4endl <<
    80 "*                                                                      " <<G4endl <<
    81 "*=====================================================================*" <<G4endl<<
    82 G4endl;   
    83 }
    84 
    8542#endif

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BertiniNeutronBuilder.cc,v 1.4 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniNeutronBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4BertiniNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    4357  theModel->SetMaxEnergy(theMax);
    4458  aP->RegisterMe(theModel);
    45   aP->AddDataSet(&theXSec); 
    4659}
    4760
    … …  
    4962~G4BertiniNeutronBuilder()
    5063{
    51   delete theModel;
    5264}
    5365

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

    r825 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4BertiniPiKBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4BertiniPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniPiKBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4BertiniPiKBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
    3044
    31  G4BertiniPiKBuilder::
    32  G4BertiniPiKBuilder()
     45G4BertiniPiKBuilder::
     46G4BertiniPiKBuilder()
    3347 {
     48   thePiData = new G4PiNuclearCrossSection;
    3449   theMin = 0*GeV;
    3550   theMax = 9.9*GeV;
    … …  
    3954 }
    4055
    41  G4BertiniPiKBuilder::
    42  ~G4BertiniPiKBuilder()
     56G4BertiniPiKBuilder::~G4BertiniPiKBuilder()
    4357{
    44   delete theModel;
    4558}
    4659
    47  void G4BertiniPiKBuilder::
    48  Build(G4PionPlusInelasticProcess * aP)
     60void G4BertiniPiKBuilder::
     61Build(G4PionPlusInelasticProcess * aP)
    4962 {
    5063   aP->RegisterMe(theModel);
    … …  
    5366 }
    5467
    55  void G4BertiniPiKBuilder::
    56  Build(G4PionMinusInelasticProcess * aP)
    57  {
    58    aP->RegisterMe(theModel);
    59    aP->AddDataSet(&thePiData);
    60    theModel->SetMinEnergy(theMin);
    61    theModel->SetMaxEnergy(theMax);
    62  }
    63 
    64  void G4BertiniPiKBuilder::
    65  Build(G4HadronElasticProcess * ) {}
    66 
    67  void G4BertiniPiKBuilder::
    68  Build(G4KaonPlusInelasticProcess * aP)
     68void G4BertiniPiKBuilder::
     69Build(G4PionMinusInelasticProcess * aP)
    6970 {
    7071   aP->RegisterMe(theModel);
    … …  
    7374 }
    7475
    75  void G4BertiniPiKBuilder::
    76  Build(G4KaonMinusInelasticProcess * aP)
     76void G4BertiniPiKBuilder::
     77Build(G4HadronElasticProcess * ) {}
     78
     79void G4BertiniPiKBuilder::
     80Build(G4KaonPlusInelasticProcess * aP)
    7781 {
    7882   aP->RegisterMe(theModel);
    … …  
    8185 }
    8286
    83  void G4BertiniPiKBuilder::
    84  Build(G4KaonZeroLInelasticProcess * aP)
     87void G4BertiniPiKBuilder::
     88Build(G4KaonMinusInelasticProcess * aP)
    8589 {
    8690   aP->RegisterMe(theModel);
    … …  
    8993 }
    9094
    91  void G4BertiniPiKBuilder::
    92  Build(G4KaonZeroSInelasticProcess * aP)
     95void G4BertiniPiKBuilder::
     96Build(G4KaonZeroLInelasticProcess * aP)
     97 {
     98   aP->RegisterMe(theModel);
     99   theModel->SetMinEnergy(theMin);
     100   theModel->SetMaxEnergy(theMax);
     101 }
     102
     103void G4BertiniPiKBuilder::
     104Build(G4KaonZeroSInelasticProcess * aP)
    93105 {
    94106   aP->RegisterMe(theModel);

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BertiniProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BertiniProtonBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4BertiniProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    4054~G4BertiniProtonBuilder()
    4155{
    42   delete theModel;
    4356}
    4457
    … …  
    5467  theModel->SetMaxEnergy(theMax);
    5568  aP->RegisterMe(theModel);
    56   aP->AddDataSet(&theXSec); 
    5769}
    5870

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

    r825 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4BinaryNeutronBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4BinaryNeutronBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryNeutronBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4BinaryNeutronBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
    3044
    31  G4BinaryNeutronBuilder::
    32  G4BinaryNeutronBuilder()
     45G4BinaryNeutronBuilder::
     46G4BinaryNeutronBuilder()
    3347 {
    3448   theMin = 0;
    … …  
    4357   theModel->SetMaxEnergy(theMax);
    4458   aP->RegisterMe(theModel);
    45    aP->AddDataSet(&theXSec); 
    4659 }
    4760
    48  G4BinaryNeutronBuilder::
    49  ~G4BinaryNeutronBuilder()
     61G4BinaryNeutronBuilder::~G4BinaryNeutronBuilder()
    5062{
    51   delete theModel;
    5263}
    5364
    54  void G4BinaryNeutronBuilder::
    55  Build(G4HadronElasticProcess * )
     65void G4BinaryNeutronBuilder::
     66Build(G4HadronElasticProcess * )
    5667 {
    5768 }
    5869
    59  void G4BinaryNeutronBuilder::
    60  Build(G4HadronFissionProcess * )
     70void G4BinaryNeutronBuilder::
     71Build(G4HadronFissionProcess * )
    6172 {
    6273 }
    6374
    64  void G4BinaryNeutronBuilder::
    65  Build(G4HadronCaptureProcess * )
     75void G4BinaryNeutronBuilder::
     76Build(G4HadronCaptureProcess * )
    6677 {
    6778 }

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BinaryPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryPiKBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4BinaryPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    3246G4BinaryPiKBuilder()
    3347{
     48  thePiData = new G4PiNuclearCrossSection;
    3449  theMin = 0*GeV;
    3550  theMax = 1.3*GeV;
    … …  
    4257~G4BinaryPiKBuilder()
    4358{
    44   delete theModel;
    4559}
    4660
    … …  
    5468  theModel->SetMaxEnergy(theMax);
    5569  aP->RegisterMe(theModel);
    56   aP->AddDataSet(&thePiData);
    5770}
    5871
    … …  
    6376  theModel->SetMaxEnergy(theMax);
    6477  aP->RegisterMe(theModel);
    65   aP->AddDataSet(&thePiData);
    6678}
    6779

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4BinaryProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4BinaryProtonBuilder
     32//
     33// Author: 2002 H.P. Wellisch
     34//
     35// Modified:
     36// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4BinaryProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    4054Build(G4ProtonInelasticProcess * aP)
    4155{
    42   aP->AddDataSet(&theXSec); 
    4356  theModel->SetMinEnergy(theMin);
    4457  theModel->SetMaxEnergy(theMax);
    … …  
    4760
    4861G4BinaryProtonBuilder::
    49 ~G4BinaryProtonBuilder() {}
     62~G4BinaryProtonBuilder()
     63{
     64}
    5065
    5166void G4BinaryProtonBuilder::

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

    r988 r1203  
    2525//
    2626// $Id: G4ChargeExchangePhysics.cc,v 1.1 2008/11/20 12:38:11 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/builders/src/G4DecayPhysics.cc

    r988 r1203  
    2525//
    2626// $Id: G4DecayPhysics.cc,v 1.1 2006/10/31 11:35:02 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/builders/src/G4ElectroNuclearBuilder.cc

    r988 r1203  
    2525//
    2626// $Id: G4ElectroNuclearBuilder.cc,v 1.1 2006/10/31 11:35:02 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/builders/src/G4EmExtraPhysics.cc

    r988 r1203  
    2525//
    2626// $Id: G4EmExtraPhysics.cc,v 1.3 2008/01/08 10:36:32 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/builders/src/G4EmMessenger.cc

    r988 r1203  
    2525//
    2626// $Id: G4EmMessenger.cc,v 1.1 2006/10/31 11:35:02 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/builders/src/G4EmStandardPhysics.cc

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics.cc,v 1.16 2008/11/21 16:50:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4EmStandardPhysics.cc,v 1.20 2009/10/30 18:36:15 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5454#include "G4PhotoElectricEffect.hh"
    5555
    56 #include "G4MultipleScattering.hh"
     56#include "G4eMultipleScattering.hh"
     57#include "G4MuMultipleScattering.hh"
    5758#include "G4hMultipleScattering.hh"
    58 #include "G4eMultipleScattering.hh"
    5959
    6060#include "G4eIonisation.hh"
    … …  
    155155    } else if (particleName == "e-") {
    156156
    157       pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
    158       pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
    159       pmanager->AddProcess(new G4eBremsstrahlung(),  -1,-3, 3);
     157      pmanager->AddProcess(new G4eMultipleScattering(), -1, 1, 1);
     158      pmanager->AddProcess(new G4eIonisation,           -1, 2, 2);
     159      pmanager->AddProcess(new G4eBremsstrahlung(),     -1,-3, 3);
    160160
    161161    } else if (particleName == "e+") {
    162162
    163       pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
    164       pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
    165       pmanager->AddProcess(new G4eBremsstrahlung,    -1,-3, 3);
    166       pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
     163      pmanager->AddProcess(new G4eMultipleScattering(), -1, 1, 1);
     164      pmanager->AddProcess(new G4eIonisation,           -1, 2, 2);
     165      pmanager->AddProcess(new G4eBremsstrahlung,       -1,-3, 3);
     166      pmanager->AddProcess(new G4eplusAnnihilation,      0,-1, 4);
    167167
    168168    } else if (particleName == "mu+" ||
    169169               particleName == "mu-"    ) {
    170170
    171       pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
    172       pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
    173       pmanager->AddProcess(new G4MuBremsstrahlung,   -1,-3, 3);
    174       pmanager->AddProcess(new G4MuPairProduction,   -1,-4, 4);
     171      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
     172      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
     173      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
     174      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
    175175
    176176    } else if (particleName == "alpha" ||
    177                particleName == "He3" ||
    178                particleName == "GenericIon") {
     177               particleName == "He3") {
     178
     179      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     180      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     181
     182    } else if (particleName == "GenericIon") {
    179183
    180184      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
    … …  
    183187    } else if (particleName == "pi+" ||
    184188               particleName == "pi-" ||
     189               particleName == "kaon+" ||
     190               particleName == "kaon-" ||
    185191               particleName == "proton" ) {
    186192
    … …  
    206212               particleName == "anti_xi-" ||
    207213               particleName == "deuteron" ||
    208                particleName == "kaon+" ||
    209                particleName == "kaon-" ||
    210214               particleName == "lambda_c+" ||
    211215               particleName == "omega-" ||

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option1.cc,v 1.11 2008/11/21 16:50:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4EmStandardPhysics_option1.cc,v 1.15 2009/10/30 18:36:15 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5757
    5858#include "G4eMultipleScattering.hh"
     59#include "G4MuMultipleScattering.hh"
    5960#include "G4hMultipleScattering.hh"
    60 #include "G4MultipleScattering.hh"
    6161#include "G4MscStepLimitType.hh"
    6262
    … …  
    181181               particleName == "mu-"    ) {
    182182
    183       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     183      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
    184184      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
    185185      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
    … …  
    187187
    188188    } else if (particleName == "alpha" ||
    189                particleName == "He3" ||
    190                particleName == "GenericIon") {
     189               particleName == "He3") {
     190
     191      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     192      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
     193
     194    } else if (particleName == "GenericIon") {
    191195
    192196      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
    … …  
    195199    } else if (particleName == "pi+" ||
    196200               particleName == "pi-" ||
     201               particleName == "kaon+" ||
     202               particleName == "kaon-" ||
    197203               particleName == "proton" ) {
    198204
    … …  
    218224               particleName == "anti_xi-" ||
    219225               particleName == "deuteron" ||
    220                particleName == "kaon+" ||
    221                particleName == "kaon-" ||
    222226               particleName == "lambda_c+" ||
    223227               particleName == "omega-" ||
    … …  
    238242  G4EmProcessOptions opt;
    239243  opt.SetVerbose(verbose);
    240   //opt.SetApplyCuts(true);
     244  opt.SetApplyCuts(true);
    241245}
    242246

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option2.cc,v 1.15 2008/11/21 17:59:23 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4EmStandardPhysics_option2.cc,v 1.20 2009/11/24 12:53:22 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6262#include "G4MuMultipleScattering.hh"
    6363#include "G4CoulombScattering.hh"
     64#include "G4UrbanMscModel93.hh"
     65#include "G4WentzelVIModel.hh"
     66//#include "G4GoudsmitSaundersonMscModel.hh"
    6467
    6568#include "G4eIonisation.hh"
    … …  
    7578#include "G4hIonisation.hh"
    7679#include "G4ionIonisation.hh"
     80//#include "G4IonParametrisedLossModel.hh"
    7781
    7882#include "G4Gamma.hh"
    … …  
    161165    } else if (particleName == "e-") {
    162166
    163       pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
     167      G4eMultipleScattering* msc = new G4eMultipleScattering();
     168      msc->AddEmModel(0, new G4UrbanMscModel93());
     169      //      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
     170      pmanager->AddProcess(msc,                       -1, 1, 1);
    164171      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
    165172      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
    … …  
    167174    } else if (particleName == "e+") {
    168175
    169       pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
     176      G4eMultipleScattering* msc = new G4eMultipleScattering();
     177      msc->AddEmModel(0, new G4UrbanMscModel93());
     178      // msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
     179      pmanager->AddProcess(msc,                       -1, 1, 1);
    170180      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
    171181      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
    … …  
    175185               particleName == "mu-"    ) {
    176186
    177       pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
    178       pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
    179       pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
    180       pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
     187      G4MuMultipleScattering* msc = new G4MuMultipleScattering();
     188      msc->AddEmModel(0, new G4WentzelVIModel());
     189      pmanager->AddProcess(msc,                     -1, 1, 1);
     190      pmanager->AddProcess(new G4MuIonisation,      -1, 2, 2);
     191      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-3, 3);
     192      pmanager->AddProcess(new G4MuPairProduction,  -1,-4, 4);
    181193      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    182194
     195    } else if (particleName == "GenericIon") {
     196
     197      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     198
     199      G4ionIonisation* ionIoni = new G4ionIonisation();
     200      //ionIoni->SetEmModel(new G4IonParametrisedLossModel());
     201      //ionIoni->SetStepFunction(0.1, 20*um);
     202      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
     203
    183204    } else if (particleName == "alpha" ||
    184                particleName == "He3" ||
    185                particleName == "GenericIon") {
     205               particleName == "He3") {
    186206
    187207      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
    … …  
    190210    } else if (particleName == "pi+" ||
    191211               particleName == "pi-" ||
     212               particleName == "kaon+" ||
     213               particleName == "kaon-" ||
    192214               particleName == "proton" ) {
    193215
    194       pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
     216      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
    195217      pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
    196218      pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
    … …  
    213235               particleName == "anti_xi-" ||
    214236               particleName == "deuteron" ||
    215                particleName == "kaon+" ||
    216                particleName == "kaon-" ||
    217237               particleName == "lambda_c+" ||
    218238               particleName == "omega-" ||
    … …  
    240260  // Physics tables
    241261  //
    242   //opt.SetMinEnergy(100*eV);
    243   //opt.SetMaxEnergy(100*TeV);
    244   //opt.SetDEDXBinning(84);
    245   //opt.SetLambdaBinning(84);
     262  //opt.SetMinEnergy(0.1*keV);
     263  // opt.SetMaxEnergy(10*TeV);
     264  //opt.SetDEDXBinning(77);
     265  //opt.SetLambdaBinning(77);
    246266  //opt.SetSplineFlag(true);
    247267  opt.SetPolarAngleLimit(0.2);
    248  
    249   // Energy loss
    250   //
    251   //opt.SetLinearLossLimit(0.01);
    252  
     268   
    253269  // Ionization
    254270  //

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option3.cc,v 1.14 2008/11/21 16:50:30 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4EmStandardPhysics_option3.cc,v 1.18 2009/11/24 12:53:22 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050#include "G4GammaConversion.hh"
    5151#include "G4PhotoElectricEffect.hh"
    52 #include "G4LowEnergyRayleigh.hh"
     52#include "G4RayleighScattering.hh"
    5353
    5454#include "G4eMultipleScattering.hh"
     55#include "G4MuMultipleScattering.hh"
    5556#include "G4hMultipleScattering.hh"
    5657#include "G4MscStepLimitType.hh"
     58#include "G4UrbanMscModel93.hh"
     59#include "G4WentzelVIModel.hh"
     60#include "G4CoulombScattering.hh"
    5761
    5862#include "G4eIonisation.hh"
    … …  
    6872#include "G4hIonisation.hh"
    6973#include "G4ionIonisation.hh"
     74#include "G4IonParametrisedLossModel.hh"
     75#include "G4NuclearStopping.hh"
    7076
    7177#include "G4Gamma.hh"
    … …  
    148154    if (particleName == "gamma") {
    149155
    150       pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh);
    151156      pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
    152157      pmanager->AddDiscreteProcess(new G4ComptonScattering);
    153158      pmanager->AddDiscreteProcess(new G4GammaConversion);
     159      pmanager->AddDiscreteProcess(new G4RayleighScattering);
    154160
    155161    } else if (particleName == "e-") {
    156162
    157163      G4eMultipleScattering* msc = new G4eMultipleScattering();
     164      msc->AddEmModel(0, new G4UrbanMscModel93());
    158165      msc->SetStepLimitType(fUseDistanceToBoundary);
    159166      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    166173
    167174      G4eMultipleScattering* msc = new G4eMultipleScattering();
     175      msc->AddEmModel(0, new G4UrbanMscModel93());
    168176      msc->SetStepLimitType(fUseDistanceToBoundary);
    169177      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    177185               particleName == "mu-"    ) {
    178186
    179       pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
     187      G4MuMultipleScattering* msc = new G4MuMultipleScattering();
     188      msc->AddEmModel(0, new G4WentzelVIModel());
     189      pmanager->AddProcess(msc,                       -1, 1, 1);
    180190      G4MuIonisation* muIoni = new G4MuIonisation();
    181191      muIoni->SetStepFunction(0.2, 50*um);         
    … …  
    183193      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
    184194      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
     195      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    185196
    186197    } else if (particleName == "alpha" ||
    187                particleName == "He3" ||
    188                particleName == "GenericIon") {
     198               particleName == "He3") {
    189199
    190200      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
    … …  
    192202      ionIoni->SetStepFunction(0.1, 20*um);
    193203      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
     204      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);
     205
     206    } else if (particleName == "GenericIon") {
     207
     208      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
     209      G4ionIonisation* ionIoni = new G4ionIonisation();
     210      ionIoni->SetEmModel(new G4IonParametrisedLossModel());
     211      ionIoni->SetStepFunction(0.1, 10*um);
     212      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
     213      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);
    194214
    195215    } else if (particleName == "pi+" ||
    196216               particleName == "pi-" ||
     217               particleName == "kaon+" ||
     218               particleName == "kaon-" ||
    197219               particleName == "proton" ) {
    198220
    … …  
    220242               particleName == "anti_xi-" ||
    221243               particleName == "deuteron" ||
    222                particleName == "kaon+" ||
    223                particleName == "kaon-" ||
    224244               particleName == "lambda_c+" ||
    225245               particleName == "omega-" ||
    … …  
    256276  opt.SetLambdaBinning(220);
    257277  //opt.SetSplineFlag(true);
     278  opt.SetPolarAngleLimit(0.2);
    258279   
    259280  // Ionization

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFBinaryNeutronBuilder.cc,v 1.4 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryNeutronBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFBinaryNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4FTFBinaryNeutronBuilder::
    … …  
    8095Build(G4NeutronInelasticProcess * aP)
    8196{
     97  theModel->SetMinEnergy(theMin);
    8298  aP->RegisterMe(theModel);
    83   aP->AddDataSet(&theXSec); 
     99  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    84100}

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

    r921 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4FTFBinaryPiKBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4FTFBinaryPiKBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryPiKBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4FTFBinaryPiKBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
    3044
    31  G4FTFBinaryPiKBuilder::
    32  G4FTFBinaryPiKBuilder(G4bool quasiElastic)
     45G4FTFBinaryPiKBuilder::
     46G4FTFBinaryPiKBuilder(G4bool quasiElastic)
    3347 {
     48   thePiData = new G4PiNuclearCrossSection;
    3449   theMin = 4*GeV;
    3550   theModel = new G4TheoFSGenerator("FTFB");
    … …  
    5671 }
    5772
    58  G4FTFBinaryPiKBuilder::
    59  ~G4FTFBinaryPiKBuilder()
     73G4FTFBinaryPiKBuilder:: ~G4FTFBinaryPiKBuilder()
    6074 {
    6175   delete theCascade;
    … …  
    6680 }
    6781
    68  void G4FTFBinaryPiKBuilder::
    69  Build(G4HadronElasticProcess * ) {}
     82void G4FTFBinaryPiKBuilder::
     83Build(G4HadronElasticProcess * ) {}
    7084
    71  void G4FTFBinaryPiKBuilder::
    72  Build(G4PionPlusInelasticProcess * aP)
     85void G4FTFBinaryPiKBuilder::
     86Build(G4PionPlusInelasticProcess * aP)
    7387 {
    74    aP->AddDataSet(&thePiData);
     88   theModel->SetMinEnergy(theMin);
     89   aP->AddDataSet(thePiData);
    7590   aP->RegisterMe(theModel);
    7691 }
    7792
    78  void G4FTFBinaryPiKBuilder::
    79  Build(G4PionMinusInelasticProcess * aP)
     93void G4FTFBinaryPiKBuilder::
     94Build(G4PionMinusInelasticProcess * aP)
    8095 {
    8196   theModel->SetMinEnergy(theMin);
    82    theModel->SetMaxEnergy(100*TeV);
    83    aP->AddDataSet(&thePiData);
     97   aP->AddDataSet(thePiData);
    8498   aP->RegisterMe(theModel);
    8599 }
    … …  
    89103 {
    90104   theModel->SetMinEnergy(theMin);
    91    theModel->SetMaxEnergy(100*TeV);
    92105   aP->RegisterMe(theModel);
    93106 }
    … …  
    97110 {
    98111   theModel->SetMinEnergy(theMin);
    99    theModel->SetMaxEnergy(100*TeV);
    100112   aP->RegisterMe(theModel);
    101113 }
    … …  
    105117 {
    106118   theModel->SetMinEnergy(theMin);
    107    theModel->SetMaxEnergy(100*TeV);
    108119   aP->RegisterMe(theModel);
    109120 }
    … …  
    113124 {
    114125   theModel->SetMinEnergy(theMin);
    115    theModel->SetMaxEnergy(100*TeV);
    116126   aP->RegisterMe(theModel);
    117127 }

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFBinaryProtonBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFBinaryProtonBuilder
     32//
     33// Author: 2008 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFBinaryProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    3146G4FTFBinaryProtonBuilder::
    … …  
    6176{
    6277  theModel->SetMinEnergy(theMin);
    63   theModel->SetMaxEnergy(100*TeV);
    6478  aP->RegisterMe(theModel);
    65   aP->AddDataSet(&theXSec); 
     79  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    6680}
    6781

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFCNeutronBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFCNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4FTFCNeutronBuilder::
    … …  
    5065
    5166  theModel->SetTransport(theCascade);
     67  theModel->SetMinEnergy(theMin);
     68  theModel->SetMaxEnergy(100*TeV);
    5269}
    5370
    54 G4FTFCNeutronBuilder::
    55 ~G4FTFCNeutronBuilder()
     71G4FTFCNeutronBuilder::~G4FTFCNeutronBuilder()
    5672{
    5773  delete theCascade;
    … …  
    8096Build(G4NeutronInelasticProcess * aP)
    8197{
    82   aP->AddDataSet(&theXSec); 
    83 
    8498  theModel->SetMinEnergy(theMin);
    85   theModel->SetMaxEnergy(100*TeV);
     99  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    86100  aP->RegisterMe(theModel);
    87101}

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFCPiKBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFCPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    3246G4FTFCPiKBuilder(G4bool quasiElastic)
    3347{
     48  thePiData = new G4PiNuclearCrossSection;
    3449  theMin = 4*GeV;
    3550  theModel = new G4TheoFSGenerator;
    … …  
    4964  } else
    5065  {  theQuasiElastic=0;} 
     66
     67  theModel->SetMinEnergy(theMin);
     68  theModel->SetMaxEnergy(100*TeV);
    5169}
    5270
    … …  
    6684Build(G4PionPlusInelasticProcess * aP)
    6785{
    68   aP->AddDataSet(&thePiData);
     86  aP->AddDataSet(thePiData);
    6987  theModel->SetMinEnergy(theMin);
    70   theModel->SetMaxEnergy(100*TeV);
    7188  aP->RegisterMe(theModel);
    7289}
    … …  
    7592Build(G4PionMinusInelasticProcess * aP)
    7693{
    77   aP->AddDataSet(&thePiData);
     94  aP->AddDataSet(thePiData);
    7895  theModel->SetMinEnergy(theMin);
    79   theModel->SetMaxEnergy(100*TeV);
    8096  aP->RegisterMe(theModel);
    8197}
    … …  
    85101{
    86102  theModel->SetMinEnergy(theMin);
    87   theModel->SetMaxEnergy(100*TeV);
    88103  aP->RegisterMe(theModel);
    89104}
    … …  
    93108{
    94109  theModel->SetMinEnergy(theMin);
    95   theModel->SetMaxEnergy(100*TeV);
    96110  aP->RegisterMe(theModel);
    97111}
    … …  
    101115{
    102116  theModel->SetMinEnergy(theMin);
    103   theModel->SetMaxEnergy(100*TeV);
    104117  aP->RegisterMe(theModel);
    105118}
    … …  
    109122{
    110123  theModel->SetMinEnergy(theMin);
    111   theModel->SetMaxEnergy(100*TeV);
    112124  aP->RegisterMe(theModel);
    113125}

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFCProtonBuilder.cc,v 1.4 2009/03/31 18:38:34 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFCProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFCProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
    30 #include "TheoModelFactory.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3145
    3246G4FTFCProtonBuilder::
    … …  
    3448{
    3549  theMin = 4*GeV;
    36   theModel = TheoModelFactory<G4StringChipsParticleLevelInterface,
    37                               G4FTFModel, G4LundStringFragmentation>::New();
     50  theModel = new G4TheoFSGenerator;
     51
     52  theStringModel = new G4FTFModel;
     53  theStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation);
     54  theStringModel->SetFragmentationModel(theStringDecay);
     55
     56  theCascade = new G4StringChipsParticleLevelInterface;
     57
     58  theModel->SetHighEnergyGenerator(theStringModel);
    3859                             
    39     if (quasiElastic)
     60  if (quasiElastic)
    4061  {
    4162     theQuasiElastic=new G4QuasiElasticChannel;
    … …  
    4465  {  theQuasiElastic=0;} 
    4566
     67  theModel->SetTransport(theCascade);
     68  theModel->SetMinEnergy(theMin);
     69  theModel->SetMaxEnergy(100*TeV);
     70}
     71
     72G4FTFCProtonBuilder::~G4FTFCProtonBuilder()
     73{
     74  delete theCascade;
     75  delete theStringDecay;
     76  if ( theQuasiElastic ) delete theQuasiElastic;
     77  delete theStringModel;
     78  delete theModel;
    4679}
    4780
    … …  
    5083{
    5184  theModel->SetMinEnergy(theMin);
    52   theModel->SetMaxEnergy(100*TeV);
    5385  aP->RegisterMe(theModel);
    54   aP->AddDataSet(&theXSec); 
     86  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
     87}
     88
     89void G4FTFCProtonBuilder::
     90Build(G4HadronElasticProcess * )
     91{
    5592}
    5693

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFPNeutronBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFPNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4FTFPNeutronBuilder::
    3247G4FTFPNeutronBuilder(G4bool quasiElastic)
    3348{
    34   theMin = 4*GeV;
     49  theMin =   4*GeV;
     50  theMax = 100*TeV;
    3551  theModel = new G4TheoFSGenerator("FTFP");
    3652
    … …  
    5268  } else
    5369  {  theQuasiElastic=0;} 
     70
     71  theModel->SetMinEnergy(theMin);
     72  theModel->SetMaxEnergy(100*TeV);
    5473}
    5574
    … …  
    83102{
    84103  theModel->SetMinEnergy(theMin);
    85   theModel->SetMaxEnergy(100*TeV);
     104  theModel->SetMaxEnergy(theMax);
    86105  aP->RegisterMe(theModel);
    87   aP->AddDataSet(&theXSec); 
     106  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    88107}
    89108

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

    r921 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4FTFPPiKBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4FTFPPiKBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4FTFPPiKBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
    3044
    31  G4FTFPPiKBuilder::
    32  G4FTFPPiKBuilder(G4bool quasiElastic)
     45G4FTFPPiKBuilder::
     46G4FTFPPiKBuilder(G4bool quasiElastic)
    3347 {
     48   thePiData = new G4PiNuclearCrossSection;
    3449   theMin = 4*GeV;
     50   theMax = 100*TeV;
    3551   theModel = new G4TheoFSGenerator("FTFP");
    3652
    … …  
    5268
    5369   theModel->SetTransport(theCascade);
     70   theModel->SetMinEnergy(theMin);
     71   theModel->SetMaxEnergy(100*TeV);
    5472 }
    5573
    56  G4FTFPPiKBuilder::
    57  ~G4FTFPPiKBuilder()
     74G4FTFPPiKBuilder:: ~G4FTFPPiKBuilder()
    5875 {
    5976   delete theCascade;
    … …  
    6481 }
    6582
    66  void G4FTFPPiKBuilder::
    67  Build(G4HadronElasticProcess * ) {}
     83void G4FTFPPiKBuilder::
     84Build(G4HadronElasticProcess * ) {}
    6885
    69  void G4FTFPPiKBuilder::
    70  Build(G4PionPlusInelasticProcess * aP)
     86void G4FTFPPiKBuilder::
     87Build(G4PionPlusInelasticProcess * aP)
    7188 {
    7289   theModel->SetMinEnergy(theMin);
    73    theModel->SetMaxEnergy(100*TeV);
    74    aP->AddDataSet(&thePiData);
     90   theModel->SetMaxEnergy(theMax);
     91   aP->AddDataSet(thePiData);
    7592   aP->RegisterMe(theModel);
    7693 }
    7794
    78  void G4FTFPPiKBuilder::
    79  Build(G4PionMinusInelasticProcess * aP)
     95void G4FTFPPiKBuilder::
     96Build(G4PionMinusInelasticProcess * aP)
    8097 {
    8198   theModel->SetMinEnergy(theMin);
    82    theModel->SetMaxEnergy(100*TeV);
    83    aP->AddDataSet(&thePiData);
     99   theModel->SetMaxEnergy(theMax);
     100   aP->AddDataSet(thePiData);
    84101   aP->RegisterMe(theModel);
    85102 }
    86103
    87  void G4FTFPPiKBuilder::
    88  Build(G4KaonPlusInelasticProcess * aP)
     104void G4FTFPPiKBuilder::
     105Build(G4KaonPlusInelasticProcess * aP)
    89106 {
    90107   theModel->SetMinEnergy(theMin);
    91    theModel->SetMaxEnergy(100*TeV);
     108   theModel->SetMaxEnergy(theMax);
    92109   aP->RegisterMe(theModel);
    93110 }
    94111
    95  void G4FTFPPiKBuilder::
    96  Build(G4KaonMinusInelasticProcess * aP)
     112void G4FTFPPiKBuilder::
     113Build(G4KaonMinusInelasticProcess * aP)
    97114 {
    98115   theModel->SetMinEnergy(theMin);
    99    theModel->SetMaxEnergy(100*TeV);
     116   theModel->SetMaxEnergy(theMax);
    100117   aP->RegisterMe(theModel);
    101118 }
    102119
    103  void G4FTFPPiKBuilder::
    104  Build(G4KaonZeroLInelasticProcess * aP)
     120void G4FTFPPiKBuilder::
     121Build(G4KaonZeroLInelasticProcess * aP)
    105122 {
    106123   theModel->SetMinEnergy(theMin);
    107    theModel->SetMaxEnergy(100*TeV);
     124   theModel->SetMaxEnergy(theMax);
    108125   aP->RegisterMe(theModel);
    109126 }
    110127
    111  void G4FTFPPiKBuilder::
    112  Build(G4KaonZeroSInelasticProcess * aP)
     128void G4FTFPPiKBuilder::
     129Build(G4KaonZeroSInelasticProcess * aP)
    113130 {
    114131   theModel->SetMinEnergy(theMin);
    115    theModel->SetMaxEnergy(100*TeV);
     132   theModel->SetMaxEnergy(theMax);
    116133   aP->RegisterMe(theModel);
    117134 }

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4FTFPProtonBuilder.cc,v 1.6 2009/04/23 18:54:57 japost Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4FTFPProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4FTFPProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    3146G4FTFPProtonBuilder::
    … …  
    3348{
    3449  theMin = 4*GeV;
     50  theMax = 100.*TeV;
    3551  theModel = new G4TheoFSGenerator("FTFP");
    3652
    … …  
    5268
    5369  theModel->SetTransport(theCascade);
     70  theModel->SetMinEnergy(theMin);
     71  theModel->SetMaxEnergy(100*TeV);
    5472}
    5573
    … …  
    5876{
    5977  theModel->SetMinEnergy(theMin);
    60   theModel->SetMaxEnergy(100*TeV);
     78  theModel->SetMaxEnergy(theMax);
    6179  aP->RegisterMe(theModel);
    62   aP->AddDataSet(&theXSec); 
     80  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    6381}
    6482

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

    r988 r1203  
    2525//
    2626// $Id: G4HadronDElasticPhysics.cc,v 1.3 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/builders/src/G4HadronElasticPhysics.cc

    r988 r1203  
    2525//
    2626// $Id: G4HadronElasticPhysics.cc,v 1.9 2008/12/01 16:57:22 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/builders/src/G4HadronHElasticPhysics.cc

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronHElasticPhysics.cc,v 1.5 2008/05/19 10:21:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4HadronHElasticPhysics.cc,v 1.6 2009/10/04 16:03:38 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4242#include "G4HadronHElasticPhysics.hh"
    4343
    44 #include "G4HadronicProcess.hh"
    45 #include "G4HadronElasticProcess.hh"
    46 #include "G4HadronicInteraction.hh"
    47 #include "G4LElastic.hh"
    48 
    4944#include "G4ParticleDefinition.hh"
    5045#include "G4ProcessManager.hh"
    … …  
    5550#include "G4Neutron.hh"
    5651
    57 #include "G4VQCrossSection.hh"
     52#include "G4WHadronElasticProcess.hh"
     53#include "G4VHadronElastic.hh"
     54#include "G4CHIPSElastic.hh"
     55#include "G4ElasticHadrNucleusHE.hh"
     56#include "G4NeutronHPElastic.hh"
    5857#include "G4UElasticCrossSection.hh"
    5958#include "G4BGGNucleonElasticXS.hh"
    … …  
    6160
    6261G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool hp)
    63   : G4VPhysicsConstructor("HElastic"), mname("HElastic"), verbose(ver),
     62  : G4VPhysicsConstructor("HElastic"), verbose(ver),
    6463    hpFlag(hp), wasActivated(false)
    6564{
    6665  if(verbose > 1) G4cout << "### HadronHElasticPhysics" << G4endl;
    67   model = 0;
    68   neutronModel = 0;
    69   neutronHPModel = 0; 
    7066}
    7167
    7268G4HadronHElasticPhysics::~G4HadronHElasticPhysics()
    73 {
    74   delete model;
    75   delete neutronModel;
    76   delete neutronHPModel;
    77 }
     69{}
    7870
    7971void G4HadronHElasticPhysics::ConstructParticle()
    8072{
    81 // G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
     73  // G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
    8274  G4MesonConstructor pMesonConstructor;
    8375  pMesonConstructor.ConstructParticle();
    … …  
    9688  wasActivated = true;
    9789
    98   G4double elimit = 0.4*GeV;
    99   //G4double elimit = 0.0;
    100 
    101   if(verbose > 1)
     90  G4double elimit = 1.0*GeV;
     91  if(verbose > 1) {
    10292    G4cout << "### HadronElasticPhysics Construct Processes with HE limit "
    10393           << elimit << " MeV" << G4endl;
     94  }
    10495
    105   G4HadronicProcess* hel = 0;
    106   G4VQCrossSection* man = 0;
     96  G4VHadronElastic* plep0 = new G4VHadronElastic();
     97  G4VHadronElastic* plep1 = new G4VHadronElastic();
     98  plep1->SetMaxEnergy(elimit);
    10799
    108   G4HadronElastic* he = new G4HadronElastic();
    109   he->SetHEModelLowLimit(elimit);
    110   he->SetQModelLowLimit(0.0);
    111   he->SetLowestEnergyLimit(0.0);
    112   model = he;
    113   man = he->GetCS();
     100  G4CHIPSElastic* chipsp = new G4CHIPSElastic();
     101  G4CHIPSElastic* chipsn = new G4CHIPSElastic();
     102
     103  G4ElasticHadrNucleusHE* he = new G4ElasticHadrNucleusHE();
     104  he->SetMinEnergy(elimit);
    114105
    115106  theParticleIterator->reset();
    … …  
    143134     
    144135      G4ProcessManager* pmanager = particle->GetProcessManager();
    145       G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
    146       h->SetQElasticCrossSection(man);
    147       hel = h;
     136      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
    148137      if(pname == "proton") {
    149138        hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
     139        hel->RegisterMe(chipsp);
    150140      } else if (pname == "pi+" || pname == "pi-") {
    151141        hel->AddDataSet(new G4BGGPionElasticXS(particle));
     142        hel->RegisterMe(plep1);
     143        hel->RegisterMe(he);
    152144      } else {
    153         hel->AddDataSet(new G4UElasticCrossSection(particle));
     145        //hel->AddDataSet(new G4UElasticCrossSection(particle));
     146        hel->RegisterMe(plep0);
    154147      }
    155       hel->RegisterMe(model);
    156148      pmanager->AddDiscreteProcess(hel);
     149      if(verbose > 1) {
     150        G4cout << "### HadronHElasticPhysics: " << hel->GetProcessName()
     151               << " added for " << particle->GetParticleName() << G4endl;
     152      }
    157153
    158154      // neutron case
    … …  
    160156
    161157      G4ProcessManager* pmanager = particle->GetProcessManager();
    162       G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
    163       G4HadronElastic* nhe = new G4HadronElastic();
    164       nhe->SetHEModelLowLimit(elimit);
    165       neutronModel = nhe;
    166       h->SetQElasticCrossSection(nhe->GetCS());
    167       hel = h;
     158      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
    168159      hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
     160      hel->RegisterMe(chipsn);
    169161
    170162      if(hpFlag) {
    171         neutronModel->SetMinEnergy(19.5*MeV);
    172         neutronHPModel = new G4NeutronHPElastic();
    173         hel->RegisterMe(neutronHPModel);
     163        chipsn->SetMinEnergy(19.5*MeV);
     164        G4NeutronHPElastic* hp = new G4NeutronHPElastic();
     165        hel->RegisterMe(hp);
    174166        hel->AddDataSet(new G4NeutronHPElasticData());
    175167      }
    176 
    177       hel->RegisterMe(neutronModel);
    178168      pmanager->AddDiscreteProcess(hel);
    179169
    180       if(verbose > 1)
    181         G4cout << "### HadronHElasticPhysics added for "
    182                << particle->GetParticleName() << G4endl;
     170      if(verbose > 1) {
     171        G4cout << "### HadronHElasticPhysics: " << hel->GetProcessName()
     172               << " added for " << particle->GetParticleName() << G4endl;
     173      }
    183174    }
    184175  }

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

    r988 r1203  
    2525//
    2626// $Id: G4HadronQElasticPhysics.cc,v 1.7 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/builders/src/G4IonBinaryCascadePhysics.cc

    r988 r1203  
    2525//
    2626// $Id: G4IonBinaryCascadePhysics.cc,v 1.2 2009/02/16 10:15:35 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/builders/src/G4IonPhysics.cc

    r988 r1203  
    2525//
    2626// $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 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/builders/src/G4LEPNeutronBuilder.cc

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

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

    r988 r1203  
    2525//
    2626// $Id: G4LHEPStoppingPhysics.cc,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/builders/src/G4MiscLHEPBuilder.cc

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

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

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2727//
    2828//---------------------------------------------------------------------------

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

    r988 r1203  
    2525//
    2626// $Id: G4NeutronTrackingCut.cc,v 1.5 2008/09/17 18:19:15 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/builders/src/G4PiKBuilder.cc

    r988 r1203  
    2525//
    2626// $Id: G4PiKBuilder.cc,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/builders/src/G4PrecoNeutronBuilder.cc

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4PrecoNeutronBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4PrecoNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4PrecoNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4PrecoNeutronBuilder::
    … …  
    6479  theModel->SetMaxEnergy(theMax);
    6580  aP->RegisterMe(theModel);
    66   aP->AddDataSet(&theXSec); 
     81  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    6782}
    6883

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

    r825 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4PrecoProtonBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4PrecoProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4PrecoProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    3146#include "G4ExcitationHandler.hh" 
    … …  
    5368  theModel->SetMaxEnergy(theMax);
    5469  aP->RegisterMe(theModel);
    55   aP->AddDataSet(&theXSec); 
     70  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    5671}
    5772

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

    r988 r1203  
    2525//
    2626// $Id: G4ProtonBuilder.cc,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/builders/src/G4QEmExtraPhysics.cc

    r988 r1203  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QEmExtraPhysics.cc,v 1.1 2007/05/23 17:38:35 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     26// $Id: G4QEmExtraPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3333// Author: 23 May 2007 V. Ivanchenko
    3434//
    35 // Modified:
     35// Modified: 19 Nov 2009 M.Kosov: G4QInelastic instead of G4QCollision
    3636//
    3737//----------------------------------------------------------------------------
    … …  
    3939
    4040#include "G4QEmExtraPhysics.hh"
    41 #include "G4QCollision.hh"
     41#include "G4QInelastic.hh"
    4242
    4343#include "G4ParticleDefinition.hh"
    … …  
    7676  wasActivated = true;
    7777
    78   hProcess = new G4QCollision();
     78  hProcess = new G4QInelastic();
    7979
    8080  G4ParticleDefinition* particle = G4Gamma::Gamma();

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSBinaryNeutronBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryNeutronBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSBinaryNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4QGSBinaryNeutronBuilder::
    … …  
    85100  theModel->SetMaxEnergy(100*TeV);
    86101  aP->RegisterMe(theModel);
    87   aP->AddDataSet(&theXSec); 
     102  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    88103}
    89104

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSBinaryPiKBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryPiKBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSBinaryPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    3246G4QGSBinaryPiKBuilder(G4bool quasiElastic)
    3347{
     48  thePiData = new G4PiNuclearCrossSection;
     49
    3450  theMin = 12*GeV;
    3551  theModel = new G4TheoFSGenerator("QGSB");
    … …  
    7389  theModel->SetMinEnergy(theMin);
    7490  theModel->SetMaxEnergy(100*TeV);
    75   aP->AddDataSet(&thePiData);
     91  aP->AddDataSet(thePiData);
    7692  aP->RegisterMe(theModel);
    7793}
    … …  
    8298  theModel->SetMinEnergy(theMin);
    8399  theModel->SetMaxEnergy(100*TeV);
    84   aP->AddDataSet(&thePiData);
     100  aP->AddDataSet(thePiData);
    85101  aP->RegisterMe(theModel);
    86102}

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

    r921 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4QGSBinaryProtonBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4QGSBinaryProtonBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSBinaryProtonBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4QGSBinaryProtonBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    31  G4QGSBinaryProtonBuilder::
    32  G4QGSBinaryProtonBuilder(G4bool quasiElastic)
     46G4QGSBinaryProtonBuilder::
     47G4QGSBinaryProtonBuilder(G4bool quasiElastic)
    3348 {
    3449   theMin = 12*GeV;
    … …  
    5368 }
    5469
    55  void G4QGSBinaryProtonBuilder::
    56  Build(G4ProtonInelasticProcess * aP)
     70void G4QGSBinaryProtonBuilder::
     71Build(G4ProtonInelasticProcess * aP)
    5772 {
    5873// G4cout << "adding inelastic Proton in QGSBinary" << G4endl;
    59    aP->AddDataSet(&theXSec); 
     74   aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    6075   theModel->SetMinEnergy(theMin);
    6176   theModel->SetMaxEnergy(100*TeV);
    … …  
    6378 }
    6479
    65  void G4QGSBinaryProtonBuilder::
    66  Build(G4HadronElasticProcess * )
     80void G4QGSBinaryProtonBuilder::
     81Build(G4HadronElasticProcess * )
    6782 {
    6883 }
    6984
    70  G4QGSBinaryProtonBuilder::
    71  ~G4QGSBinaryProtonBuilder()
     85G4QGSBinaryProtonBuilder::~G4QGSBinaryProtonBuilder()
    7286 {
    7387   delete thePreEquilib;

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCEflowNeutronBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowNeutronBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSCEflowNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4QGSCEflowNeutronBuilder::
    … …  
    6782  theModel->SetMaxEnergy(100*TeV);
    6883  aP->RegisterMe(theModel);
    69   aP->AddDataSet(&theXSec); 
     84  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    7085}
    7186

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCEflowPiKBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowPiKBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSCEflowPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    3246G4QGSCEflowPiKBuilder(G4bool quasiElastic)
    3347{
     48  thePiCross = new G4PiNuclearCrossSection;
    3449  theMin = 8*GeV;
    3550  theModel = new G4TheoFSGenerator("QGSCEflow");
    … …  
    6984  theModel->SetMinEnergy(theMin);
    7085  theModel->SetMaxEnergy(100*TeV);
    71   aP->AddDataSet(&thePiCross);
     86  aP->AddDataSet(thePiCross);
    7287  aP->RegisterMe(theModel);
    7388}
    … …  
    7893  theModel->SetMinEnergy(theMin);
    7994  theModel->SetMaxEnergy(100*TeV);
    80   aP->AddDataSet(&thePiCross);
     95  aP->AddDataSet(thePiCross);
    8196  aP->RegisterMe(theModel);
    8297}

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCEflowProtonBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCEflowProtonBuilder
     32//
     33// Author: 2006 G.Folger
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSCEflowProtonBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    3146G4QGSCEflowProtonBuilder::
    … …  
    7287  theModel->SetMaxEnergy(100*TeV);
    7388  aP->RegisterMe(theModel);
    74   aP->AddDataSet(&theXSec); 
     89  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    7590}
    7691

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

    r921 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4QGSCNeutronBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4QGSCNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4QGSCNeutronBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    31  G4QGSCNeutronBuilder::
    32  G4QGSCNeutronBuilder(G4bool quasiElastic)
     46G4QGSCNeutronBuilder::
     47G4QGSCNeutronBuilder(G4bool quasiElastic)
    3348 {
    3449   theMin = 8*GeV;
    … …  
    5166 }
    5267
    53  G4QGSCNeutronBuilder::
    54  ~G4QGSCNeutronBuilder()
     68G4QGSCNeutronBuilder::~G4QGSCNeutronBuilder()
    5569 {
    5670   delete theStringDecay;
    … …  
    6175 }
    6276
    63  void G4QGSCNeutronBuilder::
    64  Build(G4NeutronInelasticProcess * aP)
     77void G4QGSCNeutronBuilder::
     78Build(G4NeutronInelasticProcess * aP)
    6579 {
    6680   theModel->SetMinEnergy(theMin);
    6781   theModel->SetMaxEnergy(100*TeV);
    6882   aP->RegisterMe(theModel);
    69    aP->AddDataSet(&theXSec); 
     83   aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    7084 }
    7185

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSCPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    … …  
    3246G4QGSCPiKBuilder(G4bool quasiElastic)
    3347{
     48  thePiCross = new G4PiNuclearCrossSection;
    3449  theMin = 8*GeV;
    3550  theModel = new G4TheoFSGenerator("QGSC");
    … …  
    6984  theModel->SetMinEnergy(theMin);
    7085  theModel->SetMaxEnergy(100*TeV);
    71   aP->AddDataSet(&thePiCross);
     86  aP->AddDataSet(thePiCross);
    7287  aP->RegisterMe(theModel);
    7388}
    … …  
    7893  theModel->SetMinEnergy(theMin);
    7994  theModel->SetMaxEnergy(100*TeV);
    80   aP->AddDataSet(&thePiCross);
     95  aP->AddDataSet(thePiCross);
    8196  aP->RegisterMe(theModel);
    8297}

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSCProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSCProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------//
    2639#include "G4QGSCProtonBuilder.hh"
    2740#include "G4ParticleDefinition.hh"
    2841#include "G4ParticleTable.hh"
    2942#include "G4ProcessManager.hh"
     43#include "G4ProtonInelasticCrossSection.hh"
    3044
    3145G4QGSCProtonBuilder::
    … …  
    7286  theModel->SetMaxEnergy(100*TeV);
    7387  aP->RegisterMe(theModel);
    74   aP->AddDataSet(&theXSec); 
     88  aP->AddDataSet(new G4ProtonInelasticCrossSection); 
    7589}
    7690

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSPNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPNeutronBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSPNeutronBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4NeutronInelasticCrossSection.hh"
    3045
    3146G4QGSPNeutronBuilder::
    … …  
    92107  theModel->SetMaxEnergy(100*TeV);
    93108  aP->RegisterMe(theModel);
    94   aP->AddDataSet(&theXSec); 
     109  aP->AddDataSet(new G4NeutronInelasticCrossSection); 
    95110}
    96111

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

    r921 r1203  
    2424// ********************************************************************
    2525//
     26// $Id: G4QGSPPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPPiKBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
    2640#include "G4QGSPPiKBuilder.hh"
    2741#include "G4ParticleDefinition.hh"
    2842#include "G4ParticleTable.hh"
    2943#include "G4ProcessManager.hh"
     44#include "G4PiNuclearCrossSection.hh"
    3045
    3146G4QGSPPiKBuilder::
    3247G4QGSPPiKBuilder(G4bool quasiElastic, G4bool projectileDiffraction)
    3348{
     49  thePiData = new G4PiNuclearCrossSection();
    3450  theMin = 12*GeV;
    3551  theModel = new G4TheoFSGenerator("QGSP");
    … …  
    8197  theModel->SetMinEnergy(theMin);
    8298  theModel->SetMaxEnergy(100*TeV);
    83   aP->AddDataSet(&thePiData);
     99  aP->AddDataSet(thePiData);
    84100  aP->RegisterMe(theModel);
    85101}
    … …  
    90106  theModel->SetMinEnergy(theMin);
    91107  theModel->SetMaxEnergy(100*TeV);
    92   aP->AddDataSet(&thePiData);
     108  aP->AddDataSet(thePiData);
    93109  aP->RegisterMe(theModel);
    94110}

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

    r921 r1203  
    2424// ********************************************************************
    2525//
    26  #include "G4QGSPProtonBuilder.hh"
    27  #include "G4ParticleDefinition.hh"
    28  #include "G4ParticleTable.hh"
    29  #include "G4ProcessManager.hh"
     26// $Id: G4QGSPProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-03 $
     28//
     29//---------------------------------------------------------------------------
     30//
     31// ClassName:   G4QGSPProtonBuilder
     32//
     33// Author: 2002 J.P. Wellisch
     34//
     35// Modified:
     36// 30.03.2009 V.Ivanchenko create cross section by new
     37//
     38//----------------------------------------------------------------------------
     39//
     40#include "G4QGSPProtonBuilder.hh"
     41#include "G4ParticleDefinition.hh"
     42#include "G4ParticleTable.hh"
     43#include "G4ProcessManager.hh"
     44#include "G4ProtonInelasticCrossSection.hh"
    3045
    31  G4QGSPProtonBuilder::
    32  G4QGSPProtonBuilder(G4bool quasiElastic, G4bool projectileDiffraction)
     46G4QGSPProtonBuilder::
     47G4QGSPProtonBuilder(G4bool quasiElastic, G4bool projectileDiffraction)
    3348 {
    3449   theMin = 12*GeV;
    … …  
    5974 }
    6075
    61  void G4QGSPProtonBuilder::
    62  Build(G4ProtonInelasticProcess * aP)
     76void G4QGSPProtonBuilder::
     77Build(G4ProtonInelasticProcess * aP)
    6378 {
    64 // G4cout << "adding inelastic Proton in QGSP" << G4endl;
    65    aP->AddDataSet(&theXSec); 
     79   // G4cout << "adding inelastic Proton in QGSP" << G4endl;
     80   aP->AddDataSet(new G4ProtonInelasticCrossSection()); 
    6681   theModel->SetMinEnergy(theMin);
    6782   theModel->SetMaxEnergy(100*TeV);
    … …  
    6984 }
    7085
    71  void G4QGSPProtonBuilder::
    72  Build(G4HadronElasticProcess * )
     86void G4QGSPProtonBuilder::
     87Build(G4HadronElasticProcess * )
    7388 {
    7489 }
    7590
    76  G4QGSPProtonBuilder::
    77  ~G4QGSPProtonBuilder()
     91G4QGSPProtonBuilder::~G4QGSPProtonBuilder()
    7892 {
    7993   delete thePreEquilib;

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

    r988 r1203  
    2525//
    2626// $Id: G4QStoppingPhysics.cc,v 1.2 2007/04/26 16:03:18 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/builders/src/G4StoppingHadronBuilder.cc

    r988 r1203  
    2525//
    2626// $Id: G4StoppingHadronBuilder.cc,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//---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.