Import Geant4 9.3.0 source tree

source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh

@@ -84,11 +84,13 @@ private:
 
   G4int GetTotalCharge(std::vector<G4KineticTrack *> & aV)
   {
+G4cout<<"GetTotalCharge(std::vector<G4KineticTrack *> & aV)"<<G4endl; // Uzhi
     G4int result = 0;
     std::vector<G4KineticTrack *>::iterator i;
     for(i = aV.begin(); i != aV.end(); ++i)
     {
        result += G4lrint((*i)->GetDefinition()->GetPDGCharge());
+G4cout<<(*i)->GetDefinition()->GetParticleName()<<" "<<(*i)->GetDefinition()->GetPDGCharge()<<G4endl; // Uzhi
     }
     return result;
   }
@@ -128,6 +130,8 @@ private:
   void PrintKTVector(G4KineticTrack* kt, std::string comment=std::string(""));
   void DebugApplyCollision(G4CollisionInitialState * collision, 
                            G4KineticTrackVector *products);
+  void DebugEpConservation(const G4HadProjectile & aTrack, G4ReactionProductVector* products);			   
+			   
 private:
   G4KineticTrackVector theProjectileList;
   G4KineticTrackVector theTargetList;

source/processes/hadronic/models/binary_cascade/include/G4BinaryLightIonReaction.hh

@@ -38,14 +38,26 @@ class G4BinaryLightIonReaction : public G4HadronicInteraction
     virtual ~G4BinaryLightIonReaction(){}
     G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, 
                                               G4Nucleus& theNucleus);
-  
+    void SetPrecompound(G4VPreCompoundModel* const  value);
+    void SetDeExcitation(G4ExcitationHandler* const  value);
+
   private:
     G4BinaryCascade theModel;
-    G4ExcitationHandler theHandler;
-    G4PreCompoundModel theProjectileFragmentation;
+    G4ExcitationHandler* theHandler;
+    G4VPreCompoundModel* theProjectileFragmentation;
     G4HadFinalState theResult;
     G4bool EnergyAndMomentumCorrector(G4ReactionProductVector* products,
     				G4LorentzVector& TotalCollisionMom);
 };
+inline void G4BinaryLightIonReaction::SetPrecompound(G4VPreCompoundModel* const  value)
+{
+   if (theProjectileFragmentation) delete theProjectileFragmentation; 
+   theProjectileFragmentation = value;
+}
+inline void G4BinaryLightIonReaction::SetDeExcitation(G4ExcitationHandler* const  value)
+{
+   if (theHandler) delete theHandler; 
+   theHandler = value;
+}
 
 #endif

source/processes/hadronic/models/binary_cascade/include/G4GeneratorPrecompoundInterface.hh

@@ -45,7 +45,7 @@
 class G4GeneratorPrecompoundInterface : public G4VIntraNuclearTransportModel 
 {
 public:
-   G4GeneratorPrecompoundInterface(){}      
+   G4GeneratorPrecompoundInterface();    
    ~G4GeneratorPrecompoundInterface(){}
 
 private:
@@ -55,9 +55,10 @@ private:
 public:
    G4HadFinalState * ApplyYourself(const G4HadProjectile &aTrack, G4Nucleus &targetNucleus );
    G4ReactionProductVector* Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus);
+   G4double SetCaptureThreshold(G4double);
 
-
-private:   
+private:
+   G4double CaptureThreshold;   
 };
 
 #endif // G4GeneratorPrecompoundInterface_h