Import Geant4 10.7.0.beta source tree

examples/extended/hadronic/Hadr02/src/HadronPhysicsCRMC_FTFP_BERT.cc

@@ -58,6 +58,7 @@
 #include "G4FTFPNeutronBuilder.hh"
 #include "CRMCNeutronBuilder.hh"
 #include "G4BertiniNeutronBuilder.hh"
+#include "G4HyperonBuilder.hh"
 #include "G4HyperonFTFPBuilder.hh"
 #include "G4AntiBarionBuilder.hh"
 #include "G4FTFPAntiBarionBuilder.hh"
@@ -218,9 +219,12 @@ void HadronPhysicsCRMC_FTFP_BERT::Kaon() {
 
 void HadronPhysicsCRMC_FTFP_BERT::Others() {
   // Hyperons
+  auto hyp = new G4HyperonBuilder;
+  AddBuilder( hyp );
   auto ftfp_hyp = new G4HyperonFTFPBuilder;
   AddBuilder( ftfp_hyp );
-  ftfp_hyp->Build();
+  hyp->RegisterMe( ftfp_hyp );
+  hyp->Build();  
   // Anti-baryons
   auto abar = new G4AntiBarionBuilder;
   AddBuilder( abar );

examples/extended/hadronic/Hadr02/src/HadronPhysicsHIJING.cc

@@ -87,6 +87,7 @@ HadronPhysicsHIJING::HadronPhysicsHIJING(G4int)
   fPro = 0;
   fHIJINGPro = 0;    
   fHyperon = 0;
+  fFTFPHyperon = 0;
   fAntiBaryon = 0;
   fHIJINGAntiBaryon = 0;
   fCHIPSInelastic = 0;
@@ -143,8 +144,10 @@ void HadronPhysicsHIJING::CreateModels()
   BertiniPiK->SetMaxEnergy(maxBERT);
 
   //For Hyperons use FTF model
-  fHyperon=new G4HyperonFTFPBuilder;
-    
+  fHyperon=new G4HyperonBuilder;
+  fFTFPHyperon=new G4HyperonFTFPBuilder;
+  fHyperon->RegisterMe( fFTFPHyperon );
+  
   fAntiBaryon=new G4AntiBarionBuilder;
   //FTFPAntiBaryon=new G4FTFPAntiBarionBuilder(quasiElasFTF);
   G4FTFPAntiBarionBuilder* FTFPAB = new G4FTFPAntiBarionBuilder(quasiElasFTF);
@@ -165,6 +168,7 @@ HadronPhysicsHIJING::~HadronPhysicsHIJING()
   delete fHIJINGPro;    
     
   delete fHyperon;
+  delete fFTFPHyperon;
   delete fAntiBaryon;
   delete fHIJINGAntiBaryon;
   

examples/extended/hadronic/Hadr02/src/HadronPhysicsUrQMD.cc

@@ -72,6 +72,7 @@ HadronPhysicsUrQMD::HadronPhysicsUrQMD(G4int)
   fPro = 0;
   fUrQMDPro = 0;    
   fHyperon = 0;
+  fFTFPHyperon = 0;
   fAntiBaryon = 0;
 }
 
@@ -92,8 +93,10 @@ void HadronPhysicsUrQMD::CreateModels()
   fPiK->RegisterMe(fUrQMDPiK);
   
   //For Hyperons use FTF model
-  fHyperon=new G4HyperonFTFPBuilder;
-    
+  fHyperon=new G4HyperonBuilder;
+  fFTFPHyperon=new G4HyperonFTFPBuilder;
+  fHyperon->RegisterMe( fFTFPHyperon );
+
   fAntiBaryon=new G4AntiBarionBuilder;
   fUrQMDAntiBaryon=new  UrQMDAntiBarionBuilder();
   fAntiBaryon->RegisterMe( fUrQMDAntiBaryon );
@@ -113,6 +116,7 @@ HadronPhysicsUrQMD::~HadronPhysicsUrQMD()
   delete fUrQMDPro;    
     
   delete fHyperon;
+  delete fFTFPHyperon;
   delete fAntiBaryon;
   delete fUrQMDAntiBaryon;
 }