Changeset 1340 for trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh (modified) (3 diffs)

trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-//
-// $Id: G4PreCompoundFragmentVector.hh,v 1.6 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PreCompoundFragmentVector.hh,v 1.7 2010/08/28 15:16:55 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 // Hadronic Process: Nuclear Preequilibrium
 // by V. Lara
 //
-// Modif (03 September 2008) by J. M. Quesada for external choice of inverse 
+// Modified:
+// 03.09.2008 by J. M. Quesada for external choice of inverse 
 // cross section option 
-// JMQ (06 September 2008) Also external choice has been added for:
-//                      - superimposed Coulomb barrier (if useSICB=true) 
+// 06.09.2008 JMQ Also external choice has been added for:
+//                - superimposed Coulomb barrier (if useSICB=true) 
+// 27.08.2010 V.Ivanchenko simplify and make more efficient by adding extra
+//            vector of probabilities, moved constructor and destructor to source, 
+//            simplify run time computations making inlined
+// 
 
 #ifndef G4PreCompoundFragmentVector_h
@@ -40 +44 @@
 
 #include "G4VPreCompoundFragment.hh"
+#include "G4DataVector.hh"
+#include "Randomize.hh"
+#include "globals.hh"
+#include <vector>
+
+typedef std::vector<G4VPreCompoundFragment*>  pcfvector;
 
 class G4PreCompoundFragmentVector 
 {
-  typedef std::vector<G4VPreCompoundFragment*>  pcfvector;
 public:
-  inline G4PreCompoundFragmentVector(pcfvector * avector);
-  inline ~G4PreCompoundFragmentVector();
-  
+
+  G4PreCompoundFragmentVector(pcfvector * avector);
+
+  ~G4PreCompoundFragmentVector();
+
+  void SetVector(pcfvector * avector);
+
+  void SetOPTxs(G4int);
+
+  void UseSICB(G4bool);
+
+  inline void Initialize(const G4Fragment & aFragment);
+
+  inline G4double CalculateProbabilities(const G4Fragment & aFragment);
+        
+  inline G4VPreCompoundFragment * ChooseFragment();
+                  
 private:
+
   G4PreCompoundFragmentVector(const G4PreCompoundFragmentVector &right);
   const G4PreCompoundFragmentVector& 
@@ -55 +79 @@
   G4bool operator!=(const G4PreCompoundFragmentVector &right) const;    
   
-public:
+  pcfvector * theChannels;
+  G4DataVector probabilities;
 
-  inline void Initialize(const G4Fragment & aFragment);
-  inline void ResetStage();
-  inline void SetVector(pcfvector * avector);
-
-  G4double CalculateProbabilities(const G4Fragment & aFragment);
-        
-  G4VPreCompoundFragment * ChooseFragment(void);
-                
-private:
-
-  pcfvector * theChannels;
-
-  G4double TotalEmissionProbability;
-
-//for inverse cross section choice
-public:
-  inline void SetOPTxs(G4int);
-  //for superimposed CoulomBarrier for inverse cross sections
-  inline void UseSICB(G4bool);
-
+  G4int nChannels;
 
 };
 
-#include "G4PreCompoundFragmentVector.icc"
+inline void 
+G4PreCompoundFragmentVector::Initialize(const G4Fragment & aFragment)
+{
+  for (G4int i=0; i< nChannels; ++i) { 
+    (*theChannels)[i]->Initialize(aFragment);
+  }
+}
+
+inline G4double 
+G4PreCompoundFragmentVector::CalculateProbabilities(const G4Fragment & aFragment)
+{
+  //G4cout << "## G4PreCompoundFragmentVector::CalculateProbabilities" << G4endl;
+  G4double probtot = 0.0; 
+  for (G4int i=0; i< nChannels; ++i) { 
+    G4double prob = (*theChannels)[i]->CalcEmissionProbability(aFragment);
+    probtot += prob;
+    probabilities[i] = probtot;
+    //G4cout<<" prob= "<<prob<<" for "<<(*theChannels)[i]->GetName()<<G4endl;
+  }
+  return probtot;
+}
+
+inline G4VPreCompoundFragment* G4PreCompoundFragmentVector::ChooseFragment()
+{
+  G4double x = probabilities[nChannels-1]*G4UniformRand();
+  G4int i=0;
+  for (; i<nChannels; ++i) { 
+    if(x <= probabilities[i]) { break; }
+  }
+  return (*theChannels)[i];  
+}
 
 #endif