Import Geant4 10.0.0 source tree

source/processes/hadronic/models/inclxx/incl_physics/include/G4INCLStandardPropagationModel.hh

@@ -30,8 +30,6 @@
 // Sylvie Leray, CEA
 // Joseph Cugnon, University of Liege
 //
-// INCL++ revision: v5.1.8
-//
 #define INCLXX_IN_GEANT4_MODE 1
 
 #include "globals.hh"
@@ -107,7 +105,7 @@ namespace G4INCL {
        * Generate a two-particle avatar, if all the appropriate conditions are
        * met.
        */
-      IAvatar *generateBinaryCollisionAvatar(Particle * const p1, Particle * const p2) const;
+      IAvatar *generateBinaryCollisionAvatar(Particle * const p1, Particle * const p2);
 
       /** \brief Get the reflection time.
        *
@@ -138,6 +136,15 @@ namespace G4INCL {
        */
       void generateUpdatedCollisions(const ParticleList &updatedParticles, const ParticleList &particles);
 
+      /** \brief Generate and register collisions among particles in a list, except between those in another list.
+       *
+       * This method generates all possible collisions among the particles.
+       * Each collision is generated only once.
+       *
+       * \param particles list of particles
+       */
+      void generateCollisions(const ParticleList &particles);
+
       /** \brief Generate and register collisions among particles in a list, except between those in another list.
        *
        * This method generates all possible collisions among the particles.
@@ -166,11 +173,16 @@ namespace G4INCL {
        */
       void updateAvatars(const ParticleList &particles);
 
+      /// \brief (Re)Generate all possible avatars.
+      void generateAllAvatars();
+
+#ifdef INCL_REGENERATE_AVATARS
       /** \brief (Re)Generate all possible avatars.
        *
-       * \param excludeUpdated exclude collisions between updated particles.
+       * This method excludes collision avatars between updated particles.
        */
-      void generateAllAvatars(G4bool excludeUpdated=false);
+      void generateAllAvatarsExceptUpdated();
+#endif
 
       /**
        * Propagate all particles and return the first avatar.
@@ -183,6 +195,7 @@ namespace G4INCL {
       G4double currentTime;
       G4bool firstAvatar;
       LocalEnergyType theLocalEnergyType, theLocalEnergyDeltaType;
+      Particle backupParticle1, backupParticle2;
 
       /// \brief Put spectators on shell by extracting energy from the participants.
       void putSpectatorsOnShell(IAvatarList const &entryAvatars, ParticleList const &spectators);