Changeset 1055 for trunk/source/processes/hadronic/models/de_excitation/gem_evaporation

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

Location:

trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src

Files:

• G4GEMChannel.cc (modified) (4 diffs)
• G4GEMProbability.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GEMChannel.cc,v 1.6 2008/11/18 18:26:30 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4GEMChannel.cc,v 1.7 2009/03/12 11:25:28 ahoward Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -125 +125 @@
     //    G4double ExEnergy = fragment.GetExcitationEnergy() -
     //      G4PairingCorrection::GetInstance()->GetPairingCorrection(anA,aZ);
-    G4double ExEnergy = fragment.GetExcitationEnergy() -
-      G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
+//090120
+    //G4double ExEnergy = fragment.GetExcitationEnergy() -
+      //G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
+    G4double ExEnergy = fragment.GetExcitationEnergy(); 
+    if ( AResidual > 0 ) ExEnergy -= G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
+//090120
     
     // We only take into account channels which are physically allowed
@@ -260 +264 @@
     G4double a = theLevelDensityPtr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
                                                            static_cast<G4int>(fragment.GetZ()),U);
-    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
-                                                                               static_cast<G4int>(fragment.GetZ()));
+//090115
+//G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
+//                                                                     static_cast<G4int>(fragment.GetZ()));
+    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(AResidual,ZResidual);
+//090115
     
     G4double Alpha = theEvaporationProbabilityPtr->CalcAlphaParam(fragment);
@@ -307 +314 @@
 //      std::cout << "\t\tEjectile (" << A << ',' << Z << ") V = " << CoulombBarrier 
 //            << " Beta = " << Beta << " V+Beta = " << CoulombBarrier+Beta << '\n';
+
+//G4cout << AResidual << " " << ZResidual << " " << ConstantFactor << " " << Beta << " " << CoulombBarrier << " " << MaximalKineticEnergy << " " << CoulombBarrier + MaximalKineticEnergy + Beta << G4endl;
+//090128
+if ( CoulombBarrier + MaximalKineticEnergy + Beta <= 0 ) return 0; 
 
     do 

trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMProbability.cc

@@ -108 +108 @@
     G4double a = theEvapLDPptr->LevelDensityParameter(static_cast<G4int>(fragment.GetA()),
                                                       static_cast<G4int>(fragment.GetZ()),U);
-    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
-                                                                               static_cast<G4int>(fragment.GetZ()));
+//090115
+//G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection(static_cast<G4int>(fragment.GetA()),
+//                                                                     static_cast<G4int>(fragment.GetZ()));
+    G4double ResidualZ = static_cast<G4double>(fragment.GetZ() - theZ);
+    G4double delta0 = G4PairingCorrection::GetInstance()->GetPairingCorrection( static_cast<G4int>( ResidualA ) , static_cast<G4int>( ResidualZ ) );
+//090115
     
     G4double Alpha = CalcAlphaParam(fragment);