Changeset 1196 for trunk/source/processes/hadronic/models/binary_cascade/include

Timestamp:

Nov 25, 2009, 5:13:58 PM (16 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/processes/hadronic/models/binary_cascade/include

Files:

• G4BinaryCascade.hh (modified) (4 diffs)
• G4BinaryLightIonReaction.hh (modified) (1 diff)
• G4GeneratorPrecompoundInterface.hh (modified) (2 diffs)

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

@@ -1 @@
-//
+
 // ********************************************************************
 // * License and Disclaimer                                           *
@@ -85 +85 @@
   G4int GetTotalCharge(std::vector<G4KineticTrack *> & aV)
   {
+G4cout<<"GetTotalCharge(std::vector<G4KineticTrack *> & aV)"<<G4endl; // Uzhi
     G4int result = 0;
     std::vector<G4KineticTrack *>::iterator i;
@@ -90 +91 @@
     {
        result += G4lrint((*i)->GetDefinition()->GetPDGCharge());
+G4cout<<(*i)->GetDefinition()->GetParticleName()<<" "<<(*i)->GetDefinition()->GetPDGCharge()<<G4endl; // Uzhi
     }
     return result;
@@ -129 +131 @@
   void DebugApplyCollision(G4CollisionInitialState * collision, 
                            G4KineticTrackVector *products);
+  void DebugEpConservation(const G4HadProjectile & aTrack, G4ReactionProductVector* products);                     
+                           
 private:
   G4KineticTrackVector theProjectileList;

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

@@ -39 +39 @@
     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

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

@@ -46 +46 @@
 {
 public:
-   G4GeneratorPrecompoundInterface(){}      
+   G4GeneratorPrecompoundInterface();    
    ~G4GeneratorPrecompoundInterface(){}
 
@@ -56 +56 @@
    G4HadFinalState * ApplyYourself(const G4HadProjectile &aTrack, G4Nucleus &targetNucleus );
    G4ReactionProductVector* Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus);
+   G4double SetCaptureThreshold(G4double);
 
-
-private:   
+private:
+   G4double CaptureThreshold;   
 };