Import Geant4 10.7.0.beta source tree

2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
@@ -104,20 +104,10 @@ public:
    bool GetComputeTimeStep() const;

 public:
-    void CalculateTimeStep(const G4Track*, G4double userMinTimeStep);
-
-    void DoCalculateStep();
-
-    void FindReaction(G4ITReactionSet* pReactionSet,
-                      double currentStepTime,
-                      double previousStepTime,
-                      bool reachedUserStepTimeLimit);
-
    const G4Track* GetTrack() const;

 protected:
    void SetTrack(const G4Track*);
-    void ExtractTimeStepperData();

    G4double fTSTimeStep;
    G4ITReactionSet* fReactionSet;
@@ -283,6 +283,10 @@ public:
    return fReactionPerTime;
  }

+  void SortByTime(){
+	  fSortByTime = true;
+  }
+
 protected:
  void AddReaction(G4Track* track, G4ITReactionPtr reaction)
  {
@@ -48,10 +48,12 @@

 #include "globals.hh"
 #include <memory>
+#include <vector>

 class G4ITReactionTable;
 class G4ITReactionChange;
 class G4Track;
+class G4ITReactionSet;
 struct G4ITType;

 /**
@@ -79,6 +81,7 @@ public:
                                    double /*currentStepTime*/,
                                    bool /*reachedUserStepTimeLimit*/) = 0;

+    virtual std::vector<std::unique_ptr<G4ITReactionChange>> FindReaction(G4ITReactionSet*, const double, const double, const bool)=0;
    virtual std::unique_ptr<G4ITReactionChange> MakeReaction(const G4Track&, const G4Track&) = 0;

    virtual void SetReactionTable(const G4ITReactionTable*);
@@ -88,6 +88,7 @@ public:
    inline virtual void Prepare() ;

    virtual G4double CalculateStep(const G4Track&, const G4double&) = 0;
+    virtual G4double CalculateMinTimeStep(G4double, G4double) = 0;

    inline G4TrackVectorHandle GetReactants();
    inline virtual void ResetReactants()
@@ -100,6 +101,7 @@ public:
    inline void SetReactionTable(const G4ITReactionTable*);
    inline const G4ITReactionTable* GetReactionTable();

+
 protected :
    static G4ThreadLocal G4double fCurrentGlobalTime ;
    static G4ThreadLocal G4double fUserMinTimeStep   ;