Changeset 1055 for trunk/source/processes/hadronic/models/parton_string/hadronization/src

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/parton_string/hadronization/src

Files:

• G4ExcitedStringDecay.cc (modified) (2 diffs)
• G4HadronBuilder.cc (modified) (2 diffs)
• G4LundStringFragmentation.cc (modified) (3 diffs)
• G4VLongitudinalStringDecay.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4ExcitedStringDecay.cc

@@ -134 +134 @@
       }
     }
-    
+#ifdef debug_G4ExcitedStringDecay     
     if(!success)
     {
@@ -144 +144 @@
 //       throw G4HadronicException(__FILE__, __LINE__, "G4ExcitedStringDecay failed to correct...");
     }
-
+#endif     
     // Compute c.m.s. interaction velocity and KTV back boost   
     Beta = TotalCollisionMom.boostVector();

trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4HadronBuilder.cc,v 1.7 2008/04/25 14:20:14 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4HadronBuilder.cc,v 1.10 2009/05/22 16:34:31 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // -----------------------------------------------------------------------------
@@ -147 +147 @@
            if( (IsUp && IsAnti ) || (!IsUp && !IsAnti ) ) 
               PDGEncoding = - PDGEncoding;
-        }
+        }
            
            

trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4LundStringFragmentation.cc,v 1.13 2008/06/23 09:17:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02 $ 1.8
+// $Id: G4LundStringFragmentation.cc,v 1.14 2009/05/22 16:36:46 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 1.8
 //
 // -----------------------------------------------------------------------------
@@ -508 +508 @@
    {
       do                                                                      
-      {                                                                     
-         Pt=SampleQuarkPt(); Pt.setZ(0); G4double Pt2=Pt.mag2();              
+      {  
+         // GF 22-May-09, limit sampled pt to allowed range
+         
+         G4double termD = InitialMass*InitialMass -Mass*Mass - AntiMass*AntiMass;
+         G4double termab = 4*sqr(Mass*AntiMass);
+         G4double termN = 2*termD + 4*Mass*Mass + 4*AntiMass*AntiMass;
+         G4double pt2max=(termD*termD - termab )/ termN ;
+         
+//       G4cout << " termD, ab, N " << termD << "  " << termab << "  " << termN 
+//              <<  "   pt2max= " << pt2max ;
+                                                                                          
+         Pt=SampleQuarkPt(sqrt(pt2max)); Pt.setZ(0); G4double Pt2=Pt.mag2();
+
+         
+//       G4cout << " sampled Pt2 = " << Pt2 << "  " << pt2max-Pt2 << G4endl;              
+         // end.. GF
 
 //G4cout<<"Sample4Momentum Pt x y "<<Pt.getX()<<" "<<Pt.getY()<<G4endl;
@@ -521 +535 @@
                          4.*MassMt2*AntiMassMt2;                                
       }                                                                     
-      while(AvailablePz2 < 0.);                                               
+      while(AvailablePz2 < 0.);     // GF will occur only for numerical precision problem with limit in sampled pt                                               
                                                                             
       AvailablePz2 /=(4.*InitialMass*InitialMass);                            

trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VLongitudinalStringDecay.cc,v 1.13 2008/06/23 08:35:55 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4VLongitudinalStringDecay.cc,v 1.14 2009/05/22 16:35:47 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // -----------------------------------------------------------------------------
@@ -485 +485 @@
 //    }
 
-G4ThreeVector G4VLongitudinalStringDecay::SampleQuarkPt()
+G4ThreeVector G4VLongitudinalStringDecay::SampleQuarkPt(G4double ptMax)
    {
-   G4double Pt = -std::log(G4UniformRand());
+   G4double Pt;
+   if ( ptMax < 0 ) {
+      // sample full gaussian
+      Pt = -std::log(G4UniformRand());
+   } else {
+      // sample in limited range
+      Pt = -std::log(CLHEP::RandFlat::shoot(exp(-sqr(ptMax)/sqr(SigmaQT)), 1.));
+   }
    Pt = SigmaQT * std::sqrt(Pt);
    G4double phi = 2.*pi*G4UniformRand();