Changeset 1228 for trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

File:

• trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4CoulombScatteringModel.cc,v 1.43 2009/10/28 10:14:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CoulombScatteringModel.cc,v 1.44 2009/12/03 09:59:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -108 +108 @@
 
   //invbeta2 = 1.0 +  m12/mom2;
- 
-  G4double fm = m2/(mass + m2);
-  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  //  G4double fm = m2/(mass + m2);  
+
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2; 
+  //
 
   SetupTarget(Z, tkin);
@@ -158 +163 @@
 
   // a correction for heavy projectile
-  G4double fm = m2/(mass + m2);
-  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  //  G4double fm = m2/(mass + m2);
+  //  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2;
+  //
 
   // sample scattering angle in CM system
@@ -181 +193 @@
   fParticleChange->ProposeMomentumDirection(newDirection);   
 
-  //  G4double elab = gam*(eCM + bet*pzCM);
-
-  G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
+ //   G4double elab = gam*(eCM + bet*pzCM);
+
+ // G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
   G4double elab = etot - m2*(ptot/Ecm)*(ptot/Ecm)*(1.-cost) ;
 
@@ -211 +223 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-