Update to upstream-gate

source/digits_hits/include/GateActions.hh

@@ -142,7 +142,7 @@ public :
   void StopOnBoundary(G4int aI);
   void StopAndKill(G4String aString);
   void SetMode( TrackingMode aMode);
-  TrackingMode GetMode();
+  TrackingMode GetMode() const;
   void SetTxtOut(G4String aString);
   G4int GetTxtOn() { return TxtOn;};
   void SetEnergyThreshold(G4double);

source/digits_hits/include/GateAnalysis.hh

@@ -14,6 +14,7 @@ See LICENSE.md for further details
 #define GateAnalysis_H
 
 #include "GateVOutputModule.hh"
+#include "GateCrystalHit.hh"
 
 
 class GateTrajectoryNavigator;
@@ -26,6 +27,16 @@ class GateAnalysis :  public GateVOutputModule
 {
 public:
 
+  struct PhotonScatterings {
+    G4int nPhantomCompton = 0;
+    G4int nPhantomRayleigh = 0;
+    G4int nCrystalCompton = 0;
+    G4int nCrystalRayleigh = 0;
+    G4int photonID = 0;
+    G4String theComptonVolumeName = G4String("NULL");
+    G4String theRayleighVolumeName = G4String("NULL");
+  };
+
   GateAnalysis(const G4String& name, GateOutputMgr* outputMgr,DigiMode digiMode);
   virtual ~GateAnalysis();
   const G4String& GiveNameOfFile();
@@ -57,6 +68,23 @@ public:
   inline G4bool GetRecordSeptalFlag() const { return m_recordSeptalFlag; }
   inline void SetSeptalPhysVolumeName(const G4String& name) { m_septalPhysVolumeName = name; }
   inline void SetRecordSeptalFlag(G4bool flag) { m_recordSeptalFlag = flag; }
+
+  void CollectPhantomScatterings(std::vector<PhotonScatterings>& photon_scatterings, G4int& septalNb);
+  void UpdateComptonRayleighDataFromScatterings(const std::vector<PhotonScatterings>& photon_scatterings);
+  void UpdateScatteringsFromComptonRayleighData(std::vector<PhotonScatterings>& photon_scatterings);
+  void MakeComptonRayleighDataUpdates(std::vector<PhotonScatterings>& photon_scatterings);
+  void SetCrystalScatterings(std::vector<PhotonScatterings>& photon_scatterings, GateCrystalHit* hit);
+  void UpdateHitDataForAnalysis(
+    std::vector<PhotonScatterings>& photon_scatterings, GateCrystalHit* hit, 
+    const G4int septalNb, 
+    const G4int sourceID, 
+    const G4int eventID,
+    const G4int runID, 
+    const G4ThreeVector& sourceVertex,
+    const G4int gammaType
+  );
+  void CollectCrystalScatterings(std::vector<PhotonScatterings>& photon_scatterings, const G4int septalNb, GateCrystalHitsCollection* CHC, const G4int eventID);
+  void SetPhotonIDs(std::vector<PhotonScatterings>& photon_scatterings);
 
 private:
 

source/digits_hits/include/GatePositroniumDecayInfo.hh

@@ -0,0 +1,28 @@
+#ifndef POSITRONIUM_DECAY_INFO_HH
+#define POSITRONIUM_DECAY_INFO_HH
+#include "GateCrystalHit.hh"
+#include <set>
+
+namespace GatePositroniumDecay {
+  enum class GammaType {Unknown = 0,SinglePhoton = 1,AnnihilationPhoton = 2,PromptPhoton = 3};
+  enum class SourceType {Unknown = 0, SingleGamaEmitter = 1, ParaPositronium = 2, OrthoPositronium = 3 };
+  enum class DecayType {Unknown = 0, StandardChannel = 1, DeexciatationChannel = 2};
+
+  GammaType IntToGammaType(const G4int value);
+  SourceType IntToSourceType(const G4int value);
+  DecayType IntToDecayType(const G4int value);
+  G4int GetMaxPhotonsNumber(const SourceType source_type,const DecayType decay_type);
+
+  class GatePositroniumDecayInfo {
+    public:
+      void Fill(const GateCrystalHitsCollection* collection);
+      bool HasGamma(const GammaType gamma_type) const;
+      bool HasSource(const SourceType source_type) const;
+      bool HasDecay(const DecayType decay_type) const;
+    private:
+      std::set<GammaType> gammaTypes;
+      std::set<SourceType> sourceTypes;
+      std::set<DecayType> decayTypes;
+  };
+}
+#endif

source/digits_hits/include/GateToRoot.hh

@@ -62,9 +62,9 @@ class GateTrajectoryNavigator;
 
 class ComptonRayleighData {
 public:
-    G4int photon1_phantom_Rayleigh, photon2_phantom_Rayleigh;
-    G4int photon1_phantom_compton, photon2_phantom_compton;
-    Char_t theComptonVolumeName1[60], theComptonVolumeName2[60], theRayleighVolumeName1[60], theRayleighVolumeName2[60];
+    G4int photon1_phantom_Rayleigh,photon2_phantom_Rayleigh,photon3_phantom_Rayleigh;
+    G4int photon1_phantom_compton , photon2_phantom_compton,photon3_phantom_compton;
+    Char_t theComptonVolumeName1[60] , theComptonVolumeName2[60], theComptonVolumeName3[60], theRayleighVolumeName1[60], theRayleighVolumeName2[60], theRayleighVolumeName3[60];
 
     ComptonRayleighData(ComptonRayleighData &);
 

source/digits_hits/include/GateTrajectoryNavigator.hh

@@ -27,43 +27,46 @@ public:
   virtual ~GateTrajectoryNavigator();
 
 
-  G4int         FindSourceIndex();
+  G4int FindSourceIndex();
 
   G4ThreeVector FindSourcePosition();
 
-  G4int         FindPositronTrackID();
+  G4int FindPositronTrackID();
 
   std::vector<G4int> FindAnnihilationGammasTrackID();
 
-  G4int         FindPhotonID(G4int trackID);
+  G4int FindPhotonID(G4int trackID);
 
-  G4int         FindPrimaryID(G4int trackID);
+  G4int FindPrimaryID(G4int trackID);
 
-  void          Initialize();
+  void Initialize();
 
-  void                          SetTrajectoryContainer(G4TrajectoryContainer* trajectoryContainer);
+  void SetTrajectoryContainer(G4TrajectoryContainer* trajectoryContainer);
 
-  inline G4TrajectoryContainer* GetTrajectoryContainer()   { return m_trajectoryContainer; };
+  inline G4TrajectoryContainer* GetTrajectoryContainer() { return m_trajectoryContainer; };
 
-  inline std::vector<G4int>          GetPhotonIDVec()           { return m_photonIDVec; };
+  inline std::vector<G4int> GetPhotonIDVec() { return m_photonIDVec; };
 
-  inline G4int                  GetPositronTrackID()       { return m_positronTrackID; };
+  inline G4int GetPositronTrackID() { return m_positronTrackID; };
 
-  void                          SetIonID();
+  void SetIonID();
 
-  void                          SetVerboseLevel(G4int val) { nVerboseLevel = val; };
+  void SetVerboseLevel(G4int val) { nVerboseLevel = val; };
 
 protected:
+
+  std::vector<G4int> GetPhotonIndices();
+  void FillPhotonIDsForThreePhotons(std::vector<G4int>& photonIndices, bool& only2gamma);
+  void FillPhotonIDsForTwoPhotons(std::vector<G4int>& photonIndices);
 
 private:
-  G4TrajectoryContainer* m_trajectoryContainer;
+  G4TrajectoryContainer* m_trajectoryContainer = NULL;
 
-  std::vector<G4int>          m_photonIDVec;
-  G4int                  m_positronTrackID;
-  G4Trajectory*          m_positronTrj;
-  G4int                  m_ionID;
-
-  G4int                  nVerboseLevel;
+  std::vector<G4int> m_photonIDVec;
+  G4int m_positronTrackID = 0;
+  G4Trajectory* m_positronTrj = NULL;
+  G4int m_ionID = 0;
+  G4int nVerboseLevel = 0;
 };
 
 

source/digits_hits/src/GateActions.cc

@@ -589,7 +589,7 @@ void GateSteppingAction::SetMode( TrackingMode aMode)
   m_trackingMode = aMode;
 }
 
-TrackingMode  GateSteppingAction::GetMode()
+TrackingMode  GateSteppingAction::GetMode() const
 { return m_trackingMode;}
 
 //-----------------------------------------------------------------------------