Import Geant4 11.1.0.beta source tree

2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
@@ -27,108 +27,102 @@
 #include "globals.hh"
 #include "G4DNAMakeReaction.hh"
 #include <G4DNAMolecularReactionTable.hh>
+#include <memory>
 #include "G4DNAIndependentReactionTimeModel.hh"
 #include "G4DNAIndependentReactionTimeStepper.hh"
 #include "G4DiffusionControlledReactionModel.hh"
 #include "G4Molecule.hh"
-#include "G4ReferenceCast.hh"
 #include "G4VDNAReactionModel.hh"
-#include "G4DNAReactionTypeManager.hh"
 #include "G4ChemicalMoleculeFinder.hh"

-G4DNAIndependentReactionTimeModel::G4DNAIndependentReactionTimeModel(const G4String& name)
-    : G4DNAIndependentReactionTimeModel(name,
-                                    std::unique_ptr<G4DNAIndependentReactionTimeStepper>
-                                    (new G4DNAIndependentReactionTimeStepper()),
-                                    std::unique_ptr<G4DNAMakeReaction>
-                                    (new G4DNAMakeReaction()))
+G4DNAIndependentReactionTimeModel::G4DNAIndependentReactionTimeModel(
+  const G4String& name)
+  : G4DNAIndependentReactionTimeModel(
+      name, std::make_unique<G4DNAIndependentReactionTimeStepper>(),
+      std::make_unique<G4DNAMakeReaction>())
 {}

-G4DNAIndependentReactionTimeModel::G4DNAIndependentReactionTimeModel(const G4String& name,
-                                                             std::unique_ptr<G4VITTimeStepComputer> pTimeStepper,
-                                                             std::unique_ptr<G4VITReactionProcess> pReactionProcess)
-    : G4VITStepModel(std::move(pTimeStepper),
-                     std::move(pReactionProcess),
-                     name)
-    , fMolecularReactionTable(reference_cast<const G4DNAMolecularReactionTable*>(fpReactionTable))
+G4DNAIndependentReactionTimeModel::G4DNAIndependentReactionTimeModel(
+  const G4String& name, std::unique_ptr<G4VITTimeStepComputer> pTimeStepper,
+  std::unique_ptr<G4VITReactionProcess> pReactionProcess)
+  : G4VITStepModel(std::move(pTimeStepper), std::move(pReactionProcess), name)
 {
-    fType1 = G4Molecule::ITType();
-    fType2 = G4Molecule::ITType();
+  fType1 = G4Molecule::ITType();
+  fType2 = G4Molecule::ITType();
 }

-G4DNAIndependentReactionTimeModel::~G4DNAIndependentReactionTimeModel() = default;
+G4DNAIndependentReactionTimeModel::~G4DNAIndependentReactionTimeModel() =
+  default;

 void G4DNAIndependentReactionTimeModel::Initialize()
 {
-    if(fpReactionTable == nullptr)
-    {
-        SetReactionTable(G4DNAMolecularReactionTable::GetReactionTable());
-    }
+  if(fpReactionTable == nullptr)
+  {
+    SetReactionTable(G4DNAMolecularReactionTable::GetReactionTable());
+  }

-    if(!fpReactionModel)
-    {
-        fpReactionModel.reset(new G4DiffusionControlledReactionModel());
-    }
+  if(!fpReactionModel)
+  {
+    fpReactionModel = std::make_unique<G4DiffusionControlledReactionModel>();
+  }

-    fpReactionModel->SetReactionTable((const G4DNAMolecularReactionTable*) fpReactionTable);
+  fpReactionModel->SetReactionTable(
+    (const G4DNAMolecularReactionTable*) fpReactionTable);

-    ((G4DiffusionControlledReactionModel*) fpReactionModel.get())->SetReactionTypeManager(fReactionTypeManager.get());
+  ((G4DNAMakeReaction*) fpReactionProcess.get())
+    ->SetReactionModel(fpReactionModel.get());

-    ((G4DNAMakeReaction*) fpReactionProcess.get())->SetReactionModel(fpReactionModel.get());
+  ((G4DNAMakeReaction*) fpReactionProcess.get())
+    ->SetTimeStepComputer(fpTimeStepper.get());

-    ((G4DNAMakeReaction*) fpReactionProcess.get())->SetTimeStepComputer(fpTimeStepper.get());
-   
-    ((G4DNAIndependentReactionTimeStepper*) fpTimeStepper.get())->SetReactionModel(fpReactionModel.get());
+  ((G4DNAIndependentReactionTimeStepper*) fpTimeStepper.get())
+    ->SetReactionModel(fpReactionModel.get());

-    ((G4DNAIndependentReactionTimeStepper*) fpTimeStepper.get())->SetReactionTypeManager(fReactionTypeManager.get());
+  ((G4DNAIndependentReactionTimeStepper*) fpTimeStepper.get())
+    ->SetReactionProcess((fpReactionProcess).get());

-    ((G4DNAIndependentReactionTimeStepper*) fpTimeStepper.get())->SetReactionProcess((fpReactionProcess).get());
-
-    G4ChemicalMoleculeFinder::Instance()->Clear();
-    G4VITStepModel::Initialize();
+  G4ChemicalMoleculeFinder::Instance()->Clear();
+  G4ChemicalMoleculeFinder::Instance()->SetOctreeUsed(true);
+  G4VITStepModel::Initialize();
 }
 void G4DNAIndependentReactionTimeModel::PrintInfo()
 {
 #ifdef G4VERBOSE
-    if(G4Threading::IsMultithreadedApplication())
+  if(G4Threading::IsMultithreadedApplication())
+  {
+    if(G4Threading::G4GetThreadId() == 0)
    {
-        if(G4Threading::G4GetThreadId() == 0)
-        {
-            G4VITStepModel::PrintInfo();
-            G4cout<<G4endl;
-            G4cout << fName << " will be used ==========================" << G4endl;
-            G4cout<<G4endl;
-            G4cout << "==============================="
-            "========================================"<<G4endl;
-            G4cout<<G4endl;
-            
-        }
-    }
-    else
-    {
-        G4VITStepModel::PrintInfo();
-        G4cout<<G4endl;
-        G4cout << fName << " will be used ==========================" << G4endl;
-        G4cout<<G4endl;
-        G4cout << "==============================="
-        "========================================"<<G4endl;
-        G4cout<<G4endl;
-        
+      G4VITStepModel::PrintInfo();
+      G4cout << G4endl;
+      G4cout << fName << " will be used ==========================" << G4endl;
+      G4cout << G4endl;
+      G4cout << "==============================="
+                "========================================"
+             << G4endl;
+      G4cout << G4endl;
    }
+  }
+  else
+  {
+    G4VITStepModel::PrintInfo();
+    G4cout << G4endl;
+    G4cout << fName << " will be used ==========================" << G4endl;
+    G4cout << G4endl;
+    G4cout << "==============================="
+              "========================================"
+           << G4endl;
+    G4cout << G4endl;
+  }
 #endif
 }

-void G4DNAIndependentReactionTimeModel::SetReactionModel(G4VDNAReactionModel* pReactionModel)
+void G4DNAIndependentReactionTimeModel::SetReactionModel(
+  G4VDNAReactionModel* pReactionModel)
 {
-    fpReactionModel.reset(pReactionModel);
+  fpReactionModel.reset(pReactionModel);
 }

 G4VDNAReactionModel* G4DNAIndependentReactionTimeModel::GetReactionModel()
 {
-    return fpReactionModel.get();
-}
-
-void G4DNAIndependentReactionTimeModel::SetReactionTypeManager(G4VReactionTypeManager* pReactionProcessManager)
-{
-    fReactionTypeManager.reset(pReactionProcessManager);
-}
+  return fpReactionModel.get();
+}