Changeset 1203 for trunk/source/physics_lists/builders/src

Timestamp:

Nov 27, 2009, 11:46:04 AM (15 years ago)

Author:

garnier

Message:

update CVS

Location:

trunk/source/physics_lists/builders/src

Files:

• G4BertiniNeutronBuilder.cc (modified) (3 diffs)
• G4BertiniPiKBuilder.cc (modified) (6 diffs)
• G4BertiniProtonBuilder.cc (modified) (3 diffs)
• G4BinaryNeutronBuilder.cc (modified) (2 diffs)
• G4BinaryPiKBuilder.cc (modified) (5 diffs)
• G4BinaryProtonBuilder.cc (modified) (3 diffs)
• G4ChargeExchangePhysics.cc (modified) (1 diff)
• G4DecayPhysics.cc (modified) (1 diff)
• G4ElectroNuclearBuilder.cc (modified) (1 diff)
• G4EmDNAPhysics.cc (added)
• G4EmExtraPhysics.cc (modified) (1 diff)
• G4EmLivermorePhysics.cc (added)
• G4EmLivermorePolarizedPhysics.cc (added)
• G4EmMessenger.cc (modified) (1 diff)
• G4EmPenelopePhysics.cc (added)
• G4EmStandardPhysics.cc (modified) (5 diffs)
• G4EmStandardPhysics_option1.cc (modified) (7 diffs)
• G4EmStandardPhysics_option2.cc (modified) (9 diffs)
• G4EmStandardPhysics_option3.cc (modified) (10 diffs)
• G4FTFBinaryNeutronBuilder.cc (modified) (2 diffs)
• G4FTFBinaryPiKBuilder.cc (modified) (7 diffs)
• G4FTFBinaryProtonBuilder.cc (modified) (2 diffs)
• G4FTFBuilder.cc (added)
• G4FTFCNeutronBuilder.cc (modified) (3 diffs)
• G4FTFCPiKBuilder.cc (modified) (9 diffs)
• G4FTFCProtonBuilder.cc (modified) (4 diffs)
• G4FTFPNeutronBuilder.cc (modified) (3 diffs)
• G4FTFPPiKBuilder.cc (modified) (3 diffs)
• G4FTFPProtonBuilder.cc (modified) (4 diffs)
• G4HadronDElasticPhysics.cc (modified) (1 diff)
• G4HadronElasticPhysics.cc (modified) (1 diff)
• G4HadronHElasticPhysics.cc (modified) (7 diffs)
• G4HadronProcessStore.cc (deleted)
• G4HadronQElasticPhysics.cc (modified) (1 diff)
• G4InclAblaNeutronBuilder.cc (added)
• G4InclAblaPiKBuilder.cc (added)
• G4InclAblaProtonBuilder.cc (added)
• G4IonBinaryCascadePhysics.cc (modified) (1 diff)
• G4IonInclAblaPhysics.cc (added)
• G4IonPhysics.cc (modified) (1 diff)
• G4LEPNeutronBuilder.cc (modified) (1 diff)
• G4LEPPiKBuilder.cc (modified) (1 diff)
• G4LEPProtonBuilder.cc (modified) (1 diff)
• G4LHEPStoppingPhysics.cc (modified) (1 diff)
• G4MiscLHEPBuilder.cc (modified) (1 diff)
• G4MiscQGSCBuilder.cc (added)
• G4NeutronBuilder.cc (modified) (1 diff)
• G4NeutronTrackingCut.cc (modified) (1 diff)
• G4OpticalPhysics.cc (added)
• G4OpticalPhysicsMessenger.cc (added)
• G4PiKBuilder.cc (modified) (1 diff)
• G4PrecoNeutronBuilder.cc (modified) (2 diffs)
• G4PrecoProtonBuilder.cc (modified) (2 diffs)
• G4ProtonBuilder.cc (modified) (1 diff)
• G4QAtomicPhysics.cc (added)
• G4QCaptureAtRestPhysics.cc (added)
• G4QEmExtraPhysics.cc (modified) (4 diffs)
• G4QGSBinaryNeutronBuilder.cc (modified) (2 diffs)
• G4QGSBinaryPiKBuilder.cc (modified) (4 diffs)
• G4QGSBinaryProtonBuilder.cc (modified) (3 diffs)
• G4QGSBuilder.cc (added)
• G4QGSCEflowNeutronBuilder.cc (modified) (2 diffs)
• G4QGSCEflowPiKBuilder.cc (modified) (4 diffs)
• G4QGSCEflowProtonBuilder.cc (modified) (2 diffs)
• G4QGSCNeutronBuilder.cc (modified) (3 diffs)
• G4QGSCPiKBuilder.cc (modified) (4 diffs)
• G4QGSCProtonBuilder.cc (modified) (2 diffs)
• G4QGSC_CHIPSNeutronBuilder.cc (added)
• G4QGSC_CHIPSPiKBuilder.cc (added)
• G4QGSC_CHIPSProtonBuilder.cc (added)
• G4QGSC_QGSCNeutronBuilder.cc (added)
• G4QGSC_QGSCPiKBuilder.cc (added)
• G4QGSC_QGSCProtonBuilder.cc (added)
• G4QGSPNeutronBuilder.cc (modified) (2 diffs)
• G4QGSPPiKBuilder.cc (modified) (3 diffs)
• G4QGSPProtonBuilder.cc (modified) (3 diffs)
• G4QInelasticCHIPSBuilder.cc (added)
• G4QMessenger.cc (added)
• G4QNeutrinoPhysics.cc (added)
• G4QNeutronBuilder.cc (added)
• G4QPhotoNuclearPhysics.cc (added)
• G4QProtonBuilder.cc (added)
• G4QStoppingPhysics.cc (modified) (1 diff)
• G4StoppingHadronBuilder.cc (modified) (1 diff)
• G4VHadronModelBuilder.cc (added)
• G4VNeutronBuilder.cc (added)
• G4VPiKBuilder.cc (added)
• G4VProtonBuilder.cc (added)
• G4WarnPLStatus.cc (added)

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4BertiniNeutronBuilder.cc,v 1.4 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BertiniNeutronBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
 #include "G4BertiniNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -43 +57 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
 }
 
@@ -49 +62 @@
 ~G4BertiniNeutronBuilder() 
 {
-  delete theModel;
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4BertiniPiKBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4BertiniPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BertiniPiKBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
+#include "G4BertiniPiKBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
 
- G4BertiniPiKBuilder::
- G4BertiniPiKBuilder() 
+G4BertiniPiKBuilder::
+G4BertiniPiKBuilder() 
  {
+   thePiData = new G4PiNuclearCrossSection;
    theMin = 0*GeV;
    theMax = 9.9*GeV;
@@ -39 +54 @@
  }
 
- G4BertiniPiKBuilder::
- ~G4BertiniPiKBuilder() 
+G4BertiniPiKBuilder::~G4BertiniPiKBuilder() 
 {
-  delete theModel;
 }
 
- void G4BertiniPiKBuilder::
- Build(G4PionPlusInelasticProcess * aP)
+void G4BertiniPiKBuilder::
+Build(G4PionPlusInelasticProcess * aP)
  {
    aP->RegisterMe(theModel);
@@ -53 +66 @@
  }
 
- void G4BertiniPiKBuilder::
- Build(G4PionMinusInelasticProcess * aP)
- {
-   aP->RegisterMe(theModel);
-   aP->AddDataSet(&thePiData);
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
- }
-
- void G4BertiniPiKBuilder::
- Build(G4HadronElasticProcess * ) {}
-
- void G4BertiniPiKBuilder::
- Build(G4KaonPlusInelasticProcess * aP)
+void G4BertiniPiKBuilder::
+Build(G4PionMinusInelasticProcess * aP)
  {
    aP->RegisterMe(theModel);
@@ -73 +74 @@
  }
 
- void G4BertiniPiKBuilder::
- Build(G4KaonMinusInelasticProcess * aP)
+void G4BertiniPiKBuilder::
+Build(G4HadronElasticProcess * ) {}
+
+void G4BertiniPiKBuilder::
+Build(G4KaonPlusInelasticProcess * aP)
  {
    aP->RegisterMe(theModel);
@@ -81 +85 @@
  }
 
- void G4BertiniPiKBuilder::
- Build(G4KaonZeroLInelasticProcess * aP)
+void G4BertiniPiKBuilder::
+Build(G4KaonMinusInelasticProcess * aP)
  {
    aP->RegisterMe(theModel);
@@ -89 +93 @@
  }
 
- void G4BertiniPiKBuilder::
- Build(G4KaonZeroSInelasticProcess * aP)
+void G4BertiniPiKBuilder::
+Build(G4KaonZeroLInelasticProcess * aP)
+ {
+   aP->RegisterMe(theModel);
+   theModel->SetMinEnergy(theMin);
+   theModel->SetMaxEnergy(theMax);
+ }
+
+void G4BertiniPiKBuilder::
+Build(G4KaonZeroSInelasticProcess * aP)
  {
    aP->RegisterMe(theModel);

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4BertiniProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BertiniProtonBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
 #include "G4BertiniProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -40 +54 @@
 ~G4BertiniProtonBuilder() 
 {
-  delete theModel;
 }
 
@@ -54 +67 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4BinaryNeutronBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4BinaryNeutronBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BinaryNeutronBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
+#include "G4BinaryNeutronBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
 
- G4BinaryNeutronBuilder::
- G4BinaryNeutronBuilder() 
+G4BinaryNeutronBuilder::
+G4BinaryNeutronBuilder() 
  {
    theMin = 0;
@@ -43 +57 @@
    theModel->SetMaxEnergy(theMax);
    aP->RegisterMe(theModel);
-   aP->AddDataSet(&theXSec);  
  }
 
- G4BinaryNeutronBuilder::
- ~G4BinaryNeutronBuilder() 
+G4BinaryNeutronBuilder::~G4BinaryNeutronBuilder() 
 {
-  delete theModel;
 }
 
- void G4BinaryNeutronBuilder::
- Build(G4HadronElasticProcess * )
+void G4BinaryNeutronBuilder::
+Build(G4HadronElasticProcess * )
  {
  }
 
- void G4BinaryNeutronBuilder::
- Build(G4HadronFissionProcess * )
+void G4BinaryNeutronBuilder::
+Build(G4HadronFissionProcess * )
  {
  }
 
- void G4BinaryNeutronBuilder::
- Build(G4HadronCaptureProcess * )
+void G4BinaryNeutronBuilder::
+Build(G4HadronCaptureProcess * )
  {
  }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4BinaryPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BinaryPiKBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
 #include "G4BinaryPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -32 +46 @@
 G4BinaryPiKBuilder() 
 {
+  thePiData = new G4PiNuclearCrossSection;
   theMin = 0*GeV;
   theMax = 1.3*GeV;
@@ -42 +57 @@
 ~G4BinaryPiKBuilder() 
 {
-  delete theModel;
 }
 
@@ -54 +68 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&thePiData);
 }
 
@@ -63 +76 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&thePiData);
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4BinaryProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4BinaryProtonBuilder
+//
+// Author: 2002 H.P. Wellisch
+//
+// Modified:
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+//
+//----------------------------------------------------------------------------
+//
 #include "G4BinaryProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -40 +54 @@
 Build(G4ProtonInelasticProcess * aP)
 {
-  aP->AddDataSet(&theXSec);  
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
@@ -47 +60 @@
 
 G4BinaryProtonBuilder::
-~G4BinaryProtonBuilder() {}
+~G4BinaryProtonBuilder() 
+{
+}
 
 void G4BinaryProtonBuilder::

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

@@ -25 +25 @@
 //
 // $Id: G4ChargeExchangePhysics.cc,v 1.1 2008/11/20 12:38:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4DecayPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4ElectroNuclearBuilder.cc

@@ -25 +25 @@
 //
 // $Id: G4ElectroNuclearBuilder.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmExtraPhysics.cc,v 1.3 2008/01/08 10:36:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4EmMessenger.cc

@@ -25 +25 @@
 //
 // $Id: G4EmMessenger.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics.cc,v 1.16 2008/11/21 16:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmStandardPhysics.cc,v 1.20 2009/10/30 18:36:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -54 +54 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
-#include "G4eMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -155 +155 @@
     } else if (particleName == "e-") {
 
-      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4eBremsstrahlung(),  -1,-3, 3);
+      pmanager->AddProcess(new G4eMultipleScattering(), -1, 1, 1);
+      pmanager->AddProcess(new G4eIonisation,           -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung(),     -1,-3, 3);
 
     } else if (particleName == "e+") {
 
-      pmanager->AddProcess(new G4eMultipleScattering,-1, 1, 1);
-      pmanager->AddProcess(new G4eIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4eBremsstrahlung,    -1,-3, 3);
-      pmanager->AddProcess(new G4eplusAnnihilation,   0,-1, 4);
+      pmanager->AddProcess(new G4eMultipleScattering(), -1, 1, 1);
+      pmanager->AddProcess(new G4eIonisation,           -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung,       -1,-3, 3);
+      pmanager->AddProcess(new G4eplusAnnihilation,      0,-1, 4);
 
     } else if (particleName == "mu+" ||
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4hMultipleScattering,-1, 1, 1);
-      pmanager->AddProcess(new G4MuIonisation,       -1, 2, 2);
-      pmanager->AddProcess(new G4MuBremsstrahlung,   -1,-3, 3);
-      pmanager->AddProcess(new G4MuPairProduction,   -1,-4, 4);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
+      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
 
     } else if (particleName == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+               particleName == "He3") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+
+    } else if (particleName == "GenericIon") {
 
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
@@ -183 +187 @@
     } else if (particleName == "pi+" ||
                particleName == "pi-" ||
+               particleName == "kaon+" ||
+               particleName == "kaon-" ||
                particleName == "proton" ) {
 
@@ -206 +212 @@
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
-               particleName == "kaon+" ||
-               particleName == "kaon-" ||
                particleName == "lambda_c+" ||
                particleName == "omega-" ||

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option1.cc,v 1.11 2008/11/21 16:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmStandardPhysics_option1.cc,v 1.15 2009/10/30 18:36:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -57 +57 @@
 
 #include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
-#include "G4MultipleScattering.hh"
 #include "G4MscStepLimitType.hh"
 
@@ -181 +181 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
       pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
       pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
@@ -187 +187 @@
 
     } else if (particleName == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+               particleName == "He3") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      pmanager->AddProcess(new G4ionIonisation,       -1, 2, 2);
+
+    } else if (particleName == "GenericIon") {
 
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
@@ -195 +199 @@
     } else if (particleName == "pi+" ||
                particleName == "pi-" ||
+               particleName == "kaon+" ||
+               particleName == "kaon-" ||
                particleName == "proton" ) {
 
@@ -218 +224 @@
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
-               particleName == "kaon+" ||
-               particleName == "kaon-" ||
                particleName == "lambda_c+" ||
                particleName == "omega-" ||
@@ -238 +242 @@
   G4EmProcessOptions opt;
   opt.SetVerbose(verbose);
-  //opt.SetApplyCuts(true);
+  opt.SetApplyCuts(true);
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option2.cc,v 1.15 2008/11/21 17:59:23 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmStandardPhysics_option2.cc,v 1.20 2009/11/24 12:53:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -62 +62 @@
 #include "G4MuMultipleScattering.hh"
 #include "G4CoulombScattering.hh"
+#include "G4UrbanMscModel93.hh"
+#include "G4WentzelVIModel.hh"
+//#include "G4GoudsmitSaundersonMscModel.hh"
 
 #include "G4eIonisation.hh"
@@ -75 +78 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+//#include "G4IonParametrisedLossModel.hh"
 
 #include "G4Gamma.hh"
@@ -161 +165 @@
     } else if (particleName == "e-") {
 
-      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->AddEmModel(0, new G4UrbanMscModel93());
+      //      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
+      pmanager->AddProcess(msc,                       -1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
@@ -167 +174 @@
     } else if (particleName == "e+") {
 
-      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
+      G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->AddEmModel(0, new G4UrbanMscModel93());
+      // msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
+      pmanager->AddProcess(msc,                       -1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
@@ -175 +185 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
-      pmanager->AddProcess(new G4MuIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
-      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
+      G4MuMultipleScattering* msc = new G4MuMultipleScattering();
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      pmanager->AddProcess(msc,                     -1, 1, 1);
+      pmanager->AddProcess(new G4MuIonisation,      -1, 2, 2);
+      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-3, 3);
+      pmanager->AddProcess(new G4MuPairProduction,  -1,-4, 4);
       pmanager->AddDiscreteProcess(new G4CoulombScattering());
 
+    } else if (particleName == "GenericIon") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      //ionIoni->SetEmModel(new G4IonParametrisedLossModel());
+      //ionIoni->SetStepFunction(0.1, 20*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+
     } else if (particleName == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+               particleName == "He3") {
 
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
@@ -190 +210 @@
     } else if (particleName == "pi+" ||
                particleName == "pi-" ||
+               particleName == "kaon+" ||
+               particleName == "kaon-" ||
                particleName == "proton" ) {
 
-      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1, 1);
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
       pmanager->AddProcess(new G4hIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4hBremsstrahlung,     -1,-3, 3);
@@ -213 +235 @@
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
-               particleName == "kaon+" ||
-               particleName == "kaon-" ||
                particleName == "lambda_c+" ||
                particleName == "omega-" ||
@@ -240 +260 @@
   // Physics tables
   //
-  //opt.SetMinEnergy(100*eV);
-  //opt.SetMaxEnergy(100*TeV);
-  //opt.SetDEDXBinning(84);
-  //opt.SetLambdaBinning(84);
+  //opt.SetMinEnergy(0.1*keV);
+  // opt.SetMaxEnergy(10*TeV);
+  //opt.SetDEDXBinning(77);
+  //opt.SetLambdaBinning(77);
   //opt.SetSplineFlag(true);
   opt.SetPolarAngleLimit(0.2);
-  
-  // Energy loss
-  //
-  //opt.SetLinearLossLimit(0.01);
-  
+    
   // Ionization
   //

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option3.cc,v 1.14 2008/11/21 16:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmStandardPhysics_option3.cc,v 1.18 2009/11/24 12:53:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -50 +50 @@
 #include "G4GammaConversion.hh"
 #include "G4PhotoElectricEffect.hh"
-#include "G4LowEnergyRayleigh.hh"
+#include "G4RayleighScattering.hh"
 
 #include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
 #include "G4hMultipleScattering.hh"
 #include "G4MscStepLimitType.hh"
+#include "G4UrbanMscModel93.hh"
+#include "G4WentzelVIModel.hh"
+#include "G4CoulombScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -68 +72 @@
 #include "G4hIonisation.hh"
 #include "G4ionIonisation.hh"
+#include "G4IonParametrisedLossModel.hh"
+#include "G4NuclearStopping.hh"
 
 #include "G4Gamma.hh"
@@ -148 +154 @@
     if (particleName == "gamma") {
 
-      pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh);
       pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
       pmanager->AddDiscreteProcess(new G4ComptonScattering);
       pmanager->AddDiscreteProcess(new G4GammaConversion);
+      pmanager->AddDiscreteProcess(new G4RayleighScattering);
 
     } else if (particleName == "e-") {
 
       G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->AddEmModel(0, new G4UrbanMscModel93());
       msc->SetStepLimitType(fUseDistanceToBoundary);
       pmanager->AddProcess(msc,                   -1, 1, 1);
@@ -166 +173 @@
 
       G4eMultipleScattering* msc = new G4eMultipleScattering();
+      msc->AddEmModel(0, new G4UrbanMscModel93());
       msc->SetStepLimitType(fUseDistanceToBoundary);
       pmanager->AddProcess(msc,                   -1, 1, 1);
@@ -177 +185 @@
                particleName == "mu-"    ) {
 
-      pmanager->AddProcess(new G4eMultipleScattering, -1, 1, 1);
+      G4MuMultipleScattering* msc = new G4MuMultipleScattering();
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      pmanager->AddProcess(msc,                       -1, 1, 1);
       G4MuIonisation* muIoni = new G4MuIonisation();
       muIoni->SetStepFunction(0.2, 50*um);          
@@ -183 +193 @@
       pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
       pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
+      pmanager->AddDiscreteProcess(new G4CoulombScattering());
 
     } else if (particleName == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+               particleName == "He3") {
 
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
@@ -192 +202 @@
       ionIoni->SetStepFunction(0.1, 20*um);
       pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);
+
+    } else if (particleName == "GenericIon") {
+
+      pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
+      G4ionIonisation* ionIoni = new G4ionIonisation();
+      ionIoni->SetEmModel(new G4IonParametrisedLossModel());
+      ionIoni->SetStepFunction(0.1, 10*um);
+      pmanager->AddProcess(ionIoni,                   -1, 2, 2);
+      pmanager->AddProcess(new G4NuclearStopping(),   -1, 3,-1);
 
     } else if (particleName == "pi+" ||
                particleName == "pi-" ||
+               particleName == "kaon+" ||
+               particleName == "kaon-" ||
                particleName == "proton" ) {
 
@@ -220 +242 @@
                particleName == "anti_xi-" ||
                particleName == "deuteron" ||
-               particleName == "kaon+" ||
-               particleName == "kaon-" ||
                particleName == "lambda_c+" ||
                particleName == "omega-" ||
@@ -256 +276 @@
   opt.SetLambdaBinning(220);
   //opt.SetSplineFlag(true);
+  opt.SetPolarAngleLimit(0.2);
     
   // Ionization

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFBinaryNeutronBuilder.cc,v 1.4 2009/03/31 18:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFBinaryNeutronBuilder
+//
+// Author: 2008 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFBinaryNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4FTFBinaryNeutronBuilder::
@@ -80 +95 @@
 Build(G4NeutronInelasticProcess * aP)
 {
+  theModel->SetMinEnergy(theMin);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4FTFBinaryPiKBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4FTFBinaryPiKBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFBinaryPiKBuilder
+//
+// Author: 2008 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
+#include "G4FTFBinaryPiKBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
 
- G4FTFBinaryPiKBuilder::
- G4FTFBinaryPiKBuilder(G4bool quasiElastic) 
+G4FTFBinaryPiKBuilder::
+G4FTFBinaryPiKBuilder(G4bool quasiElastic) 
  {
+   thePiData = new G4PiNuclearCrossSection;
    theMin = 4*GeV;
    theModel = new G4TheoFSGenerator("FTFB");
@@ -56 +71 @@
  }
 
- G4FTFBinaryPiKBuilder::
- ~G4FTFBinaryPiKBuilder() 
+G4FTFBinaryPiKBuilder:: ~G4FTFBinaryPiKBuilder() 
  {
    delete theCascade;
@@ -66 +80 @@
  }
 
- void G4FTFBinaryPiKBuilder::
- Build(G4HadronElasticProcess * ) {}
+void G4FTFBinaryPiKBuilder::
+Build(G4HadronElasticProcess * ) {}
 
- void G4FTFBinaryPiKBuilder::
- Build(G4PionPlusInelasticProcess * aP)
+void G4FTFBinaryPiKBuilder::
+Build(G4PionPlusInelasticProcess * aP)
  {
-   aP->AddDataSet(&thePiData);
+   theModel->SetMinEnergy(theMin);
+   aP->AddDataSet(thePiData);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFBinaryPiKBuilder::
- Build(G4PionMinusInelasticProcess * aP)
+void G4FTFBinaryPiKBuilder::
+Build(G4PionMinusInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
-   aP->AddDataSet(&thePiData);
+   aP->AddDataSet(thePiData);
    aP->RegisterMe(theModel);
  }
@@ -89 +103 @@
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
    aP->RegisterMe(theModel);
  }
@@ -97 +110 @@
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
    aP->RegisterMe(theModel);
  }
@@ -105 +117 @@
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
    aP->RegisterMe(theModel);
  }
@@ -113 +124 @@
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
    aP->RegisterMe(theModel);
  }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFBinaryProtonBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFBinaryProtonBuilder
+//
+// Author: 2008 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFBinaryProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 G4FTFBinaryProtonBuilder::
@@ -61 +76 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFCNeutronBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFCNeutronBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFCNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4FTFCNeutronBuilder::
@@ -50 +65 @@
 
   theModel->SetTransport(theCascade);
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100*TeV);
 }
 
-G4FTFCNeutronBuilder::
-~G4FTFCNeutronBuilder() 
+G4FTFCNeutronBuilder::~G4FTFCNeutronBuilder() 
 {
   delete theCascade;
@@ -80 +96 @@
 Build(G4NeutronInelasticProcess * aP)
 {
-  aP->AddDataSet(&theXSec);  
-
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFCPiKBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFCPiKBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFCPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -32 +46 @@
 G4FTFCPiKBuilder(G4bool quasiElastic) 
 {
+  thePiData = new G4PiNuclearCrossSection;
   theMin = 4*GeV;
   theModel = new G4TheoFSGenerator;
@@ -49 +64 @@
   } else 
   {  theQuasiElastic=0;}  
+
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100*TeV);
 }
 
@@ -66 +84 @@
 Build(G4PionPlusInelasticProcess * aP)
 {
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }
@@ -75 +92 @@
 Build(G4PionMinusInelasticProcess * aP)
 {
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }
@@ -85 +101 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }
@@ -93 +108 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }
@@ -101 +115 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }
@@ -109 +122 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFCProtonBuilder.cc,v 1.4 2009/03/31 18:38:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFCProtonBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFCProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-#include "TheoModelFactory.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 G4FTFCProtonBuilder::
@@ -34 +48 @@
 {
   theMin = 4*GeV;
-  theModel = TheoModelFactory<G4StringChipsParticleLevelInterface,
-                              G4FTFModel, G4LundStringFragmentation>::New();
+  theModel = new G4TheoFSGenerator;
+
+  theStringModel = new G4FTFModel;
+  theStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation);
+  theStringModel->SetFragmentationModel(theStringDecay);
+
+  theCascade = new G4StringChipsParticleLevelInterface;
+
+  theModel->SetHighEnergyGenerator(theStringModel);
                               
-    if (quasiElastic)
+  if (quasiElastic)
   {
      theQuasiElastic=new G4QuasiElasticChannel;
@@ -44 +65 @@
   {  theQuasiElastic=0;}  
 
+  theModel->SetTransport(theCascade);
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100*TeV);
+}
+
+G4FTFCProtonBuilder::~G4FTFCProtonBuilder() 
+{
+  delete theCascade;
+  delete theStringDecay;
+  if ( theQuasiElastic ) delete theQuasiElastic;
+  delete theStringModel;
+  delete theModel;
 }
 
@@ -50 +83 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
+}
+
+void G4FTFCProtonBuilder::
+Build(G4HadronElasticProcess * )
+{
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFPNeutronBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFPNeutronBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFPNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4FTFPNeutronBuilder::
 G4FTFPNeutronBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin =   4*GeV;
+  theMax = 100*TeV;
   theModel = new G4TheoFSGenerator("FTFP");
 
@@ -52 +68 @@
   } else 
   {  theQuasiElastic=0;}  
+
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100*TeV);
 }
 
@@ -83 +102 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
+  theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4FTFPPiKBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4FTFPPiKBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFPPiKBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
+#include "G4FTFPPiKBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
 
- G4FTFPPiKBuilder::
- G4FTFPPiKBuilder(G4bool quasiElastic) 
+G4FTFPPiKBuilder::
+G4FTFPPiKBuilder(G4bool quasiElastic) 
  {
+   thePiData = new G4PiNuclearCrossSection;
    theMin = 4*GeV;
+   theMax = 100*TeV;
    theModel = new G4TheoFSGenerator("FTFP");
 
@@ -52 +68 @@
 
    theModel->SetTransport(theCascade);
+   theModel->SetMinEnergy(theMin);
+   theModel->SetMaxEnergy(100*TeV);
  }
 
- G4FTFPPiKBuilder::
- ~G4FTFPPiKBuilder() 
+G4FTFPPiKBuilder:: ~G4FTFPPiKBuilder() 
  {
    delete theCascade;
@@ -64 +81 @@
  }
 
- void G4FTFPPiKBuilder::
- Build(G4HadronElasticProcess * ) {}
+void G4FTFPPiKBuilder::
+Build(G4HadronElasticProcess * ) {}
 
- void G4FTFPPiKBuilder::
- Build(G4PionPlusInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4PionPlusInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
-   aP->AddDataSet(&thePiData);
+   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(thePiData);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFPPiKBuilder::
- Build(G4PionMinusInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4PionMinusInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
-   aP->AddDataSet(&thePiData);
+   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(thePiData);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFPPiKBuilder::
- Build(G4KaonPlusInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4KaonPlusInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
+   theModel->SetMaxEnergy(theMax);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFPPiKBuilder::
- Build(G4KaonMinusInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4KaonMinusInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
+   theModel->SetMaxEnergy(theMax);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFPPiKBuilder::
- Build(G4KaonZeroLInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4KaonZeroLInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
+   theModel->SetMaxEnergy(theMax);
    aP->RegisterMe(theModel);
  }
 
- void G4FTFPPiKBuilder::
- Build(G4KaonZeroSInelasticProcess * aP)
+void G4FTFPPiKBuilder::
+Build(G4KaonZeroSInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
+   theModel->SetMaxEnergy(theMax);
    aP->RegisterMe(theModel);
  }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4FTFPProtonBuilder.cc,v 1.6 2009/04/23 18:54:57 japost Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4FTFPProtonBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4FTFPProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 G4FTFPProtonBuilder::
@@ -33 +48 @@
 {
   theMin = 4*GeV;
+  theMax = 100.*TeV; 
   theModel = new G4TheoFSGenerator("FTFP");
 
@@ -52 +68 @@
 
   theModel->SetTransport(theCascade);
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100*TeV);
 }
 
@@ -58 +76 @@
 {
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
+  theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }
 

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

@@ -25 +25 @@
 //
 // $Id: G4HadronDElasticPhysics.cc,v 1.3 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4HadronElasticPhysics.cc,v 1.9 2008/12/01 16:57:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronHElasticPhysics.cc,v 1.5 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4HadronHElasticPhysics.cc,v 1.6 2009/10/04 16:03:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -42 +42 @@
 #include "G4HadronHElasticPhysics.hh"
 
-#include "G4HadronicProcess.hh"
-#include "G4HadronElasticProcess.hh"
-#include "G4HadronicInteraction.hh"
-#include "G4LElastic.hh"
-
 #include "G4ParticleDefinition.hh"
 #include "G4ProcessManager.hh"
@@ -55 +50 @@
 #include "G4Neutron.hh"
 
-#include "G4VQCrossSection.hh"
+#include "G4WHadronElasticProcess.hh"
+#include "G4VHadronElastic.hh"
+#include "G4CHIPSElastic.hh"
+#include "G4ElasticHadrNucleusHE.hh"
+#include "G4NeutronHPElastic.hh"
 #include "G4UElasticCrossSection.hh"
 #include "G4BGGNucleonElasticXS.hh"
@@ -61 +60 @@
 
 G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool hp)
-  : G4VPhysicsConstructor("HElastic"), mname("HElastic"), verbose(ver), 
+  : G4VPhysicsConstructor("HElastic"), verbose(ver), 
     hpFlag(hp), wasActivated(false)
 {
   if(verbose > 1) G4cout << "### HadronHElasticPhysics" << G4endl;
-  model = 0;
-  neutronModel = 0;
-  neutronHPModel = 0;  
 }
 
 G4HadronHElasticPhysics::~G4HadronHElasticPhysics()
-{
-  delete model;
-  delete neutronModel;
-  delete neutronHPModel;
-}
+{}
 
 void G4HadronHElasticPhysics::ConstructParticle()
 {
-// G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
+  // G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl;
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
@@ -96 +88 @@
   wasActivated = true;
 
-  G4double elimit = 0.4*GeV;
-  //G4double elimit = 0.0;
-
-  if(verbose > 1) 
+  G4double elimit = 1.0*GeV;
+  if(verbose > 1) {
     G4cout << "### HadronElasticPhysics Construct Processes with HE limit " 
            << elimit << " MeV" << G4endl;
+  }
 
-  G4HadronicProcess* hel = 0;
-  G4VQCrossSection* man = 0; 
+  G4VHadronElastic* plep0 = new G4VHadronElastic();
+  G4VHadronElastic* plep1 = new G4VHadronElastic();
+  plep1->SetMaxEnergy(elimit);
 
-  G4HadronElastic* he = new G4HadronElastic();
-  he->SetHEModelLowLimit(elimit);
-  he->SetQModelLowLimit(0.0);
-  he->SetLowestEnergyLimit(0.0);
-  model = he;
-  man = he->GetCS();
+  G4CHIPSElastic* chipsp = new G4CHIPSElastic();
+  G4CHIPSElastic* chipsn = new G4CHIPSElastic();
+
+  G4ElasticHadrNucleusHE* he = new G4ElasticHadrNucleusHE(); 
+  he->SetMinEnergy(elimit);
 
   theParticleIterator->reset();
@@ -143 +134 @@
       
       G4ProcessManager* pmanager = particle->GetProcessManager();
-      G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-      h->SetQElasticCrossSection(man);
-      hel = h;
+      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
       if(pname == "proton") { 
         hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+        hel->RegisterMe(chipsp);
       } else if (pname == "pi+" || pname == "pi-") { 
         hel->AddDataSet(new G4BGGPionElasticXS(particle));
+        hel->RegisterMe(plep1);
+        hel->RegisterMe(he);
       } else {
-        hel->AddDataSet(new G4UElasticCrossSection(particle));
+        //hel->AddDataSet(new G4UElasticCrossSection(particle));
+        hel->RegisterMe(plep0);
       }
-      hel->RegisterMe(model);
       pmanager->AddDiscreteProcess(hel);
+      if(verbose > 1) {
+        G4cout << "### HadronHElasticPhysics: " << hel->GetProcessName()
+               << " added for " << particle->GetParticleName() << G4endl;
+      }
 
       // neutron case
@@ -160 +156 @@
 
       G4ProcessManager* pmanager = particle->GetProcessManager();
-      G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic");
-      G4HadronElastic* nhe = new G4HadronElastic();
-      nhe->SetHEModelLowLimit(elimit);
-      neutronModel = nhe;
-      h->SetQElasticCrossSection(nhe->GetCS());
-      hel = h;
+      G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
       hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      hel->RegisterMe(chipsn);
 
       if(hpFlag) {
-        neutronModel->SetMinEnergy(19.5*MeV);
-        neutronHPModel = new G4NeutronHPElastic();
-        hel->RegisterMe(neutronHPModel);
+        chipsn->SetMinEnergy(19.5*MeV);
+        G4NeutronHPElastic* hp = new G4NeutronHPElastic();
+        hel->RegisterMe(hp);
         hel->AddDataSet(new G4NeutronHPElasticData());
       }
-
-      hel->RegisterMe(neutronModel);
       pmanager->AddDiscreteProcess(hel);
 
-      if(verbose > 1)
-        G4cout << "### HadronHElasticPhysics added for " 
-               << particle->GetParticleName() << G4endl;
+      if(verbose > 1) {
+        G4cout << "### HadronHElasticPhysics: " << hel->GetProcessName()
+               << " added for " << particle->GetParticleName() << G4endl;
+      }
     }
   }

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

@@ -25 +25 @@
 //
 // $Id: G4HadronQElasticPhysics.cc,v 1.7 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4IonBinaryCascadePhysics.cc,v 1.2 2009/02/16 10:15:35 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4LHEPStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4NeutronTrackingCut.cc,v 1.5 2008/09/17 18:19:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4PiKBuilder.cc

@@ -25 +25 @@
 //
 // $Id: G4PiKBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4PrecoNeutronBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4PrecoNeutronBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4PrecoNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4PrecoNeutronBuilder::
@@ -64 +79 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4PrecoProtonBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4PrecoProtonBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4PrecoProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 #include "G4ExcitationHandler.hh"  
@@ -53 +68 @@
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }
 

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

@@ -25 +25 @@
 //
 // $Id: G4ProtonBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4QEmExtraPhysics.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4QEmExtraPhysics.cc,v 1.1 2007/05/23 17:38:35 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4QEmExtraPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------
@@ -33 +33 @@
 // Author: 23 May 2007 V. Ivanchenko
 //
-// Modified:
+// Modified: 19 Nov 2009 M.Kosov: G4QInelastic instead of G4QCollision
 //
 //----------------------------------------------------------------------------
@@ -39 +39 @@
 
 #include "G4QEmExtraPhysics.hh"
-#include "G4QCollision.hh"
+#include "G4QInelastic.hh"
 
 #include "G4ParticleDefinition.hh"
@@ -76 +76 @@
   wasActivated = true;
 
-  hProcess = new G4QCollision();
+  hProcess = new G4QInelastic();
 
   G4ParticleDefinition* particle = G4Gamma::Gamma();

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSBinaryNeutronBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSBinaryNeutronBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSBinaryNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4QGSBinaryNeutronBuilder::
@@ -85 +100 @@
   theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSBinaryPiKBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSBinaryPiKBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSBinaryPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -32 +46 @@
 G4QGSBinaryPiKBuilder(G4bool quasiElastic) 
 {
+  thePiData = new G4PiNuclearCrossSection;
+
   theMin = 12*GeV;
   theModel = new G4TheoFSGenerator("QGSB");
@@ -73 +89 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   aP->RegisterMe(theModel);
 }
@@ -82 +98 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4QGSBinaryProtonBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4QGSBinaryProtonBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSBinaryProtonBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
+#include "G4QGSBinaryProtonBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
- G4QGSBinaryProtonBuilder::
- G4QGSBinaryProtonBuilder(G4bool quasiElastic) 
+G4QGSBinaryProtonBuilder::
+G4QGSBinaryProtonBuilder(G4bool quasiElastic) 
  {
    theMin = 12*GeV;
@@ -53 +68 @@
  }
 
- void G4QGSBinaryProtonBuilder::
- Build(G4ProtonInelasticProcess * aP)
+void G4QGSBinaryProtonBuilder::
+Build(G4ProtonInelasticProcess * aP)
  {
 // G4cout << "adding inelastic Proton in QGSBinary" << G4endl;
-   aP->AddDataSet(&theXSec);  
+   aP->AddDataSet(new G4ProtonInelasticCrossSection);  
    theModel->SetMinEnergy(theMin);
    theModel->SetMaxEnergy(100*TeV);
@@ -63 +78 @@
  }
 
- void G4QGSBinaryProtonBuilder::
- Build(G4HadronElasticProcess * )
+void G4QGSBinaryProtonBuilder::
+Build(G4HadronElasticProcess * )
  {
  }
 
- G4QGSBinaryProtonBuilder::
- ~G4QGSBinaryProtonBuilder() 
+G4QGSBinaryProtonBuilder::~G4QGSBinaryProtonBuilder() 
  {
    delete thePreEquilib;

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSCEflowNeutronBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCEflowNeutronBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSCEflowNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4QGSCEflowNeutronBuilder::
@@ -67 +82 @@
   theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSCEflowPiKBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCEflowPiKBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSCEflowPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -32 +46 @@
 G4QGSCEflowPiKBuilder(G4bool quasiElastic) 
 {
+  thePiCross = new G4PiNuclearCrossSection; 
   theMin = 8*GeV;
   theModel = new G4TheoFSGenerator("QGSCEflow");
@@ -69 +84 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiCross);
+  aP->AddDataSet(thePiCross);
   aP->RegisterMe(theModel);
 }
@@ -78 +93 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiCross);
+  aP->AddDataSet(thePiCross);
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSCEflowProtonBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCEflowProtonBuilder
+//
+// Author: 2006 G.Folger
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSCEflowProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 G4QGSCEflowProtonBuilder::
@@ -72 +87 @@
   theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4QGSCNeutronBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4QGSCNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCNeutronBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
+#include "G4QGSCNeutronBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
- G4QGSCNeutronBuilder::
- G4QGSCNeutronBuilder(G4bool quasiElastic) 
+G4QGSCNeutronBuilder::
+G4QGSCNeutronBuilder(G4bool quasiElastic) 
  {
    theMin = 8*GeV;
@@ -51 +66 @@
  }
 
- G4QGSCNeutronBuilder::
- ~G4QGSCNeutronBuilder() 
+G4QGSCNeutronBuilder::~G4QGSCNeutronBuilder() 
  {
    delete theStringDecay;
@@ -61 +75 @@
  }
 
- void G4QGSCNeutronBuilder::
- Build(G4NeutronInelasticProcess * aP)
+void G4QGSCNeutronBuilder::
+Build(G4NeutronInelasticProcess * aP)
  {
    theModel->SetMinEnergy(theMin);
    theModel->SetMaxEnergy(100*TeV);
    aP->RegisterMe(theModel);
-   aP->AddDataSet(&theXSec);  
+   aP->AddDataSet(new G4NeutronInelasticCrossSection);  
  }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSCPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCPiKBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSCPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
@@ -32 +46 @@
 G4QGSCPiKBuilder(G4bool quasiElastic) 
 {
+  thePiCross = new G4PiNuclearCrossSection; 
   theMin = 8*GeV;
   theModel = new G4TheoFSGenerator("QGSC");
@@ -69 +84 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiCross);
+  aP->AddDataSet(thePiCross);
   aP->RegisterMe(theModel);
 }
@@ -78 +93 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiCross);
+  aP->AddDataSet(thePiCross);
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSCProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSCProtonBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------//
 #include "G4QGSCProtonBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
 G4QGSCProtonBuilder::
@@ -72 +86 @@
   theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSPNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSPNeutronBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSPNeutronBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4NeutronInelasticCrossSection.hh"
 
 G4QGSPNeutronBuilder::
@@ -92 +107 @@
   theModel->SetMaxEnergy(100*TeV);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(&theXSec);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4QGSPPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSPPiKBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
 #include "G4QGSPPiKBuilder.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4PiNuclearCrossSection.hh"
 
 G4QGSPPiKBuilder::
 G4QGSPPiKBuilder(G4bool quasiElastic, G4bool projectileDiffraction) 
 {
+  thePiData = new G4PiNuclearCrossSection();
   theMin = 12*GeV;
   theModel = new G4TheoFSGenerator("QGSP");
@@ -81 +97 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   aP->RegisterMe(theModel);
 }
@@ -90 +106 @@
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(100*TeV);
-  aP->AddDataSet(&thePiData);
+  aP->AddDataSet(thePiData);
   aP->RegisterMe(theModel);
 }

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

@@ -24 +24 @@
 // ********************************************************************
 //
- #include "G4QGSPProtonBuilder.hh"
- #include "G4ParticleDefinition.hh"
- #include "G4ParticleTable.hh"
- #include "G4ProcessManager.hh"
+// $Id: G4QGSPProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   G4QGSPProtonBuilder
+//
+// Author: 2002 J.P. Wellisch
+//
+// Modified:
+// 30.03.2009 V.Ivanchenko create cross section by new
+//
+//----------------------------------------------------------------------------
+//
+#include "G4QGSPProtonBuilder.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
+#include "G4ProtonInelasticCrossSection.hh"
 
- G4QGSPProtonBuilder::
- G4QGSPProtonBuilder(G4bool quasiElastic, G4bool projectileDiffraction) 
+G4QGSPProtonBuilder::
+G4QGSPProtonBuilder(G4bool quasiElastic, G4bool projectileDiffraction) 
  {
    theMin = 12*GeV;
@@ -59 +74 @@
  }
 
- void G4QGSPProtonBuilder::
- Build(G4ProtonInelasticProcess * aP)
+void G4QGSPProtonBuilder::
+Build(G4ProtonInelasticProcess * aP)
  {
-// G4cout << "adding inelastic Proton in QGSP" << G4endl;
-   aP->AddDataSet(&theXSec);  
+   // G4cout << "adding inelastic Proton in QGSP" << G4endl;
+   aP->AddDataSet(new G4ProtonInelasticCrossSection());  
    theModel->SetMinEnergy(theMin);
    theModel->SetMaxEnergy(100*TeV);
@@ -69 +84 @@
  }
 
- void G4QGSPProtonBuilder::
- Build(G4HadronElasticProcess * )
+void G4QGSPProtonBuilder::
+Build(G4HadronElasticProcess * )
  {
  }
 
- G4QGSPProtonBuilder::
- ~G4QGSPProtonBuilder() 
+G4QGSPProtonBuilder::~G4QGSPProtonBuilder() 
  {
    delete thePreEquilib;

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

@@ -25 +25 @@
 //
 // $Id: G4QStoppingPhysics.cc,v 1.2 2007/04/26 16:03:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------

trunk/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc

@@ -25 +25 @@
 //
 // $Id: G4StoppingHadronBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-03 $
 //
 //---------------------------------------------------------------------------