Changeset 1228 for trunk/source/processes/hadronic/models/de_excitation/ablation/include

Timestamp:

Jan 8, 2010, 11:56:51 AM (15 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

File:

• trunk/source/processes/hadronic/models/de_excitation/ablation/include/G4WilsonAblationModel.hh (modified) (4 diffs)

trunk/source/processes/hadronic/models/de_excitation/ablation/include/G4WilsonAblationModel.hh

@@ -40 +40 @@
 // MODULE:              G4WilsonAblationModel.hh
 //
-// Version:             B.1
-// Date:                15/04/04
+// Version:             1.0
+// Date:                08/12/2009
 // Author:              P R Truscott
 // Organisation:        QinetiQ Ltd, UK
@@ -58 +58 @@
 // Beta release
 //
+// 08 December 2009, P R Truscott, QinetiQ Ltd, UK
+// Ver 1.0
+// Introduced vector of evaporation channels and evaporation factory.  Also
+// copied directly over the SumProbabilities class in G4Evaporation.hh at
+// version 9.2.r9, just in cases there's any subtle differences.  See .cc
+// file comments to see impact of the rest of the changes.
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ////////////////////////////////////////////////////////////////////////////////
@@ -67 +74 @@
 #include "G4ParticleDefinition.hh"
 #include "globals.hh"
+#include "G4VEvaporationFactory.hh"
+#include "G4EvaporationFactory.hh"
+
 
 #include <vector>
@@ -99 +109 @@
     VectorOfFragmentTypes  evapType;
 
-    class SumProbabilities : 
-      public std::binary_function<G4double,G4double,G4double>
-    {
-      public:
-        SumProbabilities() : total(0.0) {}
-        G4double operator() (G4double& /* probSoFar */, G4VEvaporationChannel*& frag)
-        {
-          total += frag->GetEmissionProbability();
-          return total;
-        }
+    std::vector<G4VEvaporationChannel*> * theChannels;
+    G4VEvaporationFactory * theChannelFactory;
 
-        G4double GetTotal() { return total; }
-      public:
-      G4double total;
+  class SumProbabilities : public std::binary_function<G4double,G4double,G4double>
+  {
+  public:
+    SumProbabilities() : total(0.0) {}
+    G4double operator() (G4double& /* probSoFar */, G4VEvaporationChannel*& frag)
+    { 
+      G4double temp_prob = frag->GetEmissionProbability();
+      if(temp_prob >= 0.0) total += temp_prob;
+      //      total += frag->GetEmissionProbability();
+      return total;
+    }
+    
+    G4double GetTotal() { return total; }
+  public:
+    G4double total;
+    
   };
-                                                                                
-
 
 };