Changeset 1340 for trunk/source/processes/hadronic/models/parton_string/diffraction/include

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/processes/hadronic/models/parton_string/diffraction/include

Files:

• G4DiffractiveSplitableHadron.hh (modified) (1 diff)
• G4FTFModel.hh (modified) (1 diff)
• G4FTFParameters.hh (modified) (6 diffs)
• G4FTFParticipants.hh (modified) (1 diff)

trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4DiffractiveSplitableHadron.hh,v 1.5 2009/08/03 13:14:19 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4DiffractiveSplitableHadron.hh,v 1.6 2010/09/20 15:50:46 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 

trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4FTFModel.hh,v 1.10 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4FTFModel.hh,v 1.11 2010/09/20 15:50:46 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 // Class Description

trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParameters.hh

@@ -27 +27 @@
 #define G4FTFParameters_h 1
 //
-// $Id: G4FTFParameters.hh,v 1.7 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4FTFParameters.hh,v 1.8 2010/09/20 15:50:46 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 #include "G4Proton.hh"
@@ -81 +81 @@
 
 // --------- Set parameters of nuclear destruction--------------------
+        void SetMaxNumberOfCollisions(const G4double aValue, const G4double bValue);
+        void SetProbOfInteraction(const G4double aValue);
+
         void SetCofNuclearDestruction(const G4double aValue);
         void SetR2ofNuclearDestruction(const G4double aValue);
@@ -125 +128 @@
 
 // --------- Get parameters of nuclear destruction---------------------
+        G4double GetMaxNumberOfCollisions();
+        G4double GetProbOfInteraction();
+
         G4double GetCofNuclearDestruction();
         G4double GetR2ofNuclearDestruction();
@@ -171 +177 @@
 
 // --------- Parameters of nuclear destruction------------------------
+        G4double MaxNumberOfCollisions;
+        G4double ProbOfInelInteraction;
+
         G4double CofNuclearDestruction;         // Cnd of nuclear destruction
         G4double R2ofNuclearDestruction;        // R2nd
@@ -260 +269 @@
 
 // --------- Set parameters of nuclear destruction--------------------
+inline   void G4FTFParameters::SetMaxNumberOfCollisions(const G4double Plab,
+                                                        const G4double Pbound)
+              {
+               if(Plab > Pbound)
+               {
+                MaxNumberOfCollisions = Plab/Pbound;
+                SetProbOfInteraction(-1.);
+               } else
+               {
+//                MaxNumberOfCollisions = -1.;
+//                SetProbOfInteraction(std::exp(0.25*(Plab-Pbound)));
+                MaxNumberOfCollisions = 1;
+                SetProbOfInteraction(-1.);
+               }
+              }
+inline  void G4FTFParameters::SetProbOfInteraction(const G4double aValue)
+             {ProbOfInelInteraction = aValue;}
+
 inline  void G4FTFParameters::SetCofNuclearDestruction(const G4double aValue)
              {CofNuclearDestruction = aValue;}
@@ -325 +352 @@
 
 // --------- Get parameters of nuclear destruction---------------------
+inline  G4double G4FTFParameters::GetMaxNumberOfCollisions(){return MaxNumberOfCollisions;}
+inline  G4double G4FTFParameters::GetProbOfInteraction()    {return ProbOfInelInteraction;}
+
 inline  G4double G4FTFParameters::GetCofNuclearDestruction(){return CofNuclearDestruction;}
 inline  G4double G4FTFParameters::GetR2ofNuclearDestruction(){return R2ofNuclearDestruction;}

trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4FTFParticipants.hh,v 1.6 2009/08/03 13:14:19 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4FTFParticipants.hh,v 1.7 2010/09/20 15:50:46 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //