Renaming Delete() in DeleteSegmentations()

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

diff --git a/FASTSIM/AliFastGlauber.h b/FASTSIM/AliFastGlauber.h
index 32c4a550a0a46972a3f05bb0259319438e69ce58..6cfe4cbb78f5d9304f4576ee9991d763b6d58e8f 100644 (file)
--- a/FASTSIM/AliFastGlauber.h
+++ b/FASTSIM/AliFastGlauber.h
@@ -36,23 +36,6 @@ class AliFastGlauber : public TObject {
     void SetFileName(TString &fn){fName=fn;}
     void SetFileName(const char *fn="$(ALICE_ROOT)/FASTSIM/data/glauberPbPb.root"){fName=fn;}
 
-    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);
-
     const TF1* GetWSB()            const {return fgWSb;}
     const TF2* GetWSbz()           const {return fgWSbz;}
     const TF1* GetWSz()            const {return fgWSz;} 
@@ -71,7 +54,7 @@ class AliFastGlauber : public TObject {
     const TF1* GetWSbinary()       const {return fgWSbinary;}
     const TF1* GetWSN()            const {return fgWSN;}     
     const TF1* GetWEnergyDensity() const {return fgWEnergyDensity;} 
-    const TF2* GetWAlmondFixedB(Int_t i) const {return &fgWAlmondFixedB[i];}
+    const TF2* GetWAlmondFixedB(Int_t i) const {return fgWAlmondFixedB[i];}
     
     Float_t GetWr0() const {return fWSr0;}
     Float_t GetWSd() const {return fWSd;}
@@ -170,6 +153,23 @@ class AliFastGlauber : public TObject {
                          const char *fname="i0i1B2B.root");
     void PlotAlmonds() 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);
+
     void Reset();
 
     static Float_t fgBMax;           // Maximum Impact Parameter
@@ -192,7 +192,7 @@ class AliFastGlauber : public TObject {
     static TF1*    fgWSbinary;       // dSigma/db binary
     static TF1*    fgWSN;            // dN/db binary
     static TF1*    fgWEnergyDensity; // Energy density as a function of impact parameter
-    static TF2     fgWAlmondFixedB[40]; // Interaction Almonds read from file
+    static TF2*    fgWAlmondFixedB[40]; // Interaction Almonds read from file
     static TF2*    fgWAlmondCurrent;    // Interaction Almond used for length
     
     Float_t fWSr0;      // Wood-Saxon Parameter r0
@@ -209,7 +209,7 @@ class AliFastGlauber : public TObject {
 
     Int_t fEllDef;      // definition of length (see CalculateLength())
     TString fName;     // filename of stored distributions
-    ClassDef(AliFastGlauber,1) // Event geometry simulation in the Glauber Model
+    ClassDef(AliFastGlauber,2) // Event geometry simulation in the Glauber Model
 };
 
 #endif