Import Geant4 10.6.0 source tree

2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
@@ -13,6 +13,28 @@ introduced in the code and keeptrack of all tags.
     * Reverse chronological order (last date on top), please *
     ----------------------------------------------------------

+22-Oct-2019  Alberto Ribon          (phys-builders-V10-05-02)
+-  G4HyperonFTFPBuilder : replaced the Chips inelastic cross sections for
+   hyperons and anti-hyperons with Glauber-Gribov ones (in this way, elastic
+   and inelastic cross sections follows consistently the same approach).
+-  G4BertiniKaonBuilder, G4BertiniPiKBuilder : replaced the Chips inelastic
+   cross sections with Glauber-Gribov ones as default kaon cross sections.
+-  G4FTFBinaryKaonBuilder, G4QGSBinaryKaonBuilder, G4QGSBinaryPiKBuilder,
+   G4QGSPPiKBuilder, G4QGSPKaonBuilder : removed kaon cross sections
+   (already set by the Bertini's builder, which is always needed).
+
+06-Aug-2019  Alberto Ribon          (phys-builders-V10-05-01)
+-  Replacing explicit values for the energy transition region with values
+   from G4HadronicParameters, for nearly all builders.
+   Note: kept unchanged the transition region between FTFP and BERT only
+         in 4 cases: G4HadronPhysicsFTFP_BERT_ATL, G4HadronPhysicsINCLXX,
+         G4HadronPhysicsNuBeam and "ShieldingM".
+
+31-Jul-2019  Gunter Folger          (phys-builders-V10-05-00)
+-  modified G4NeutronCrossSectionXS as consequence to code cleanup 
+   in lists (phys-lists-V10-05-02),i.e. removed G4Dataquestionaire
+   from util (phys-util-V10-04-02).
+
 22-Nov-2018, Alberto Ribon          (phys-builders-V10-04-03)
 -  G4QGSBinaryPionBuilder, G4QGSBinaryPiKBuilder, G4QGSPPiKBuilder, 
   G4FTFPPionBuilder, G4BertiniPiKBuilder, G4FTFPPiKBuilder, 
@@ -67,14 +67,15 @@ class G4BertiniKaonBuilder : public G4VKaonBuilder

    using G4VKaonBuilder::Build; //Prevent compier warning
  private:
-    G4VCrossSectionDataSet * ChipsKaonMinus;
-    G4VCrossSectionDataSet * ChipsKaonPlus;
-    G4VCrossSectionDataSet * ChipsKaonZero;
+    G4VCrossSectionDataSet * KaonMinusCrossSection;
+    G4VCrossSectionDataSet * KaonPlusCrossSection;
+    G4VCrossSectionDataSet * KaonZeroCrossSection;

    G4CascadeInterface * theModel;    
    G4double theMin;
    G4double theMax;

 };
+
 #endif

@@ -72,7 +72,5 @@ class G4BertiniNeutronBuilder : public G4VNeutronBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -69,12 +69,11 @@ class G4BertiniPiKBuilder : public G4VPiKBuilder
    using G4VPiKBuilder::Build; //Prevent Compilation warning

  private:
+    G4VCrossSectionDataSet * kaonxs;
    G4CascadeInterface * theModel;    
    G4double theMin;
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -71,5 +71,6 @@ class G4BertiniPionBuilder : public G4VPionBuilder
    G4double theMax;

 };
+
 #endif

@@ -70,7 +70,5 @@ class G4BertiniProtonBuilder : public G4VProtonBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -70,7 +70,5 @@ class G4BinaryAlphaBuilder : public G4VAlphaBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -70,7 +70,5 @@ class G4BinaryDeuteronBuilder : public G4VDeuteronBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -70,7 +70,5 @@ class G4BinaryHe3Builder : public G4VHe3Builder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -71,7 +71,5 @@ class G4BinaryNeutronBuilder : public G4VNeutronBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -74,7 +74,5 @@ class G4BinaryPiKBuilder : public G4VPiKBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -69,5 +69,6 @@ class G4BinaryPionBuilder : public G4VPionBuilder
    G4double theMax;

 };
+
 #endif

@@ -69,7 +69,5 @@ class G4BinaryProtonBuilder : public G4VProtonBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -70,7 +70,5 @@ class G4BinaryTritonBuilder : public G4VTritonBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -54,3 +54,4 @@ enum G4BuilderType
 };

 #endif
+
@@ -88,5 +88,6 @@ class G4FTFPAntiBarionBuilder : public G4VAntiBarionBuilder
    G4double theMax;

 };
+
 #endif

@@ -83,7 +83,5 @@ class G4FTFPNeutronBuilder : public G4VNeutronBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -86,7 +86,5 @@ class G4FTFPPiKBuilder : public G4VPiKBuilder
    G4double theMax;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -81,3 +81,4 @@ class G4FTFPPionBuilder : public G4VPionBuilder
 };

 #endif
+
@@ -80,7 +80,5 @@ class G4FTFPProtonBuilder : public G4VProtonBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -60,7 +60,9 @@
 #include "G4LundStringFragmentation.hh"
 #include "G4ExcitedStringDecay.hh"
 #include "G4CascadeInterface.hh"
-#include "G4ChipsHyperonInelasticXS.hh"
+
+
+class G4VCrossSectionDataSet;


 class G4HyperonFTFPBuilder : public G4PhysicsBuilderInterface
@@ -91,10 +93,11 @@ class G4HyperonFTFPBuilder : public G4PhysicsBuilderInterface
    G4XiMinusInelasticProcess*  theXiMinusInelastic;
    G4AntiXiMinusInelasticProcess*  theAntiXiMinusInelastic;
    G4OmegaMinusInelasticProcess*  theOmegaMinusInelastic;
-  G4AntiOmegaMinusInelasticProcess*  theAntiOmegaMinusInelastic;
+    G4AntiOmegaMinusInelasticProcess*  theAntiOmegaMinusInelastic;
  
-  //  G4QHadronInelasticDataSet * theCHIPSInelastic;
-  G4VCrossSectionDataSet* theCHIPSInelastic;
+    G4VCrossSectionDataSet* theInelasticCrossSection;
    G4bool wasActivated;
 };
+
 #endif
+
@@ -83,7 +83,5 @@ class G4INCLXXNeutronBuilder : public G4VNeutronBuilder

 };

-// 2011 by P. Kaitaniemi
-
 #endif

@@ -73,7 +73,5 @@ class G4INCLXXPionBuilder : public G4VPionBuilder
    G4double theMax;
 };

-// 2011 by P. Kaitaniemi
-
 #endif

@@ -91,7 +91,5 @@ class G4INCLXXProtonBuilder : public G4VProtonBuilder

 };

-// 2011 by P. Kaitaniemi
-
 #endif

@@ -67,5 +67,6 @@ class G4KaonBuilder : public G4PhysicsBuilderInterface

    G4bool wasActivated;
 };
+
 #endif

@@ -70,7 +70,5 @@ class G4NeutronBuilder : public G4PhysicsBuilderInterface
    G4bool isFissionActivated;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -57,8 +57,3 @@ private:

 #endif

-
-
-
-
-
@@ -94,7 +94,5 @@ class G4NeutronPHPBuilder : public G4VNeutronBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -69,7 +69,5 @@ class G4PiKBuilder : public G4PhysicsBuilderInterface
    G4bool wasActivated;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -61,5 +61,6 @@ class G4PionBuilder : public G4PhysicsBuilderInterface

    G4bool wasActivated;
 };
+
 #endif

@@ -73,7 +73,5 @@ class G4PrecoNeutronBuilder : public G4VNeutronBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -70,7 +70,5 @@ class G4PrecoProtonBuilder : public G4VProtonBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -65,7 +65,5 @@ class G4ProtonBuilder : public G4PhysicsBuilderInterface
    G4bool wasActivated;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -84,7 +84,5 @@ class G4QGSPNeutronBuilder : public G4VNeutronBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -84,7 +84,5 @@ class G4QGSPPiKBuilder : public G4VPiKBuilder
    G4double theMin;
 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -81,7 +81,5 @@ class G4QGSPPionBuilder : public G4VPionBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -80,7 +80,5 @@ class G4QGSPProtonBuilder : public G4VProtonBuilder

 };

-// 2002 by J.P. Wellisch
-
 #endif

@@ -51,3 +51,4 @@ public:
 };

 #endif
+
@@ -63,3 +63,4 @@ public:
 };

 #endif
+
@@ -53,3 +53,4 @@ public:
 };

 #endif
+
@@ -53,3 +53,4 @@ public:
 };

 #endif
+
@@ -58,4 +58,6 @@ public:
  virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
+
 #endif
+
@@ -59,6 +59,6 @@ public:
  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning

 };
-// 2002 by J.P. Wellisch

 #endif
+
@@ -63,6 +63,6 @@ public:
  virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning;
 };
-// 2002 by J.P. Wellisch

 #endif
+
@@ -54,4 +54,6 @@ public:
  virtual void Build(G4PionMinusInelasticProcess * aP) = 0;
  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
+
 #endif
+
@@ -53,6 +53,6 @@ public:
  virtual void Build(G4ProtonInelasticProcess * aP) = 0;
  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
-// 2002 by J.P. Wellisch

 #endif
+
@@ -53,3 +53,4 @@ public:
 };

 #endif
+
@@ -96,3 +96,4 @@ void G4AntiBarionBuilder::RegisterMe(G4PhysicsBuilderInterface* aB ) {
  }

 }
+
@@ -40,22 +40,19 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4ComponentGGHadronNucleusXsc.hh"
+#include "G4CrossSectionInelastic.hh"

-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
+#include "G4HadronicParameters.hh"


 G4BertiniKaonBuilder::
 G4BertiniKaonBuilder() 
 {
-   ChipsKaonMinus = G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name());
-   ChipsKaonPlus = G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name());
-   ChipsKaonZero = G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name());
-
-   theMin = 0*GeV;
-   theMax = 9.9*GeV;
+   KaonMinusCrossSection = KaonPlusCrossSection = KaonZeroCrossSection = 
+     new G4CrossSectionInelastic( new G4ComponentGGHadronNucleusXsc );
+   theMin = 0.0;
+   theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
   theModel = new G4CascadeInterface;
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax); 
@@ -67,7 +64,7 @@ Build(G4KaonPlusInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(ChipsKaonPlus);
+   aP->AddDataSet(KaonPlusCrossSection);
 }

 void G4BertiniKaonBuilder::
@@ -76,7 +73,7 @@ Build(G4KaonMinusInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(ChipsKaonMinus);
+   aP->AddDataSet(KaonMinusCrossSection);
 }

 void G4BertiniKaonBuilder::
@@ -85,7 +82,7 @@ Build(G4KaonZeroLInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(ChipsKaonZero);
+   aP->AddDataSet(KaonZeroCrossSection);
 }

 void G4BertiniKaonBuilder::
@@ -94,6 +91,6 @@ Build(G4KaonZeroSInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(ChipsKaonZero);
+   aP->AddDataSet(KaonZeroCrossSection);
 }

@@ -41,12 +41,14 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BertiniNeutronBuilder::
 G4BertiniNeutronBuilder() 
 {
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
  theModel = new G4CascadeInterface;
 }

@@ -58,5 +60,3 @@ Build(G4NeutronInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-
-// 2002 by J.P. Wellisch
@@ -42,13 +42,17 @@
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
 #include "G4BGGPionInelasticXS.hh"
+#include "G4ComponentGGHadronNucleusXsc.hh"
+#include "G4CrossSectionInelastic.hh"
+#include "G4HadronicParameters.hh"


 G4BertiniPiKBuilder::
 G4BertiniPiKBuilder() 
 {
-   theMin = 0*GeV;
-   theMax = 9.9*GeV;
+   kaonxs = new G4CrossSectionInelastic( new G4ComponentGGHadronNucleusXsc );
+   theMin = 0.0;
+   theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
   theModel = new G4CascadeInterface;
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax); 
@@ -78,6 +82,7 @@ Build(G4KaonPlusInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(kaonxs);
 }

 void G4BertiniPiKBuilder::
@@ -86,6 +91,7 @@ Build(G4KaonMinusInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(kaonxs);
 }

 void G4BertiniPiKBuilder::
@@ -94,6 +100,7 @@ Build(G4KaonZeroLInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(kaonxs);
 }

 void G4BertiniPiKBuilder::
@@ -102,6 +109,6 @@ Build(G4KaonZeroSInelasticProcess * aP)
   aP->RegisterMe(theModel);
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
+   aP->AddDataSet(kaonxs);
 }

- // 2002 by J.P. Wellisch
@@ -43,13 +43,14 @@
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
 #include "G4BGGPionInelasticXS.hh"
+#include "G4HadronicParameters.hh"


 G4BertiniPionBuilder::
 G4BertiniPionBuilder() 
 {
-   theMin = 0*GeV;
-   theMax = 9.9*GeV;
+   theMin = 0.0;
+   theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
   theModel = new G4CascadeInterface;
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax); 
@@ -73,5 +74,3 @@ Build(G4PionMinusInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }

-
-         
@@ -41,12 +41,14 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BertiniProtonBuilder::
 G4BertiniProtonBuilder() 
 {
-  theMin = 0;
-  theMax=9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
  theModel = new G4CascadeInterface;
 }

@@ -58,4 +60,3 @@ Build(G4ProtonInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -41,13 +41,15 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryAlphaBuilder::
 G4BinaryAlphaBuilder() 
 {
  theModel = new G4BinaryCascade();
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
 }

 void G4BinaryAlphaBuilder::
@@ -58,4 +60,3 @@ Build(G4AlphaInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -40,13 +40,15 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryDeuteronBuilder::
 G4BinaryDeuteronBuilder() 
 {
  theModel = new G4BinaryCascade();
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
 }

 void G4BinaryDeuteronBuilder::
@@ -57,4 +59,3 @@ Build(G4DeuteronInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -40,13 +40,15 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryHe3Builder::
 G4BinaryHe3Builder() 
 {
  theModel = new G4BinaryCascade();
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
 }

 void G4BinaryHe3Builder::
@@ -57,4 +59,3 @@ Build(G4He3InelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -41,12 +41,14 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryNeutronBuilder::
 G4BinaryNeutronBuilder() 
 {
-   theMin = 0;
-   theMax = 9.9*GeV;
+   theMin = 0.0;
+   theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
   theModel = new G4BinaryCascade();
 }

@@ -58,4 +60,3 @@ G4BinaryNeutronBuilder()
   aP->RegisterMe(theModel);
 }

- // 2002 by J.P. Wellisch
@@ -42,13 +42,14 @@
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
 #include "G4BGGPionInelasticXS.hh"
+#include "G4HadronicParameters.hh"


 G4BinaryPiKBuilder::
 G4BinaryPiKBuilder() 
 {
-  theMin = 0*GeV;
-  theMax = 1.3*GeV;
+  theMin = 0.0;
+  theMax = 1.5*GeV;
  theModel = new G4BinaryCascade();
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax); 
@@ -72,4 +73,3 @@ Build(G4PionMinusInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -41,13 +41,14 @@
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
 #include "G4BGGPionInelasticXS.hh"
+#include "G4HadronicParameters.hh"


 G4BinaryPionBuilder::
 G4BinaryPionBuilder()
 {
-  theMin = 0*GeV;
-  theMax = 1.3*GeV;
+  theMin = 0.0;
+  theMax = 1.5*GeV;
  theModel = new G4BinaryCascade;
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax); 
@@ -70,3 +71,4 @@ Build(G4PionMinusInelasticProcess * aP)
  aP->AddDataSet( new G4BGGPionInelasticXS( G4PionMinus::Definition() ) );
  aP->RegisterMe(theModel);
 }
+
@@ -40,13 +40,15 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryProtonBuilder::
 G4BinaryProtonBuilder() 
 {
  theModel = new G4BinaryCascade();
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
 }

 void G4BinaryProtonBuilder::
@@ -57,4 +59,3 @@ Build(G4ProtonInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -41,13 +41,15 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
+#include "G4HadronicParameters.hh"
+

 G4BinaryTritonBuilder::
 G4BinaryTritonBuilder() 
 {
  theModel = new G4BinaryCascade();
-  theMin = 0;
-  theMax = 9.9*GeV;
+  theMin = 0.0;
+  theMax = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
 }

 void G4BinaryTritonBuilder::
@@ -58,4 +60,3 @@ Build(G4TritonInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -66,3 +66,4 @@
       G4PhysicsBuilderInterface::RegisterMe(aB);
   }
 }
+
@@ -42,18 +42,13 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-
-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
-
 #include "G4HadronicParameters.hh"

+
 G4FTFBinaryKaonBuilder::
 G4FTFBinaryKaonBuilder(G4bool quasiElastic)
 {    
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFB");

@@ -92,7 +87,6 @@ Build(G4KaonPlusInelasticProcess * aP)
 {
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name()));
  aP->RegisterMe(theModel);
 }

@@ -101,7 +95,6 @@ Build(G4KaonMinusInelasticProcess * aP)
 {
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name()));
  aP->RegisterMe(theModel);
 }

@@ -110,7 +103,6 @@ Build(G4KaonZeroLInelasticProcess * aP)
 {
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
  aP->RegisterMe(theModel);
 }

@@ -119,6 +111,6 @@ Build(G4KaonZeroSInelasticProcess * aP)
 {
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);    
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
  aP->RegisterMe(theModel);
 }
+
@@ -46,10 +46,11 @@
 #include "G4BGGNucleonInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFBinaryNeutronBuilder::
 G4FTFBinaryNeutronBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFB");

@@ -87,3 +88,4 @@ Build(G4NeutronInelasticProcess * aP)
  aP->RegisterMe(theModel);
  aP->AddDataSet(new G4BGGNucleonInelasticXS(G4Neutron::Neutron()));
 }
+
@@ -50,7 +50,7 @@
 G4FTFBinaryPiKBuilder::
 G4FTFBinaryPiKBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theModel = new G4TheoFSGenerator("FTFB");

  theStringModel = new G4FTFModel;
@@ -121,3 +121,4 @@ Build(G4KaonZeroSInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  aP->RegisterMe(theModel);
 }
+
@@ -49,7 +49,7 @@
 G4FTFBinaryPionBuilder::
 G4FTFBinaryPionBuilder(G4bool quasiElastic)
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFB");

@@ -45,10 +45,11 @@
 #include "G4BGGNucleonInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFBinaryProtonBuilder::
 G4FTFBinaryProtonBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFB");

@@ -89,3 +90,4 @@ G4FTFBinaryProtonBuilder::
  //delete theModel;
  if ( theQuasiElastic ) delete theQuasiElastic;
 }
+
@@ -82,3 +82,4 @@ G4HadronicInteraction* G4FTFBuilder::BuildModel()

  return theFTFModel;
 }
+
@@ -137,3 +137,4 @@ Build(G4AntiAlphaInelasticProcess * aP)
  aP->AddDataSet(theAntiNucleonData);
  aP->RegisterMe(theModel);
 }
+
@@ -38,10 +38,11 @@
 #include "G4ProcessManager.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFPKaonBuilder::
 G4FTFPKaonBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFP");

@@ -46,10 +46,11 @@
 #include "G4BGGNucleonInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFPNeutronBuilder::
 G4FTFPNeutronBuilder(G4bool quasiElastic) 
 {
-  theMin =   4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFP");

@@ -92,4 +93,3 @@ Build(G4NeutronInelasticProcess * aP)
    
 }

- // 2002 by J.P. Wellisch
@@ -50,7 +50,7 @@
 G4FTFPPiKBuilder::
 G4FTFPPiKBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFP");

@@ -131,4 +131,3 @@ Build(G4KaonZeroSInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

- // 2002 by J.P. Wellisch
@@ -39,10 +39,11 @@
 #include "G4BGGPionInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFPPionBuilder::
 G4FTFPPionBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("FTFP");

@@ -45,10 +45,11 @@
 #include "G4BGGNucleonInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4FTFPProtonBuilder::
 G4FTFPProtonBuilder(G4bool quasiElastic) 
 {
-  theMin = 4*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy(); 
  theModel = new G4TheoFSGenerator("FTFP");

@@ -90,4 +91,3 @@ G4FTFPProtonBuilder::
  delete theLund;
 }

- // 2002 by J.P. Wellisch
@@ -67,3 +67,4 @@
       G4PhysicsBuilderInterface::RegisterMe(aB);
   }
 }
+
@@ -40,7 +40,8 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
+#include "G4CrossSectionInelastic.hh"
+#include "G4ComponentGGHadronNucleusXsc.hh"
 #include "G4HadronicParameters.hh"
  
  
@@ -60,11 +61,11 @@ G4HyperonFTFPBuilder::G4HyperonFTFPBuilder():
 wasActivated(false)
 {

-// Hyperon : Bertini at low energies, then FTFP
+  // Hyperon : Bertini at low energies, then FTFP

  HyperonFTFP = new G4TheoFSGenerator("FTFP");
  
-  HyperonFTFP->SetMinEnergy( 2.*GeV );
+  HyperonFTFP->SetMinEnergy( G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade() );
  HyperonFTFP->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );

  theStringModel = new G4FTFModel;
@@ -77,19 +78,19 @@ G4HyperonFTFPBuilder::G4HyperonFTFPBuilder():
  HyperonFTFP->SetHighEnergyGenerator(theStringModel);
  
  theBertini = new G4CascadeInterface;
-  theBertini->SetMinEnergy( 0.*GeV );
-  theBertini->SetMaxEnergy( 6.*GeV );
+  theBertini->SetMinEnergy( 0.0 );
+  theBertini->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade() );

-// AntiHyperons: Use FTFP for full energy range, starting at 0.  
+  // AntiHyperons: Use FTFP for full energy range, starting at 0.  

  AntiHyperonFTFP = new G4TheoFSGenerator("FTFP");
-  AntiHyperonFTFP->SetMinEnergy( 0.*GeV );
+  AntiHyperonFTFP->SetMinEnergy( 0.0 );
  AntiHyperonFTFP->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  AntiHyperonFTFP->SetTransport(theCascade);
  AntiHyperonFTFP->SetHighEnergyGenerator(theStringModel);

-// use CHIPS cross sections
-  theCHIPSInelastic = G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsHyperonInelasticXS::Default_Name());
+  // use Glauber-Gribov cross sections
+  theInelasticCrossSection = new G4CrossSectionInelastic( new G4ComponentGGHadronNucleusXsc );
 }

 G4HyperonFTFPBuilder::~G4HyperonFTFPBuilder()
@@ -107,14 +108,14 @@ void G4HyperonFTFPBuilder::Build()
  theLambdaInelastic = new G4LambdaInelasticProcess();
  theLambdaInelastic->RegisterMe(theBertini);
  theLambdaInelastic->RegisterMe(HyperonFTFP);
-  theLambdaInelastic->AddDataSet(theCHIPSInelastic);
+  theLambdaInelastic->AddDataSet(theInelasticCrossSection);
  aProcMan = G4Lambda::Lambda()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theLambdaInelastic);
  
  // AntiLambda
  theAntiLambdaInelastic = new G4AntiLambdaInelasticProcess();
  theAntiLambdaInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiLambdaInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiLambdaInelastic->AddDataSet(theInelasticCrossSection);
  
  aProcMan = G4AntiLambda::AntiLambda()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiLambdaInelastic);
@@ -123,7 +124,7 @@ void G4HyperonFTFPBuilder::Build()
  theSigmaMinusInelastic = new G4SigmaMinusInelasticProcess();
  theSigmaMinusInelastic->RegisterMe(theBertini);
  theSigmaMinusInelastic->RegisterMe(HyperonFTFP);
-  theSigmaMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theSigmaMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4SigmaMinus::SigmaMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theSigmaMinusInelastic);
@@ -131,7 +132,7 @@ void G4HyperonFTFPBuilder::Build()
  // anti-SigmaMinus
  theAntiSigmaMinusInelastic = new G4AntiSigmaMinusInelasticProcess();
  theAntiSigmaMinusInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiSigmaMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiSigmaMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiSigmaMinusInelastic);
@@ -140,7 +141,7 @@ void G4HyperonFTFPBuilder::Build()
  theSigmaPlusInelastic = new G4SigmaPlusInelasticProcess();
  theSigmaPlusInelastic->RegisterMe(theBertini);
  theSigmaPlusInelastic->RegisterMe(HyperonFTFP);
-  theSigmaPlusInelastic->AddDataSet(theCHIPSInelastic);
+  theSigmaPlusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4SigmaPlus::SigmaPlus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theSigmaPlusInelastic);
@@ -148,7 +149,7 @@ void G4HyperonFTFPBuilder::Build()
  // anti-SigmaPlus
  theAntiSigmaPlusInelastic = new G4AntiSigmaPlusInelasticProcess();
  theAntiSigmaPlusInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiSigmaPlusInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiSigmaPlusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiSigmaPlusInelastic);
@@ -157,7 +158,7 @@ void G4HyperonFTFPBuilder::Build()
  theXiMinusInelastic = new G4XiMinusInelasticProcess();
  theXiMinusInelastic->RegisterMe(theBertini);
  theXiMinusInelastic->RegisterMe(HyperonFTFP);
-  theXiMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theXiMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4XiMinus::XiMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theXiMinusInelastic);
@@ -165,7 +166,7 @@ void G4HyperonFTFPBuilder::Build()
  // anti-XiMinus
  theAntiXiMinusInelastic = new G4AntiXiMinusInelasticProcess();
  theAntiXiMinusInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiXiMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiXiMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4AntiXiMinus::AntiXiMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiXiMinusInelastic);
@@ -174,7 +175,7 @@ void G4HyperonFTFPBuilder::Build()
  theXiZeroInelastic = new G4XiZeroInelasticProcess();
  theXiZeroInelastic->RegisterMe(theBertini);
  theXiZeroInelastic->RegisterMe(HyperonFTFP);
-  theXiZeroInelastic->AddDataSet(theCHIPSInelastic);
+  theXiZeroInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4XiZero::XiZero()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theXiZeroInelastic);
@@ -182,7 +183,7 @@ void G4HyperonFTFPBuilder::Build()
  // anti-XiZero
  theAntiXiZeroInelastic = new G4AntiXiZeroInelasticProcess();
  theAntiXiZeroInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiXiZeroInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiXiZeroInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4AntiXiZero::AntiXiZero()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiXiZeroInelastic);
@@ -191,7 +192,7 @@ void G4HyperonFTFPBuilder::Build()
  theOmegaMinusInelastic = new G4OmegaMinusInelasticProcess();
  theOmegaMinusInelastic->RegisterMe(theBertini);
  theOmegaMinusInelastic->RegisterMe(HyperonFTFP);
-  theOmegaMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theOmegaMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4OmegaMinus::OmegaMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theOmegaMinusInelastic);
@@ -199,10 +200,9 @@ void G4HyperonFTFPBuilder::Build()
  // anti-OmegaMinus
  theAntiOmegaMinusInelastic = new G4AntiOmegaMinusInelasticProcess();
  theAntiOmegaMinusInelastic->RegisterMe(AntiHyperonFTFP);
-  theAntiOmegaMinusInelastic->AddDataSet(theCHIPSInelastic);
+  theAntiOmegaMinusInelastic->AddDataSet(theInelasticCrossSection);

  aProcMan = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager();
  aProcMan->AddDiscreteProcess(theAntiOmegaMinusInelastic);
 }

-
@@ -63,5 +63,4 @@ Build(G4NeutronInelasticProcess * aP)
  aP->RegisterMe(theModel);
  aP->AddDataSet((G4NeutronInelasticXS*)G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4NeutronInelasticXS::Default_Name()));
 }
-// 2011 by P. Kaitaniemi

@@ -59,6 +59,3 @@
   aP->RegisterMe(theModel);
 }

-
- // 2011 by P. Kaitaniemi
-
@@ -59,5 +59,3 @@ Build(G4ProtonInelasticProcess * aP)
  aP->AddDataSet(new G4BGGNucleonInelasticXS(G4Proton::Proton()));
 }

-// 2011 by P. Kaitaniemi
-
@@ -79,4 +79,4 @@ void G4NeutronBuilder::RegisterMe(G4PhysicsBuilderInterface* aB) {
      G4PhysicsBuilderInterface::RegisterMe(aB);
  }
 }
-// 2002 by J.P. Wellisch
+
@@ -38,7 +38,6 @@
 // on top of existing Physics List

 #include "G4NeutronCrossSectionXS.hh"
-#include "G4DataQuestionaire.hh"

 #include "G4NeutronInelasticXS.hh"
 #include "G4NeutronCaptureXS.hh"
@@ -59,9 +58,7 @@ G4_DECLARE_PHYSCONSTR_FACTORY(G4NeutronCrossSectionXS);

 G4NeutronCrossSectionXS::G4NeutronCrossSectionXS(G4int ver) :
  G4VPhysicsConstructor("NeutronXS"), verbose(ver) 
-{
-  G4DataQuestionaire q(no,no,no,no,no,neutronxs);
-}
+{}

 G4NeutronCrossSectionXS::~G4NeutronCrossSectionXS() 
 {}
@@ -96,3 +93,4 @@ void G4NeutronCrossSectionXS::ConstructProcess()
    }
  }
 }
+
@@ -119,3 +119,4 @@ Build(G4NeutronInelasticProcess * aP)
  aP->AddDataSet(theLENDInelasticCrossSection);
  aP->RegisterMe(theLENDInelastic);
 }
+
@@ -94,3 +94,4 @@ Build(G4NeutronInelasticProcess * aP)
  aP->AddDataSet(theHPInelasticData);
  aP->RegisterMe(theHPInelastic);
 }
+
@@ -96,4 +96,4 @@ void G4PiKBuilder::RegisterMe(G4PhysicsBuilderInterface* aB) {
      G4PhysicsBuilderInterface::RegisterMe(aB);
  }
 }
-// 2002 by J.P. Wellisch
+
@@ -76,3 +76,4 @@ void G4PionBuilder::RegisterMe(G4PhysicsBuilderInterface* aB) {
      G4PhysicsBuilderInterface::RegisterMe(aB);
  }
 }
+
@@ -60,4 +60,3 @@ Build(G4NeutronInelasticProcess * aP)
  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
 }

-// 2002 by J.P. Wellisch
@@ -61,4 +61,3 @@ Build(G4ProtonInelasticProcess * aP)
  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
 }

-// 2002 by J.P. Wellisch
@@ -70,4 +70,3 @@
   }
 }

- // 2002 by J.P. Wellisch
@@ -37,16 +37,13 @@
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
 #include "G4CrossSectionPairGG.hh"
-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
 #include "G4HadronicParameters.hh"

+
 G4QGSBinaryKaonBuilder::
 G4QGSBinaryKaonBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSB");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -79,7 +76,6 @@ Build(G4KaonPlusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name()));
 }

 void G4QGSBinaryKaonBuilder::
@@ -88,7 +84,6 @@ Build(G4KaonMinusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name()));
 }

 void G4QGSBinaryKaonBuilder::
@@ -97,7 +92,6 @@ Build(G4KaonZeroLInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
 }

 void G4QGSBinaryKaonBuilder::
@@ -107,3 +101,4 @@ Build(G4KaonZeroSInelasticProcess * aP)
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
 }
+
@@ -44,10 +44,11 @@
 #include "G4BGGNucleonInelasticXS.hh"
 #include "G4HadronicParameters.hh"

+
 G4QGSBinaryNeutronBuilder::
 G4QGSBinaryNeutronBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSB");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -41,18 +41,14 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
 #include "G4BGGPionInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
 #include "G4HadronicParameters.hh"


 G4QGSBinaryPiKBuilder::
 G4QGSBinaryPiKBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSB");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -103,7 +99,6 @@ Build(G4KaonPlusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name()));
 }

 void G4QGSBinaryPiKBuilder::
@@ -112,7 +107,6 @@ Build(G4KaonMinusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name()));
 }

 void G4QGSBinaryPiKBuilder::
@@ -121,7 +115,6 @@ Build(G4KaonZeroLInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
 }

 void G4QGSBinaryPiKBuilder::
@@ -131,3 +124,4 @@ Build(G4KaonZeroSInelasticProcess * aP)
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
 }
+
@@ -43,7 +43,7 @@
 G4QGSBinaryPionBuilder::
 G4QGSBinaryPionBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSB");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -87,3 +87,4 @@ Build(G4PionMinusInelasticProcess * aP)
  aP->AddDataSet( new G4BGGPionInelasticXS( G4PionMinus::Definition() ) );
  aP->RegisterMe(theModel);
 }
+
@@ -47,7 +47,7 @@
 G4QGSBinaryProtonBuilder::
 G4QGSBinaryProtonBuilder(G4bool quasiElastic) 
 {
-   theMin = 12*GeV;
+   theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
   theModel = new G4TheoFSGenerator("QGSB");

   theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -94,3 +94,4 @@ G4HadronicInteraction* G4QGSBuilder::BuildModel()

  return theQGSModel;
 }
+
@@ -36,16 +36,13 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
 #include "G4HadronicParameters.hh"

+
 G4QGSPKaonBuilder::
 G4QGSPKaonBuilder(G4bool quasiElastic) 
 {
-  theMin = 12.0*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theMax = G4HadronicParameters::Instance()->GetMaxEnergy();
  theModel = new G4TheoFSGenerator("QGSP");

@@ -82,7 +79,6 @@ Build(G4KaonPlusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
  aP->RegisterMe(theModel);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name()));
 }

 void G4QGSPKaonBuilder::
@@ -91,7 +87,6 @@ Build(G4KaonMinusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
  aP->RegisterMe(theModel);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name()));
 }

 void G4QGSPKaonBuilder::
@@ -100,7 +95,6 @@ Build(G4KaonZeroLInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy(theMax);
  aP->RegisterMe(theModel);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
 }

 void G4QGSPKaonBuilder::
@@ -110,3 +104,4 @@ Build(G4KaonZeroSInelasticProcess * aP)
  theModel->SetMaxEnergy(theMax);
  aP->RegisterMe(theModel);
 }
+
@@ -83,4 +83,3 @@ G4QGSPLundStrFragmProtonBuilder::~G4QGSPLundStrFragmProtonBuilder()
   delete theStrFragm;
 }

- 
@@ -50,7 +50,7 @@
 G4QGSPNeutronBuilder::
 G4QGSPNeutronBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSP");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -85,4 +85,3 @@ Build(G4NeutronInelasticProcess * aP)
   aP->AddDataSet(new G4BGGNucleonInelasticXS(G4Neutron::Neutron()));
 }

-// 2002 by J.P. Wellisch
@@ -42,18 +42,14 @@
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 #include "G4ProcessManager.hh"
-#include "G4ChipsKaonMinusInelasticXS.hh"
-#include "G4ChipsKaonPlusInelasticXS.hh"
-#include "G4ChipsKaonZeroInelasticXS.hh"
 #include "G4BGGPionInelasticXS.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
 #include "G4HadronicParameters.hh"


 G4QGSPPiKBuilder::
 G4QGSPPiKBuilder(G4bool quasiElastic) 
 {    
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSP");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -105,8 +101,7 @@ Build(G4KaonPlusInelasticProcess * aP)
 {
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
-    aP->RegisterMe(theModel);
-    aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonPlusInelasticXS::Default_Name()));
+  aP->RegisterMe(theModel);
 }

 void G4QGSPPiKBuilder::
@@ -115,7 +110,6 @@ Build(G4KaonMinusInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonMinusInelasticXS::Default_Name()));
 }

 void G4QGSPPiKBuilder::
@@ -124,7 +118,6 @@ Build(G4KaonZeroLInelasticProcess * aP)
  theModel->SetMinEnergy(theMin);
  theModel->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergy() );
  aP->RegisterMe(theModel);
-  aP->AddDataSet(G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4ChipsKaonZeroInelasticXS::Default_Name()));
 }

 void G4QGSPPiKBuilder::
@@ -135,4 +128,3 @@ Build(G4KaonZeroSInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-// 2002 by J.P. Wellisch
@@ -51,7 +51,7 @@
 G4QGSPPionBuilder::
 G4QGSPPionBuilder(G4bool quasiElastic) 
 {
-  theMin = 12*GeV;
+  theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
  theModel = new G4TheoFSGenerator("QGSP");

  theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -98,5 +98,3 @@ Build(G4PionMinusInelasticProcess * aP)
  aP->RegisterMe(theModel);
 }

-
-// 2002 by J.P. Wellisch
@@ -50,7 +50,7 @@
 G4QGSPProtonBuilder::
 G4QGSPProtonBuilder(G4bool quasiElastic) 
 {
-   theMin = 12*GeV;
+   theMin = G4HadronicParameters::Instance()->GetMinEnergyTransitionQGS_FTF();
   theModel = new G4TheoFSGenerator("QGSP");

   theStringModel = new G4QGSModel< G4QGSParticipants >;
@@ -86,4 +86,3 @@ G4QGSPProtonBuilder::~G4QGSPProtonBuilder()
   delete theQGSM;
 }

- // 2002 by J.P. Wellisch
--- a/Show More
+++ b/Show More