Update of package classes.

[u/mrichter/AliRoot.git] / FASTSIM / AliFastGlauber.h

diff --git a/FASTSIM/AliFastGlauber.h b/FASTSIM/AliFastGlauber.h
index 08e1fea2a818c9e8f626a3e974724eb1c76da73e..13e4579bad64fe705e461bb12ffd1b9d9dd5a2b3 100644 (file)
--- a/FASTSIM/AliFastGlauber.h
+++ b/FASTSIM/AliFastGlauber.h
@@ -107,7 +107,11 @@ class AliFastGlauber : public TObject {
     void SetCentralityClass(Double_t xsecFrLow=0.0,Double_t xsecFrUp=0.1);    
     void GetRandomBHard(Double_t& b);
     void GetRandomXY(Double_t& x,Double_t& y);
-    void GetLastXY(Double_t xy[2]) {xy[0] = fXY[0]; xy[1] = fXY[1];}
+    void GetSavedXY(Double_t xy[2]) {xy[0] = fXY[0]; xy[1] = fXY[1];}
+    void GetSavedI0I1(Double_t i0i1[2]) {i0i1[0] = fI0I1[0]; i0i1[1] = fI0I1[1];}
+    void SaveXY(Double_t x, Double_t y) {fXY[0] = x; fXY[1] = y;}
+    void SaveI0I1(Double_t i0, Double_t i1) {fI0I1[0] = i0; fI0I1[1] = i1;}
+
     void GetRandomPhi(Double_t& phi);
     Double_t CalculateLength(Double_t b=0.,Double_t x0=0.,Double_t y0=0.,
                              Double_t phi0=0.);
@@ -160,22 +164,22 @@ class AliFastGlauber : public TObject {
     AliFastGlauber& operator=(const AliFastGlauber & rhs);
     void Copy(TObject&) const;
  protected:
-    static Double_t WSb            (Double_t *xx, Double_t *par);
-    static Double_t WSbz           (Double_t *xx, Double_t *par);
-    static Double_t WSz            (Double_t *xx, Double_t *par);
-    static Double_t WSta           (Double_t *xx, Double_t *par);
-    static Double_t WStarfi        (Double_t *xx, Double_t *par);
-    static Double_t WStaa          (Double_t *xx, Double_t *par);
-    static Double_t WKParticipants (Double_t *xx, Double_t *par);
-    static Double_t WParticipants  (Double_t *xx, Double_t *par);    
-    static Double_t WSgeo          (Double_t *xx, Double_t *par);
-    static Double_t WSbinary       (Double_t *xx, Double_t *par);
-    static Double_t WSN            (Double_t *xx, Double_t *par);
-    static Double_t WAlmond        (Double_t *xx, Double_t *par);
-    static Double_t WPathLength0   (Double_t *xx, Double_t *par);
-    static Double_t WPathLength    (Double_t *xx, Double_t *par);
-    static Double_t WIntRadius     (Double_t *xx, Double_t *par);
-    static Double_t WEnergyDensity (Double_t *xx, Double_t *par);
+    static Double_t WSb            (const Double_t *xx, const Double_t *par);
+    static Double_t WSbz           (const Double_t *xx, const Double_t *par);
+    static Double_t WSz            (const Double_t *xx, const Double_t *par);
+    static Double_t WSta           (const Double_t *xx, const Double_t *par);
+    static Double_t WStarfi        (const Double_t *xx, const Double_t *par);
+    static Double_t WStaa          (const Double_t *xx, const Double_t *par);
+    static Double_t WKParticipants (const Double_t *xx, const Double_t *par);
+    static Double_t WParticipants  (const Double_t *xx, const Double_t *par);    
+    static Double_t WSgeo          (const Double_t *xx, const Double_t *par);
+    static Double_t WSbinary       (const Double_t *xx, const Double_t *par);
+    static Double_t WSN            (const Double_t *xx, const Double_t *par);
+    static Double_t WAlmond        (const Double_t *xx, const Double_t *par);
+    static Double_t WPathLength0   (const Double_t *xx, const Double_t *par);
+    static Double_t WPathLength    (const Double_t *xx, const Double_t *par);
+    static Double_t WIntRadius     (const Double_t *xx, const Double_t *par);
+    static Double_t WEnergyDensity (const Double_t *xx, const Double_t *par);
 
     void Reset() const;
  private:
@@ -217,7 +221,8 @@ class AliFastGlauber : public TObject {
 
     Float_t fBmin;      // Minimum b (set through centrality selection)
     Float_t fBmax;      // Coresponding maximum b
-    Double_t fXY[2];    // Last generated production point 
+    Double_t fXY[2];    // Current generated production point
+    Double_t fI0I1[2];  // Current integrals I0 and I1
     Int_t fEllDef;      // definition of length (see CalculateLength())
     TString fName;      // filename of stored distributions
     ClassDef(AliFastGlauber,2) // Event geometry simulation in the Glauber Model