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

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

Location:
trunk/source/physics_lists/builders
Files:
56 edited

Legend:

Unmodified
Added
Removed

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4ChargeExchangePhysics.hh,v 1.1 2008/11/20 12:38:11 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4ChargeExchangePhysics.hh,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949{
    5050public:
    51   G4ChargeExchangePhysics(G4int ver = 0, G4bool glauber = false);
     51  G4ChargeExchangePhysics(G4int ver = 0);
     52  G4ChargeExchangePhysics(G4int ver, G4bool glauber);
    5253  virtual ~G4ChargeExchangePhysics();
    5354
    … …  
    6162  // registered to the process manager of each particle type
    6263  virtual void ConstructProcess();
    63 
    6464private:
    6565

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DecayPhysics.hh,v 1.2 2009/11/05 01:24:47 gum Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4DecayPhysics.hh,v 1.4 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5151{
    5252  public:
    53     G4DecayPhysics(const G4String& name = "decay", G4int ver = 1);
     53    G4DecayPhysics(G4int ver = 1);
     54    G4DecayPhysics(const G4String& name, G4int ver = 1);
    5455    virtual ~G4DecayPhysics();
    5556

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

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4EmDNAPhysics.hh,v 1.1 2009/03/25 11:28:07 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4EmDNAPhysics.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929
    3030#ifndef G4EmDNAPhysics_h
    … …  
    3939{
    4040public:
    41   G4EmDNAPhysics(G4int ver = 1,
    42                               const G4String& name = "G4EmDNAPhysics");
     41
     42  G4EmDNAPhysics(G4int ver = 1);
     43
     44  // obsolete
     45  G4EmDNAPhysics(G4int ver, const G4String& name);
    4346
    4447  virtual ~G4EmDNAPhysics();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmExtraPhysics.hh,v 1.2 2007/11/15 18:08:11 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmExtraPhysics.hh,v 1.3 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5555{
    5656public:
    57   G4EmExtraPhysics(const G4String& name = "EM extra");
     57
     58  G4EmExtraPhysics(G4int ver = 1);
     59
     60  // obsolete
     61  G4EmExtraPhysics(const G4String& name);
     62
    5863  virtual ~G4EmExtraPhysics();
    5964
    … …  
    8590  G4MuNuclearInteraction*  theMuNuc1;
    8691  G4MuNuclearInteraction*  theMuNuc2;
     92
     93  G4int verbose;
    8794};
    8895

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4EmLivermorePhysics.hh,v 1.1 2009/03/25 20:54:32 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmLivermorePhysics.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928
    3029#ifndef G4EmLivermorePhysics_h
    … …  
    3938{
    4039public:
    41   G4EmLivermorePhysics(G4int ver = 1,
    42                               const G4String& name = "G4EmLivermorePhysics");
     40
     41  G4EmLivermorePhysics(G4int ver = 1);
     42
     43  // obsolete
     44  G4EmLivermorePhysics(G4int ver, const G4String& name);
    4345
    4446  virtual ~G4EmLivermorePhysics();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4EmLivermorePolarizedPhysics.hh,v 1.1 2009/03/25 20:54:32 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmLivermorePolarizedPhysics.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928
    3029#ifndef G4EmLivermorePolarizedPhysics_h
    … …  
    3938{
    4039public:
    41   G4EmLivermorePolarizedPhysics(G4int ver = 1,
    42                               const G4String& name = "G4EmLivermorePolarizedPhysics");
     40  G4EmLivermorePolarizedPhysics(G4int ver = 1);
     41
     42  // obsolete
     43  G4EmLivermorePolarizedPhysics(G4int ver, const G4String&);
    4344
    4445  virtual ~G4EmLivermorePolarizedPhysics();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4EmPenelopePhysics.hh,v 1.1 2009/03/25 13:24:57 pandola Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmPenelopePhysics.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928
    3029#ifndef G4EmPenelopePhysics_h
    … …  
    3938{
    4039public:
    41   G4EmPenelopePhysics(G4int ver = 1,
    42                               const G4String& name = "G4EmPenelopePhysics");
     40
     41  G4EmPenelopePhysics(G4int ver = 1);
     42
     43  // obsolete
     44  G4EmPenelopePhysics(G4int ver, const G4String& name);
    4345
    4446  virtual ~G4EmPenelopePhysics();

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

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4EmStandardPhysics.hh,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4EmStandardPhysics.hh,v 1.5 2010/06/02 17:21:29 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    5454{
    5555public:
    56   G4EmStandardPhysics(G4int ver = 0, const G4String& name = "G4EmStandard");
     56  G4EmStandardPhysics(G4int ver = 0);
     57
     58  // obsolete
     59  G4EmStandardPhysics(G4int ver, const G4String& name);
     60
    5761  virtual ~G4EmStandardPhysics();
    5862

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 //
    27 // $Id: G4EmStandardPhysics_option1.hh,v 1.1 2007/05/16 11:35:36 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmStandardPhysics_option1.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2928//
    3029//---------------------------------------------------------------------------
    … …  
    5756{
    5857public:
    59   G4EmStandardPhysics_option1(G4int ver = 1,
    60                               const G4String& name = "G4EmStandard_opt1");
     58
     59  G4EmStandardPhysics_option1(G4int ver = 1);
     60
     61  // obsolete
     62  G4EmStandardPhysics_option1(G4int ver, const G4String& name);
    6163
    6264  virtual ~G4EmStandardPhysics_option1();

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

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4EmStandardPhysics_option2.hh,v 1.1 2007/05/16 11:35:36 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4EmStandardPhysics_option2.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    5757{
    5858public:
    59   G4EmStandardPhysics_option2(G4int ver = 1,
    60                               const G4String& name = "G4EmStandard_opt2");
     59
     60  G4EmStandardPhysics_option2(G4int ver = 1);
     61
     62  // obsolete
     63  G4EmStandardPhysics_option2(G4int ver, const G4String& name);
    6164
    6265  virtual ~G4EmStandardPhysics_option2();

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

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4EmStandardPhysics_option3.hh,v 1.1 2008/03/13 12:11:02 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4EmStandardPhysics_option3.hh,v 1.2 2010/06/02 17:21:29 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    5454{
    5555public:
    56   G4EmStandardPhysics_option3(G4int ver = 1,
    57                               const G4String& name = "G4EmStandard_opt3");
     56  G4EmStandardPhysics_option3(G4int ver = 1);
     57
     58  // obsolete
     59  G4EmStandardPhysics_option3(G4int ver, const G4String& name);
    5860
    5961  virtual ~G4EmStandardPhysics_option3();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronDElasticPhysics.hh,v 1.1 2007/11/13 16:19:52 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronDElasticPhysics.hh,v 1.2 2010/06/03 11:04:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4343#include "globals.hh"
    4444#include "G4VPhysicsConstructor.hh"
    45 #include "G4UHadronElasticProcess.hh"
    46 #include "G4NeutronHPElastic.hh"
    47 #include "G4NeutronHPElasticData.hh"
    4845
    4946class G4HadronDElasticPhysics : public G4VPhysicsConstructor
    5047{
    5148public:
    52   G4HadronDElasticPhysics(G4int ver = 0, G4bool hp = false);
     49
     50  G4HadronDElasticPhysics(G4int ver = 1);
     51
     52  // obsolete
     53  G4HadronDElasticPhysics(G4int ver, G4bool hp);
     54
    5355  virtual ~G4HadronDElasticPhysics();
    5456
    55 public:
    5657  // This method will be invoked in the Construct() method.
    5758  // each particle type will be instantiated
    … …  
    6566private:
    6667
    67   G4String mname;
    68 
    6968  G4int    verbose;
    70   G4bool   hpFlag;
    7169  G4bool   wasActivated;
    7270};

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronElasticPhysics.hh,v 1.4 2006/11/23 15:46:04 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronElasticPhysics.hh,v 1.6 2010/06/03 16:28:39 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353{
    5454public:
    55   G4HadronElasticPhysics(const G4String& name = "elastic",
     55   G4HadronElasticPhysics(G4int ver = 1);
     56   G4HadronElasticPhysics(const G4String& name,
    5657                         G4int ver = 0, G4bool hp = false,
    5758                         G4bool glauber = false);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronHElasticPhysics.hh,v 1.4 2009/11/28 17:35:01 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronHElasticPhysics.hh,v 1.5 2010/06/03 11:04:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4343#include "globals.hh"
    4444#include "G4VPhysicsConstructor.hh"
    45 #include "G4UHadronElasticProcess.hh"
    46 #include "G4HadronElastic.hh"
    47 #include "G4NeutronHPElastic.hh"
    48 #include "G4NeutronHPElasticData.hh"
    4945
    5046class G4HadronHElasticPhysics : public G4VPhysicsConstructor
    5147{
    5248public:
    53   G4HadronHElasticPhysics(G4int ver = 0, G4bool hp = false,
    54                           const G4String& type = "");
     49
     50  G4HadronHElasticPhysics(G4int ver = 0);
     51
     52  // obsolete
     53  G4HadronHElasticPhysics(G4int ver, G4bool hp, const G4String& type="");
     54
    5555  virtual ~G4HadronHElasticPhysics();
    5656
    57 public:
    5857  // This method will be invoked in the Construct() method.
    5958  // each particle type will be instantiated
    … …  
    6867
    6968  G4int    verbose;
    70   G4bool   hpFlag;
    7169  G4bool   wasActivated;
    72   G4String subtype;
    7370};
    7471

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronQElasticPhysics.hh,v 1.1 2006/11/17 19:19:40 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronQElasticPhysics.hh,v 1.2 2010/06/03 11:04:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050{
    5151public:
    52   G4HadronQElasticPhysics(const G4String& name = "elastic",
    53                           G4int ver = 1);
     52
     53  G4HadronQElasticPhysics(G4int ver = 1);
     54
     55  // obsolete
     56  G4HadronQElasticPhysics(const G4String& name, G4int ver);
     57
    5458  virtual ~G4HadronQElasticPhysics();
    5559
    56 public:
    5760  // This method will be invoked in the Construct() method.
    5861  // each particle type will be instantiated

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

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

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonInclAblaPhysics.hh,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonInclAblaPhysics.hh,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6060{
    6161public:
    62   G4IonInclAblaPhysics(const G4String& name="ions", G4int verb = 0);
     62  G4IonInclAblaPhysics(G4int ver = 0);
     63  G4IonInclAblaPhysics(const G4String& name, G4int ver = 0);
    6364  virtual ~G4IonInclAblaPhysics();
    6465

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonPhysics.hh,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5555{
    5656public:
    57   G4IonPhysics(const G4String& name="ions");
     57  G4IonPhysics(G4int verbose =1);
     58  //obsolete
     59  G4IonPhysics(const G4String& name);
    5860  virtual ~G4IonPhysics();
    5961

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

    r1274 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonQMDPhysics.hh,v 1.1 2009/11/27 17:25:15 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonQMDPhysics.hh,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6363{
    6464public:
    65   G4IonQMDPhysics(const G4String& name="ions", G4int verb = 0);
     65  G4IonQMDPhysics(G4int verb = 0);
     66  G4IonQMDPhysics(const G4String& name, G4int ver = 0);
    6667  virtual ~G4IonQMDPhysics();
    6768

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4LHEPStoppingPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4LHEPStoppingPhysics.hh,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353{
    5454public:
    55   G4LHEPStoppingPhysics(const G4String& name = "stopping",
    56                         G4int ver = 1);
     55  G4LHEPStoppingPhysics(G4int ver = 1);
     56  G4LHEPStoppingPhysics(const G4String& name, G4int ver = 1);
    5757  virtual ~G4LHEPStoppingPhysics();
    5858

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4NeutronTrackingCut.hh,v 1.2 2008/09/17 18:19:15 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4NeutronTrackingCut.hh,v 1.3 2010/06/04 15:28:35 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4848{
    4949  public:
    50     G4NeutronTrackingCut(const G4String& name = "neutronTrackingCut",G4int ver=0);
     50    G4NeutronTrackingCut(G4int ver=0);
     51    G4NeutronTrackingCut(const G4String& name,G4int ver=0);
    5152    virtual ~G4NeutronTrackingCut();
    5253

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

    r1203 r1315  
    6464  public:
    6565
    66     G4OpticalPhysics(G4int verbose = 0, const G4String& name = "Optical");
     66    G4OpticalPhysics(G4int verbose = 0);
     67    G4OpticalPhysics(G4int verbose, const G4String& name);
    6768    virtual ~G4OpticalPhysics();
    6869

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

    r1228 r1315  
    2525//
    2626//
    27 // $Id: G4QAtomicPhysics.hh,v 1.1 2009/11/20 10:24:28 mkossov Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4QAtomicPhysics.hh,v 1.2 2010/06/03 14:37:24 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    5151{
    5252public:
    53   G4QAtomicPhysics(G4int ver = 0, const G4String& name = "G4QAtomic");
     53  G4QAtomicPhysics(G4int ver = 0);
     54  G4QAtomicPhysics(G4int ver, const G4String& name);
    5455  virtual ~G4QAtomicPhysics();
    5556

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCaptureAtRestPhysics.hh,v 1.1 2009/11/16 19:12:10 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QCaptureAtRestPhysics.hh,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5656{
    5757public:
    58   G4QCaptureAtRestPhysics(const G4String& name = "nuclear_capture", G4int ver = 1);
     58  G4QCaptureAtRestPhysics(G4int ver = 1);
     59  G4QCaptureAtRestPhysics(const G4String& name, G4int ver = 1);
    5960  virtual ~G4QCaptureAtRestPhysics();
    6061

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QNeutrinoPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QNeutrinoPhysics.hh,v 1.3 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6060{
    6161public:
    62   G4QNeutrinoPhysics(const G4String& name = "CHIPS neutrino-nuclear");
     62  G4QNeutrinoPhysics(G4int verbose =1);
     63  G4QNeutrinoPhysics(const G4String& name);
    6364  virtual ~G4QNeutrinoPhysics();
    6465

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QPhotoNuclearPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QPhotoNuclearPhysics.hh,v 1.3 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6666{
    6767public:
    68   G4QPhotoNuclearPhysics(const G4String& name = "CHIPS photo-nuclear");
     68  G4QPhotoNuclearPhysics(G4int verbose =1);
     69  G4QPhotoNuclearPhysics(const G4String& name);
    6970  virtual ~G4QPhotoNuclearPhysics();
    7071

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QStoppingPhysics.hh,v 1.2 2007/04/26 16:03:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QStoppingPhysics.hh,v 1.6 2010/06/04 09:59:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5050{
    5151public:
    52   G4QStoppingPhysics(const G4String& name = "stopping",
     52  G4QStoppingPhysics(G4int ver = 1);
     53  G4QStoppingPhysics(const G4String& name,
    5354                     G4int ver = 1,
    5455                     G4bool UseMuonMinusCapture=true);

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

    r825 r1315  
    3939{
    4040public:
    41   G4RadioactiveDecayPhysics(const G4String& name = "raddecay");
     41  G4RadioactiveDecayPhysics(G4int verbose =1);
     42  G4RadioactiveDecayPhysics(const G4String& name);
    4243  virtual ~G4RadioactiveDecayPhysics();
    4344

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4ChargeExchangePhysics.cc,v 1.1 2008/11/20 12:38:11 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4ChargeExchangePhysics.cc,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353G4ChargeExchangePhysics::G4ChargeExchangePhysics(G4int ver, G4bool glauber)
    5454  : G4VPhysicsConstructor("chargeExchange"), verbose(ver), glFlag(glauber),
     55    wasActivated(false)
     56{
     57  if(verbose > 1) G4cout << "### ChargeExchangePhysics" << G4endl;
     58  model = 0;
     59}
     60
     61G4ChargeExchangePhysics::G4ChargeExchangePhysics(G4int ver)
     62  : G4VPhysicsConstructor("chargeExchange"), verbose(ver), glFlag(false),
    5563    wasActivated(false)
    5664{

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DecayPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4DecayPhysics.cc,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5454#include "G4ShortLivedConstructor.hh"
    5555
     56
     57G4DecayPhysics::G4DecayPhysics(G4int ver)
     58  :  G4VPhysicsConstructor("Decay"), verbose(ver), wasActivated(false)
     59{}
    5660
    5761G4DecayPhysics::G4DecayPhysics(const G4String& name, G4int ver)

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmDNAPhysics.cc,v 1.2 2009/11/01 13:21:13 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmDNAPhysics.cc,v 1.4 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929#include "G4EmDNAPhysics.hh"
    … …  
    6262#include "G4Positron.hh"
    6363#include "G4eMultipleScattering.hh"
     64#include "G4GoudsmitSaundersonMscModel.hh"
    6465#include "G4eIonisation.hh"
    6566#include "G4eBremsstrahlung.hh"
    … …  
    7980//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    8081
    81 G4EmDNAPhysics::G4EmDNAPhysics(
    82     G4int ver, const G4String& name)
    83   : G4VPhysicsConstructor(name), verbose(ver)
     82G4EmDNAPhysics::G4EmDNAPhysics(G4int ver)
     83  : G4VPhysicsConstructor("G4EmDNAPhysics"), verbose(ver)
     84{}
     85
     86//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     87
     88G4EmDNAPhysics::G4EmDNAPhysics(G4int ver, const G4String&)
     89  : G4VPhysicsConstructor("G4EmDNAPhysics"), verbose(ver)
    8490{}
    8591
    … …  
    185191      G4eMultipleScattering* msc = new G4eMultipleScattering();
    186192      msc->SetStepLimitType(fUseDistanceToBoundary);
     193      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    187194      pmanager->AddProcess(msc,                   -1, 1, 1);
    188195

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmExtraPhysics.cc,v 1.3 2008/01/08 10:36:32 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmExtraPhysics.cc,v 1.4 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5353#include "G4ProcessManager.hh"
    5454
    55 G4EmExtraPhysics::G4EmExtraPhysics(const G4String& name):
    56   G4VPhysicsConstructor(name), wasBuilt(false), gnActivated(false), munActivated(false),
    57   synActivated(false), synchOn(false), gammNucOn(true), muNucOn(false),
    58   theElectronSynch(0), thePositronSynch(0), theGNPhysics(0), theMuNuc1(0),
    59   theMuNuc2(0)
     55G4EmExtraPhysics::G4EmExtraPhysics(G4int ver):
     56  G4VPhysicsConstructor("G4GammaLeptoNuclearPhys"), wasBuilt(false), gnActivated(false),
     57  munActivated(false), synActivated(false), synchOn(false), gammNucOn(true), muNucOn(false),
     58  theElectronSynch(0), thePositronSynch(0), theGNPhysics(0), theMuNuc1(0), theMuNuc2(0),
     59  verbose(ver)
     60{
     61  theMessenger = new G4EmMessenger(this);
     62}
     63
     64G4EmExtraPhysics::G4EmExtraPhysics(const G4String&):
     65  G4VPhysicsConstructor("G4GammaLeptoNuclearPhys"), wasBuilt(false), gnActivated(false),
     66  munActivated(false), synActivated(false), synchOn(false), gammNucOn(true), muNucOn(false),
     67  theElectronSynch(0), thePositronSynch(0), theGNPhysics(0), theMuNuc1(0), theMuNuc2(0),
     68  verbose(1)
    6069{
    6170  theMessenger = new G4EmMessenger(this);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmLivermorePhysics.cc,v 1.7 2009/11/24 12:53:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmLivermorePhysics.cc,v 1.9 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929#include "G4EmLivermorePhysics.hh"
    … …  
    8686#include "G4UrbanMscModel93.hh"
    8787#include "G4WentzelVIModel.hh"
     88#include "G4GoudsmitSaundersonMscModel.hh"
    8889#include "G4CoulombScattering.hh"
    8990
    … …  
    114115//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    115116
    116 G4EmLivermorePhysics::G4EmLivermorePhysics(
    117     G4int ver, const G4String& name)
    118   : G4VPhysicsConstructor(name), verbose(ver)
     117G4EmLivermorePhysics::G4EmLivermorePhysics(G4int ver)
     118  : G4VPhysicsConstructor("G4EmLivermorePhysics"), verbose(ver)
     119{
     120  G4LossTableManager::Instance();
     121}
     122
     123//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     124
     125G4EmLivermorePhysics::G4EmLivermorePhysics(G4int ver, const G4String&)
     126  : G4VPhysicsConstructor("G4EmLivermorePhysics"), verbose(ver)
    119127{
    120128  G4LossTableManager::Instance();
    … …  
    211219
    212220      G4eMultipleScattering* msc = new G4eMultipleScattering();
    213       msc->AddEmModel(0, new G4UrbanMscModel93());
     221      //msc->AddEmModel(0, new G4UrbanMscModel93());
     222      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    214223      msc->SetStepLimitType(fUseDistanceToBoundary);
    215224      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    219228      G4LivermoreIonisationModel* theIoniLivermore = new
    220229        G4LivermoreIonisationModel();
    221       theIoniLivermore->SetHighEnergyLimit(LivermoreHighEnergyLimit);
     230      theIoniLivermore->SetHighEnergyLimit(1*MeV);
    222231      eIoni->AddEmModel(0, theIoniLivermore, new G4UniversalFluctuation() );
    223232      eIoni->SetStepFunction(0.2, 100*um); //     
    … …  
    237246     
    238247      G4eMultipleScattering* msc = new G4eMultipleScattering();
    239       msc->AddEmModel(0, new G4UrbanMscModel93());
     248      //msc->AddEmModel(0, new G4UrbanMscModel93());
     249      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    240250      msc->SetStepLimitType(fUseDistanceToBoundary);
    241251      pmanager->AddProcess(msc,                   -1, 1, 1);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmLivermorePolarizedPhysics.cc,v 1.6 2009/11/24 12:53:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmLivermorePolarizedPhysics.cc,v 1.8 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929#include "G4EmLivermorePolarizedPhysics.hh"
    … …  
    8686#include "G4UrbanMscModel93.hh"
    8787#include "G4WentzelVIModel.hh"
     88#include "G4GoudsmitSaundersonMscModel.hh"
    8889#include "G4CoulombScattering.hh"
    8990
    … …  
    114115//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    115116
    116 G4EmLivermorePolarizedPhysics::G4EmLivermorePolarizedPhysics(
    117     G4int ver, const G4String& name)
    118   : G4VPhysicsConstructor(name), verbose(ver)
     117G4EmLivermorePolarizedPhysics::G4EmLivermorePolarizedPhysics(G4int ver)
     118  : G4VPhysicsConstructor("G4EmLivermorePolarizedPhysics"), verbose(ver)
     119{
     120  G4LossTableManager::Instance();
     121}
     122
     123//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     124
     125G4EmLivermorePolarizedPhysics::G4EmLivermorePolarizedPhysics(G4int ver, const G4String&)
     126  : G4VPhysicsConstructor("G4EmLivermorePolarizedPhysics"), verbose(ver)
    119127{
    120128  G4LossTableManager::Instance();
    … …  
    208216
    209217      G4eMultipleScattering* msc = new G4eMultipleScattering();
    210       msc->AddEmModel(0, new G4UrbanMscModel93());
     218      //msc->AddEmModel(0, new G4UrbanMscModel93());
     219      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    211220      msc->SetStepLimitType(fUseDistanceToBoundary);
    212221      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    216225      G4LivermoreIonisationModel* theIoniLivermore = new
    217226        G4LivermoreIonisationModel();
    218       theIoniLivermore->SetHighEnergyLimit(LivermoreHighEnergyLimit);
     227      theIoniLivermore->SetHighEnergyLimit(1*MeV);
    219228      eIoni->AddEmModel(0, theIoniLivermore, new G4UniversalFluctuation() );
    220229      eIoni->SetStepFunction(0.2, 100*um); //     
    … …  
    234243     
    235244      G4eMultipleScattering* msc = new G4eMultipleScattering();
    236       msc->AddEmModel(0, new G4UrbanMscModel93());
     245      //msc->AddEmModel(0, new G4UrbanMscModel93());
     246      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    237247      msc->SetStepLimitType(fUseDistanceToBoundary);
    238248      pmanager->AddProcess(msc,                   -1, 1, 1);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmPenelopePhysics.cc,v 1.7 2009/11/24 12:53:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmPenelopePhysics.cc,v 1.9 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929#include "G4EmPenelopePhysics.hh"
    … …  
    8787#include "G4UrbanMscModel93.hh"
    8888#include "G4WentzelVIModel.hh"
     89#include "G4GoudsmitSaundersonMscModel.hh"
    8990#include "G4CoulombScattering.hh"
    9091
    … …  
    115116//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    116117
    117 G4EmPenelopePhysics::G4EmPenelopePhysics(
    118     G4int ver, const G4String& name)
    119   : G4VPhysicsConstructor(name), verbose(ver)
     118G4EmPenelopePhysics::G4EmPenelopePhysics(G4int ver)
     119  : G4VPhysicsConstructor("G4EmPenelopePhysics"), verbose(ver)
     120{
     121  G4LossTableManager::Instance();
     122}
     123
     124//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     125
     126G4EmPenelopePhysics::G4EmPenelopePhysics(G4int ver, const G4String&)
     127  : G4VPhysicsConstructor("G4EmPenelopePhysics"), verbose(ver)
    120128{
    121129  G4LossTableManager::Instance();
    … …  
    216224
    217225      G4eMultipleScattering* msc = new G4eMultipleScattering();
    218       msc->AddEmModel(0, new G4UrbanMscModel93());
     226      //msc->AddEmModel(0, new G4UrbanMscModel93());
     227      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    219228      msc->SetStepLimitType(fUseDistanceToBoundary);
    220229      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    240249   
    241250      G4eMultipleScattering* msc = new G4eMultipleScattering();
    242       msc->AddEmModel(0, new G4UrbanMscModel93());
     251      //msc->AddEmModel(0, new G4UrbanMscModel93());
     252      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    243253      msc->SetStepLimitType(fUseDistanceToBoundary);
    244254      pmanager->AddProcess(msc,                   -1, 1, 1);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics.cc,v 1.20 2009/10/30 18:36:15 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmStandardPhysics.cc,v 1.21 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    9090//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    9191
    92 G4EmStandardPhysics::G4EmStandardPhysics(G4int ver, const G4String& name)
    93   : G4VPhysicsConstructor(name), verbose(ver)
     92G4EmStandardPhysics::G4EmStandardPhysics(G4int ver)
     93  : G4VPhysicsConstructor("G4EmStandard"), verbose(ver)
     94{
     95  G4LossTableManager::Instance();
     96}
     97
     98//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     99
     100G4EmStandardPhysics::G4EmStandardPhysics(G4int ver, const G4String&)
     101  : G4VPhysicsConstructor("G4EmStandard"), verbose(ver)
    94102{
    95103  G4LossTableManager::Instance();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option1.cc,v 1.15 2009/10/30 18:36:15 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmStandardPhysics_option1.cc,v 1.16 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    9393//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    9494
    95 G4EmStandardPhysics_option1::G4EmStandardPhysics_option1(
    96     G4int ver, const G4String& name)
    97   : G4VPhysicsConstructor(name), verbose(ver)
     95G4EmStandardPhysics_option1::G4EmStandardPhysics_option1(G4int ver)
     96  : G4VPhysicsConstructor("G4EmStandard_opt1"), verbose(ver)
     97{
     98  G4LossTableManager::Instance();
     99}
     100
     101//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     102
     103G4EmStandardPhysics_option1::G4EmStandardPhysics_option1(G4int ver, const G4String&)
     104  : G4VPhysicsConstructor("G4EmStandard_opt1"), verbose(ver)
    98105{
    99106  G4LossTableManager::Instance();

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option2.cc,v 1.20 2009/11/24 12:53:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmStandardPhysics_option2.cc,v 1.23 2010/06/04 10:39:55 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    9999//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    100100
    101 G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(
    102     G4int ver, const G4String& name)
    103   : G4VPhysicsConstructor(name), verbose(ver)
     101G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(G4int ver)
     102  : G4VPhysicsConstructor("G4EmStandard_opt2"), verbose(ver)
     103{
     104  G4LossTableManager::Instance();
     105}
     106
     107//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     108
     109G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(G4int ver, const G4String&)
     110  : G4VPhysicsConstructor("G4EmStandard_opt2"), verbose(ver)
    104111{
    105112  G4LossTableManager::Instance();
    … …  
    166173
    167174      G4eMultipleScattering* msc = new G4eMultipleScattering();
    168       msc->AddEmModel(0, new G4UrbanMscModel93());
     175      msc->AddEmModel(0, new G4WentzelVIModel());
     176      msc->SetRangeFactor(0.1);
     177      //msc->AddEmModel(0, new G4UrbanMscModel93());
    169178      //      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    170179      pmanager->AddProcess(msc,                       -1, 1, 1);
    171180      pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
    172181      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
     182      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    173183
    174184    } else if (particleName == "e+") {
    175185
    176186      G4eMultipleScattering* msc = new G4eMultipleScattering();
    177       msc->AddEmModel(0, new G4UrbanMscModel93());
     187      //msc->AddEmModel(0, new G4UrbanMscModel93());
     188      msc->AddEmModel(0, new G4WentzelVIModel());
     189      msc->SetRangeFactor(0.1);
    178190      // msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
    179191      pmanager->AddProcess(msc,                       -1, 1, 1);
    … …  
    181193      pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
    182194      pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
     195      pmanager->AddDiscreteProcess(new G4CoulombScattering());
    183196
    184197    } else if (particleName == "mu+" ||

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4EmStandardPhysics_option3.cc,v 1.18 2009/11/24 12:53:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4EmStandardPhysics_option3.cc,v 1.20 2010/06/02 17:21:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    9494//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    9595
    96 G4EmStandardPhysics_option3::G4EmStandardPhysics_option3(
    97     G4int ver, const G4String& name)
    98   : G4VPhysicsConstructor(name), verbose(ver)
     96G4EmStandardPhysics_option3::G4EmStandardPhysics_option3(G4int ver)
     97  : G4VPhysicsConstructor("G4EmStandard_opt3"), verbose(ver)
     98{
     99  G4LossTableManager::Instance();
     100}
     101
     102//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     103
     104G4EmStandardPhysics_option3::G4EmStandardPhysics_option3(G4int ver, const G4String&)
     105  : G4VPhysicsConstructor("G4EmStandard_opt3"), verbose(ver)
    99106{
    100107  G4LossTableManager::Instance();
    … …  
    162169
    163170      G4eMultipleScattering* msc = new G4eMultipleScattering();
    164       msc->AddEmModel(0, new G4UrbanMscModel93());
     171      //msc->AddEmModel(0, new G4UrbanMscModel93());
    165172      msc->SetStepLimitType(fUseDistanceToBoundary);
    166173      pmanager->AddProcess(msc,                   -1, 1, 1);
    … …  
    173180
    174181      G4eMultipleScattering* msc = new G4eMultipleScattering();
    175       msc->AddEmModel(0, new G4UrbanMscModel93());
     182      //msc->AddEmModel(0, new G4UrbanMscModel93());
    176183      msc->SetStepLimitType(fUseDistanceToBoundary);
    177184      pmanager->AddProcess(msc,                   -1, 1, 1);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronDElasticPhysics.cc,v 1.3 2008/05/19 10:21:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronDElasticPhysics.cc,v 1.6 2010/06/03 15:09:54 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4343//                     for neutrons
    4444// 06.03.2007 V.Ivanchenko use updated interface to G4UElasticCrossSection
     45// 03.06.2010 V.Ivanchenko cleanup constructors and ConstructProcess method
    4546//
    4647//----------------------------------------------------------------------------
    4748//
     49// Diffuse optical model for sampling scattering
     50// BBG cross sections for p, pi+-
     51// XS cross sections for n
     52// LHEP cross sections for other particles
    4853
    4954#include "G4HadronDElasticPhysics.hh"
    5055
    51 #include "G4HadronicProcess.hh"
    52 #include "G4HadronElasticProcess.hh"
    53 #include "G4HadronicInteraction.hh"
    54 #include "G4DiffuseElastic.hh"
    55 #include "G4HadronElastic.hh"
    56 
    5756#include "G4ParticleDefinition.hh"
    5857#include "G4ProcessManager.hh"
     58#include "G4HadronicProcess.hh"
    5959
    6060#include "G4MesonConstructor.hh"
    … …  
    6363#include "G4Neutron.hh"
    6464
    65 #include "G4VQCrossSection.hh"
    66 #include "G4UElasticCrossSection.hh"
     65#include "G4WHadronElasticProcess.hh"
     66#include "G4VHadronElastic.hh"
     67#include "G4CHIPSElastic.hh"
     68#include "G4ElasticHadrNucleusHE.hh"
     69#include "G4BGGNucleonElasticXS.hh"
     70#include "G4BGGPionElasticXS.hh"
     71#include "G4NeutronElasticXS.hh"
     72
     73#include "G4DiffuseElastic.hh"
     74
     75#include "G4NeutronElasticXS.hh"
    6776#include "G4BGGNucleonElasticXS.hh"
    6877#include "G4BGGPionElasticXS.hh"
    6978
    70 G4HadronDElasticPhysics::G4HadronDElasticPhysics(G4int ver, G4bool hp)
    71   : G4VPhysicsConstructor("DElastic"), mname("DElastic"), verbose(ver),
    72     hpFlag(hp), wasActivated(false)
     79G4HadronDElasticPhysics::G4HadronDElasticPhysics(G4int ver)
     80  : G4VPhysicsConstructor("hElasticDIFFUSE"), verbose(ver),
     81    wasActivated(false)
    7382{
    74   if(verbose > 1) G4cout << "### HadronDElasticPhysics" << G4endl;
     83  if(verbose > 1) {
     84    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName()
     85           << G4endl;
     86  }
     87}
     88
     89G4HadronDElasticPhysics::G4HadronDElasticPhysics(G4int ver, G4bool)
     90  : G4VPhysicsConstructor("hElasticDIFFUSE"), verbose(ver),
     91    wasActivated(false)
     92{
     93  if(verbose > 1) {
     94    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName()
     95           << G4endl;
     96  }
    7597}
    7698
    … …  
    97119  wasActivated = true;
    98120
    99   if(verbose > 1)
    100     G4cout << "### HadronDElasticPhysics Construct Processes with the model <"
    101            << mname << ">" << G4endl;
     121  //G4double elimit = 1.0*GeV;
    102122
    103   G4UHadronElasticProcess* hel = 0;
     123  if(verbose > 1) {
     124    G4cout << "### HadronDElasticPhysics Construct Processes " << G4endl;
     125  }
     126
     127  //G4VHadronElastic* plep0 = new G4VHadronElastic();
     128  //G4VHadronElastic* plep1 = new G4VHadronElastic();
     129  //plep1->SetMaxEnergy(elimit);
     130
     131  //  G4CHIPSElastic* chipsp = new G4CHIPSElastic();
     132  // G4CHIPSElastic* chipsn = new G4CHIPSElastic();
     133
     134  //G4ElasticHadrNucleusHE* he = new G4ElasticHadrNucleusHE();
     135  //he->SetMinEnergy(elimit);
     136
    104137  G4DiffuseElastic* model = 0;
    105 
    106   G4double elimit = 11.0*MeV;
    107 
    108   G4HadronElastic* he = new G4HadronElastic();
    109   G4VQCrossSection* man = he->GetCS();
    110   he->SetMaxEnergy(elimit);
    111138
    112139  theParticleIterator->reset();
    … …  
    140167     
    141168      G4ProcessManager* pmanager = particle->GetProcessManager();
    142       hel = new G4UHadronElasticProcess("hElastic");
    143       hel->SetQElasticCrossSection(man);
     169      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
    144170      if(pname == "proton") {
    145171        hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
    146172      } else if (pname == "pi+" || pname == "pi-") {
    147173        hel->AddDataSet(new G4BGGPionElasticXS(particle));
    148       } else {
    149         hel->AddDataSet(new G4UElasticCrossSection(particle));
    150174      }
    151175      model = new G4DiffuseElastic(particle);
    152176      hel->RegisterMe(model);
    153       hel->RegisterMe(he);
    154177      pmanager->AddDiscreteProcess(hel);
    155178
    … …  
    158181
    159182      G4ProcessManager* pmanager = particle->GetProcessManager();
    160       hel = new G4UHadronElasticProcess("hElastic");
    161       hel->SetQElasticCrossSection(man);
    162       hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
     183      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
     184      hel->AddDataSet(new G4NeutronElasticXS());
    163185      model = new G4DiffuseElastic(particle);
    164       if(hpFlag) {
    165         model->SetMinEnergy(19.5*MeV);
    166         G4NeutronHPElastic* modelHP = new G4NeutronHPElastic();
    167         hel->RegisterMe(modelHP);
    168         hel->AddDataSet(new G4NeutronHPElasticData());
    169       } else {
    170         hel->RegisterMe(he);
    171       }
    172186      hel->RegisterMe(model);
    173187      pmanager->AddDiscreteProcess(hel);

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronElasticPhysics.cc,v 1.9 2008/12/01 16:57:22 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronElasticPhysics.cc,v 1.12 2010/06/03 16:28:39 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6666#include "G4BGGNucleonElasticXS.hh"
    6767#include "G4BGGPionElasticXS.hh"
     68
     69G4HadronElasticPhysics::G4HadronElasticPhysics(G4int ver)
     70  : G4VPhysicsConstructor("elastic"), mname("elastic"),verbose(ver),
     71    hpFlag(false), glFlag(false),wasActivated(false)
     72{
     73  if(verbose > 1) G4cout << "### HadronElasticPhysics" << G4endl;
     74  model = 0;
     75  neutronModel = 0;
     76  neutronHPModel = 0; 
     77}
    6878
    6979G4HadronElasticPhysics::G4HadronElasticPhysics(

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronHElasticPhysics.cc,v 1.7 2009/11/28 17:35:01 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronHElasticPhysics.cc,v 1.9 2010/06/03 14:28:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3636// 21.03.07 (V.Ivanchenko) Use G4BGGNucleonElasticXS and G4BGGPionElasticXS;
    3737//                         Reduce thresholds for HE and Q-models to zero
     38// 03.06.2010 V.Ivanchenko cleanup constructors and ConstructProcess method
    3839//
    3940//----------------------------------------------------------------------------
    4041//
     42// CHIPS for sampling scattering for p and n
     43// Glauber model for samplimg of high energy pi+- (E > 1GeV)
     44// LHEP sampling model for the other particle
     45// BBG cross sections for p, n and pi+-
     46// LHEP cross sections for other particles
    4147
    4248#include "G4HadronHElasticPhysics.hh"
    … …  
    5460#include "G4CHIPSElastic.hh"
    5561#include "G4ElasticHadrNucleusHE.hh"
    56 #include "G4NeutronHPElastic.hh"
    57 #include "G4UElasticCrossSection.hh"
    5862#include "G4BGGNucleonElasticXS.hh"
    5963#include "G4BGGPionElasticXS.hh"
    6064#include "G4NeutronElasticXS.hh"
    6165
    62 G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool hp,
    63                                                  const G4String& type)
    64   : G4VPhysicsConstructor("HElastic"), verbose(ver),
    65     hpFlag(hp), wasActivated(false), subtype(type)
     66G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver)
     67  : G4VPhysicsConstructor("hElasticWEL_CHIPS"), verbose(ver),
     68    wasActivated(false)
    6669{
    67   if(verbose > 1) G4cout << "### HadronHElasticPhysics" << G4endl;
     70  if(verbose > 1) {
     71    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName()
     72           << G4endl;
     73  }
     74}
     75
     76G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool,
     77                                                 const G4String&)
     78  : G4VPhysicsConstructor("hElasticWEL_CHIPS"), verbose(ver),
     79    wasActivated(false)
     80{
     81  if(verbose > 1) {
     82    G4cout << "### G4HadronHElasticPhysics: " << GetPhysicsName()
     83           << G4endl;
     84  }
    6885}
    6986
    … …  
    87104void G4HadronHElasticPhysics::ConstructProcess()
    88105{
    89   if(wasActivated) return;
     106  if(wasActivated) { return; }
    90107  wasActivated = true;
    91108
    … …  
    145162        hel->RegisterMe(he);
    146163      } else {
    147         //hel->AddDataSet(new G4UElasticCrossSection(particle));
    148164        hel->RegisterMe(plep0);
    149165      }
    … …  
    159175      G4ProcessManager* pmanager = particle->GetProcessManager();
    160176      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
    161       if(subtype == "QBBC_XGGSN") {
    162         hel->AddDataSet(new G4NeutronElasticXS());
    163       } else {
    164         hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
    165       }
     177      hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
    166178      hel->RegisterMe(chipsn);
    167179
    168       if(hpFlag) {
    169         chipsn->SetMinEnergy(19.5*MeV);
    170         G4NeutronHPElastic* hp = new G4NeutronHPElastic();
    171         hel->RegisterMe(hp);
    172         hel->AddDataSet(new G4NeutronHPElasticData());
    173       }
    174180      pmanager->AddDiscreteProcess(hel);
    175181

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4HadronQElasticPhysics.cc,v 1.7 2008/05/19 10:21:34 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4HadronQElasticPhysics.cc,v 1.9 2010/06/03 14:28:32 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3434//
    3535// Modified:
     36// 03.06.2010 V.Ivanchenko cleanup constructors and ConstructProcess method
    3637//
    3738//----------------------------------------------------------------------------
    3839//
     40// CHIPS x-sections and generator (G4QElastic) for n and p
     41// LHEP x-section and generator for the rest
    3942
    4043#include "G4HadronQElasticPhysics.hh"
    … …  
    5457#include "G4IonConstructor.hh"
    5558
    56 G4HadronQElasticPhysics::G4HadronQElasticPhysics(
    57     const G4String& name,  G4int ver)
    58   : G4VPhysicsConstructor(name), verbose(ver), wasActivated(false)
     59G4HadronQElasticPhysics::G4HadronQElasticPhysics(G4int ver)
     60  : G4VPhysicsConstructor("hElasticCHIPS_LHEP"), verbose(ver),
     61    wasActivated(false)
    5962{
    60   if(verbose > 1) G4cout << "### HadronQElasticPhysics" << G4endl;
     63  if(verbose > 1) {
     64    G4cout << "### G4HadronQElasticPhysics: " << GetPhysicsName()
     65           << G4endl;
     66  }
     67  model = 0;
     68}
     69
     70G4HadronQElasticPhysics::G4HadronQElasticPhysics(const G4String&,  G4int ver)
     71  : G4VPhysicsConstructor("hElasticCHIPS_UELAST"), verbose(ver),
     72    wasActivated(false)
     73{
     74  if(verbose > 1) {
     75    G4cout << "### G4HadronQElasticPhysics: " << GetPhysicsName()
     76           << G4endl;
     77  }
    6178  model = 0;
    6279}
    … …  
    8299void G4HadronQElasticPhysics::ConstructProcess()
    83100{
    84   if(wasActivated) return;
     101  if(wasActivated) { return; }
    85102  wasActivated = true;
    86103
    87104  G4double elimit = DBL_MAX;
    88105
    89   if(verbose > 1)
     106  if(verbose > 1) {
    90107    G4cout << "### HadronQElasticPhysics: use HE limit " << elimit << " MeV"
    91108           << G4endl;
    92 
     109  }
    93110  process = new G4QElastic();
    94111

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonBinaryCascadePhysics.cc,v 1.2 2009/02/16 10:15:35 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonBinaryCascadePhysics.cc,v 1.3 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5959#include "G4IonConstructor.hh"
    6060
     61G4IonBinaryCascadePhysics::G4IonBinaryCascadePhysics(G4int ver)
     62  :  G4VPhysicsConstructor("IonBinaryCascade"), verbose(ver), wasActivated(false)
     63{
     64  emax     = 20.*GeV;
     65  emaxLHEP = 1.*TeV;
     66  eminBIC  = 0.*MeV;
     67  if(verbose > 1) G4cout << "### G4IonBinaryCascadePhysics" << G4endl;
     68}
     69
    6170G4IonBinaryCascadePhysics::G4IonBinaryCascadePhysics(const G4String& name,
    62                                                      G4int verb)
    63   :  G4VPhysicsConstructor(name), verbose(verb), wasActivated(false)
     71                                                     G4int ver)
     72  :  G4VPhysicsConstructor(name), verbose(ver), wasActivated(false)
    6473{
    6574  emax     = 20.*GeV;

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonInclAblaPhysics.cc,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonInclAblaPhysics.cc,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5959#include "G4IonConstructor.hh"
    6060
     61G4IonInclAblaPhysics::G4IonInclAblaPhysics(G4int ver)
     62  :  G4VPhysicsConstructor("IonInclAbla"), verbose(ver), wasActivated(false)
     63{
     64  // INCL/ABLA light ion maximum energy is 3.0 GeV/nucleon
     65  emax_d     = 2 * 3.0 * GeV;
     66  emax_t     = 3 * 3.0 * GeV;
     67  emax_he3   = 3 * 3.0 * GeV;
     68  emax_alpha = 4 * 3.0 * GeV;
     69  emaxLHEP   = 1.*TeV;
     70  emin       = 0.*MeV;
     71  if(verbose > 1) G4cout << "### G4IonInclAblaPhysics" << G4endl;
     72}
     73
    6174G4IonInclAblaPhysics::G4IonInclAblaPhysics(const G4String& name,
    62                                                      G4int verb)
    63   :  G4VPhysicsConstructor(name), verbose(verb), wasActivated(false)
     75                                                     G4int ver)
     76  :  G4VPhysicsConstructor(name), verbose(ver), wasActivated(false)
    6477{
    6578  // INCL/ABLA light ion maximum energy is 3.0 GeV/nucleon

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonPhysics.cc,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5555// Nuclei
    5656#include "G4IonConstructor.hh"
     57
     58G4IonPhysics::G4IonPhysics(G4int)
     59                  :  G4VPhysicsConstructor("IonPhysics")
     60                   , wasActivated(false)
     61{
     62}
    5763
    5864G4IonPhysics::G4IonPhysics(const G4String& name)
    … …  
    112118   pConstructor.ConstructParticle(); 
    113119 }
    114 
    115 
    116 
    117  // 2002 by J.P. Wellisch

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

    r1229 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4IonQMDPhysics.cc,v 1.1 2009/11/27 17:25:15 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4IonQMDPhysics.cc,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    6060#include "G4IonConstructor.hh"
    6161
     62G4IonQMDPhysics::G4IonQMDPhysics(G4int ver)
     63  :  G4VPhysicsConstructor("IonQMD"), verbose(ver), wasActivated(false)
     64{
     65  eminBIC  = 0.*MeV;
     66  eminQMD  = 100.*MeV;
     67  emaxQMD  = 10.*GeV;
     68  emaxLHEP = 1.*TeV;
     69  overlap  = 10*MeV;
     70  if(verbose > 1) G4cout << "### G4IonQMDPhysics" << G4endl;
     71}
     72
    6273G4IonQMDPhysics::G4IonQMDPhysics(const G4String& name,
    63                                                      G4int verb)
    64   :  G4VPhysicsConstructor(name), verbose(verb), wasActivated(false)
     74                                                     G4int ver)
     75  :  G4VPhysicsConstructor(name), verbose(ver), wasActivated(false)
    6576{
    6677  eminBIC  = 0.*MeV;

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4LHEPStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4LHEPStoppingPhysics.cc,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    5656#include "G4AntiProtonAnnihilationAtRest.hh"
    5757#include "G4AntiNeutronAnnihilationAtRest.hh"
     58
     59G4LHEPStoppingPhysics::G4LHEPStoppingPhysics(G4int ver)
     60  : G4VPhysicsConstructor("LHEP Stopping"), verbose(ver), wasActivated(false)
     61{}
    5862
    5963G4LHEPStoppingPhysics::G4LHEPStoppingPhysics(const G4String& nam, G4int ver)

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4NeutronTrackingCut.cc,v 1.5 2008/09/17 18:19:15 vnivanch Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4NeutronTrackingCut.cc,v 1.6 2010/06/04 15:28:35 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4444#include "G4Neutron.hh"
    4545#include "G4NeutronKiller.hh"
     46
     47G4NeutronTrackingCut::G4NeutronTrackingCut(G4int ver)
     48  :  G4VPhysicsConstructor("neutronTrackingCut")
     49   , verbose(ver), wasActivated(false)
     50{
     51  timeLimit          = 10.*microsecond;
     52  kineticEnergyLimit = 0.0;
     53}
    4654
    4755G4NeutronTrackingCut::G4NeutronTrackingCut(const G4String& name, G4int ver)

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

    r1203 r1315  
    4242
    4343//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    44 
    45 G4OpticalPhysics::G4OpticalPhysics(G4int verbose, const G4String& name)
    46   : G4VPhysicsConstructor(name),
     44G4OpticalPhysics::G4OpticalPhysics(G4int verbose)
     45  : G4VPhysicsConstructor("Optical")
     46,
    4747    wasActivated(false),
    4848
    … …  
    6565}
    6666
     67G4OpticalPhysics::G4OpticalPhysics(G4int verbose, const G4String& name)
     68  : G4VPhysicsConstructor(name),
     69    wasActivated(false),
     70
     71    fScintillationProcess(0),
     72    fCerenkovProcess(0),
     73    fOpWLSProcess(0),
     74    fOpAbsorptionProcess(0),
     75    fOpRayleighScatteringProcess(0),
     76    fOpBoundaryProcess(0),
     77    fMaxNumPhotons(100),
     78    fMaxBetaChange(10.0),
     79    fYieldFactor(1.),
     80    fExcitationRatio(0.0),
     81    fSurfaceModel(unified),
     82    fProfile("delta"),
     83    fTrackSecondariesFirst(true)
     84{
     85  verboseLevel = verbose;
     86  fMessenger = new G4OpticalPhysicsMessenger(this);
     87}
     88
    6789//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6890

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QAtomicPhysics.cc,v 1.1 2009/11/20 10:24:28 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QAtomicPhysics.cc,v 1.2 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    9090#include "G4GenericIon.hh"
    9191
     92G4QAtomicPhysics::G4QAtomicPhysics(G4int ver)
     93  : G4VPhysicsConstructor("CHIPS Atomic"), verbose(ver)
     94{
     95  G4LossTableManager::Instance();
     96}
     97
    9298G4QAtomicPhysics::G4QAtomicPhysics(G4int ver, const G4String& name)
    9399  : G4VPhysicsConstructor(name), verbose(ver)

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCaptureAtRestPhysics.cc,v 1.1 2009/11/16 19:12:10 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QCaptureAtRestPhysics.cc,v 1.2 2010/06/03 15:03:53 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3939
    4040#include "G4QCaptureAtRestPhysics.hh"
     41
     42G4QCaptureAtRestPhysics::G4QCaptureAtRestPhysics(G4int ver)
     43  :  G4VPhysicsConstructor("CHIPS nuclear_capture")
     44   , verbose(ver), wasActivated(false)
     45{
     46  if(verbose > 1) G4cout << "###> G4QCaptureAtRestPhysics is initialized" << G4endl;
     47}
    4148
    4249G4QCaptureAtRestPhysics::G4QCaptureAtRestPhysics(const G4String& name, G4int ver)

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QNeutrinoPhysics.cc,v 1.3 2009/11/30 18:44:49 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QNeutrinoPhysics.cc,v 1.4 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    3939
    4040#include "G4QNeutrinoPhysics.hh"
     41
     42G4QNeutrinoPhysics::G4QNeutrinoPhysics(G4int):
     43  G4VPhysicsConstructor("CHIPS neutrino-nuclear"), wasBuilt(false), nuEleActivated(false),
     44  nuMuoActivated(false), nuTauActivated(false), nuEleOn(false),
     45  nuMuoOn(false), nuTauOn(false), nuNucBias(1.), inelastic(0)
     46{
     47  theMessenger = G4QMessenger::GetPointer();
     48  theMessenger->Add(this);
     49}
    4150
    4251G4QNeutrinoPhysics::G4QNeutrinoPhysics(const G4String& name):

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QPhotoNuclearPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QPhotoNuclearPhysics.cc,v 1.3 2010/06/03 14:37:24 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4040#include "G4QPhotoNuclearPhysics.hh"
    4141
     42
     43G4QPhotoNuclearPhysics::G4QPhotoNuclearPhysics(G4int):
     44  G4VPhysicsConstructor("CHIPS photo-nuclear"), wasBuilt(false), SynchRActivated(false),
     45  GamNucActivated(false), EleNucActivated(false), MuoNucActivated(false),
     46  TauNucActivated(false), synchrOn(true), synchrMinGam(227.), gamNucOn(true),
     47  eleNucOn(true), muoNucOn(true), tauNucOn(true), photoNucBias(1.)
     48{
     49  theMessenger = G4QMessenger::GetPointer();
     50  theMessenger->Add(this);
     51}
    4252
    4353G4QPhotoNuclearPhysics::G4QPhotoNuclearPhysics(const G4String& name):

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QStoppingPhysics.cc,v 1.2 2007/04/26 16:03:18 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4QStoppingPhysics.cc,v 1.5 2010/06/03 16:28:39 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//---------------------------------------------------------------------------
    … …  
    4949#include "G4BaryonConstructor.hh"
    5050#include "G4MuonMinus.hh"
     51
     52G4QStoppingPhysics::G4QStoppingPhysics(G4int ver)
     53  :  G4VPhysicsConstructor("stopping"), verbose(ver), wasActivated(false) ,
     54     useMuonMinusCaptureAtRest(true)
     55{
     56  if(verbose > 1) G4cout << "### G4QStoppingPhysics" << G4endl;
     57}
    5158
    5259G4QStoppingPhysics::G4QStoppingPhysics(const G4String& name, G4int ver,

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

    r825 r1315  
    3636//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    3737
     38G4RadioactiveDecayPhysics::G4RadioactiveDecayPhysics(G4int)
     39  :  G4VPhysicsConstructor("G4RadioactiveDecay"), theRadioactiveDecay(0)
     40{}
     41
    3842G4RadioactiveDecayPhysics::G4RadioactiveDecayPhysics(const G4String& name)
    3943  :  G4VPhysicsConstructor(name), theRadioactiveDecay(0)
Note: See TracChangeset for help on using the changeset viewer.