Update to trunk of hepforge

[u/mrichter/AliRoot.git] / STARLIGHT / starlight / src / beambeamsystem.cpp

diff --git a/STARLIGHT/starlight/src/beambeamsystem.cpp b/STARLIGHT/starlight/src/beambeamsystem.cpp
index eadff03d7c7173f22f1fca5114875e0288dfd79e..0b48e7116704a63ff6c4975918e0e0c07c309a43 100644 (file)
--- a/STARLIGHT/starlight/src/beambeamsystem.cpp
+++ b/STARLIGHT/starlight/src/beambeamsystem.cpp
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 164                         $: revision of last commit
-// $Author:: odjuvsla                 $: author of last commit
-// $Date:: 2013-10-06 16:18:08 +0200 #$: date of last commit
+// $Rev:: 176                         $: revision of last commit
+// $Author:: jseger                   $: author of last commit
+// $Date:: 2014-06-20 22:15:20 +0200 #$: date of last commit
 //
 // Description:
 //
@@ -47,12 +47,12 @@ using namespace starlightConstants;
 
 
 //______________________________________________________________________________
-beamBeamSystem::beamBeamSystem(const beam& beam1_,
-                               const beam& beam2_)
+beamBeamSystem::beamBeamSystem(const beam&            beam1,
+                               const beam&            beam2)
   : _beamLorentzGamma(inputParametersInstance.beamLorentzGamma()),
     _beamBreakupMode (inputParametersInstance.beamBreakupMode()),
-    _beam1           (beam1_),
-    _beam2           (beam2_),
+    _beam1           (beam1),
+    _beam2           (beam2),
     _breakupProbabilities(0),
     _breakupImpactParameterStep(1.007),
     _breakupCutOff(10e-6)
@@ -69,11 +69,9 @@ beamBeamSystem::beamBeamSystem()
          _beamBreakupMode (inputParametersInstance.beamBreakupMode()),
          _beam1           (inputParametersInstance.beam1Z(),
                            inputParametersInstance.beam1A(),
-                           inputParametersInstance.deuteronSlopePar(),
                            inputParametersInstance.coherentProduction()),
          _beam2           (inputParametersInstance.beam2Z(),
                            inputParametersInstance.beam2A(),
-                           inputParametersInstance.deuteronSlopePar(),
                            inputParametersInstance.coherentProduction()),
          _breakupProbabilities(0),
          _breakupImpactParameterStep(1.007),
@@ -125,14 +123,17 @@ beamBeamSystem::probabilityOfBreakup(const double D) const
        else if ( ( (_beam1.A() == 1) && (_beam2.A() != 1) ) || ((_beam1.A() != 1) && (_beam2.A() == 1)) ) {  
          // This is pA
           if( _beam1.A() == 1 ){ 
-            bMin = _beam2.nuclearRadius() + 0.7; 
+            bMin = _beam2.nuclearRadius() + 0.7;
+            pOfB = exp(-7.0*_beam2.rho0()*_beam2.thickness(D));
           }else if( _beam2.A() == 1 ){ 
             bMin = _beam1.nuclearRadius() + 0.7; 
+            pOfB = exp(-7.0*_beam1.rho0()*_beam1.thickness(D));
           }else{
             cout<<"Some logical problem here!"<<endl;
           }
-          if( D > bMin )pOfB=1.0; 
+          // if( D > bMin )pOfB=1.0; 
           return pOfB;
+          
        }
 
        //use the lookup table and return...