Changeset 962 for trunk/source/processes/hadronic/util

Timestamp:

Apr 6, 2009, 12:30:29 PM (15 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/hadronic/util

Files:

• History (modified) (1 diff)
• src/G4ReactionDynamics.cc (modified) (5 diffs)

trunk/source/processes/hadronic/util/History

@@ -14 +14 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+23 Jul 2008 D.H. Wright for Vladimir Uzhinskiy (hadr-util-V09-01-01)
+--------------------------------------------------------------------
+- G4ReactionDynamics::GenerateXandPt: fixed bug in momentum bin which
+  caused oscillatory behavior in spectrum:  changed 
+    x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2 ) )
+  to 
+    x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1]) ) )
+
+ 9 Jul 2008 D.H. Wright (hadr-util-V09-01-00)
+---------------------------------------------
+- G4ReactionDynamics::GenerateXandPt: replace exit with G4Exception.
 
 11 Oct 2007 F.W. Jones (hadr-util-V09-00-00)

trunk/source/processes/hadronic/util/src/G4ReactionDynamics.cc

@@ -552 +552 @@
           while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
           l = std::min( 19, l );
-          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1]) ) );
           if( vec[i]->GetSide() < 0 )x *= -1.;
           vec[i]->SetMomentum( x*et*GeV );              // set the z-momentum
@@ -736 +736 @@
     while( (ran>dndl[l]) && (l<20) )l++;
     l = std::min( 19, l );
-    x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );   
+    x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1]) ) );
     currentParticle.SetMomentum( x*et*GeV );                 // set the z-momentum
     if( forwardEnergy < forwardKinetic )
@@ -804 +804 @@
           while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
           l = std::min( 19, l );
-          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1]) ) );
           if( targetParticle.GetSide() < 0 )x *= -1.;
           targetParticle.SetMomentum( x*et*GeV );                // set the z-momentum
@@ -917 +917 @@
         } // if (resetEnergies)
       } // closes outer loop
-
-//      if( eliminateThisParticle )  // not enough energy, eliminate target
-//      {
-//        G4cerr << "Warning: eliminating target particle" << G4endl;
-//        exit( EXIT_FAILURE );
-//      }
-    }
+    }
+
     //
     // Target particle finished.
@@ -1016 +1011 @@
         for( i=0; i<vecLen; ++i )
           G4cerr << "particle #" << i << " side = " << vec[i]->GetSide() << G4endl;
-        exit( EXIT_FAILURE );
+        G4Exception("G4ReactionDynamics::GenerateXandPt", "601", 
+                    FatalException, "Mismatch in nucleon count");
       }
       constantCrossSection = true;