Renaming Delete() in DeleteSegmentations()

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

diff --git a/FASTSIM/AliFastGlauber.h b/FASTSIM/AliFastGlauber.h
index 8d817e485130732c8b51ccf2b606d814efafc35d..6cfe4cbb78f5d9304f4576ee9991d763b6d58e8f 100644 (file)
--- a/FASTSIM/AliFastGlauber.h
+++ b/FASTSIM/AliFastGlauber.h
@@ -34,24 +34,7 @@ class AliFastGlauber : public TObject {
     void SetAuAuRhic();
     void SetPbPbLHC();
     void SetFileName(TString &fn){fName=fn;}
-    void SetFileName(Char_t *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);
+    void SetFileName(const char *fn="$(ALICE_ROOT)/FASTSIM/data/glauberPbPb.root"){fName=fn;}
 
     const TF1* GetWSB()            const {return fgWSb;}
     const TF2* GetWSbz()           const {return fgWSbz;}
@@ -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;}
@@ -100,6 +83,7 @@ class AliFastGlauber : public TObject {
     
     Double_t CrossSection(Double_t b1, Double_t b2)               const;
     Double_t HardCrossSection(Double_t b1, Double_t b2)           const;
+    Double_t NHard(Double_t b1, Double_t b2)                      const;
     Double_t FractionOfHardCrossSection(Double_t b1, Double_t b2) const;
     Double_t Binaries(Double_t b)                 const;
     Double_t GetNumberOfBinaries(Double_t b)      const;
@@ -134,9 +118,9 @@ class AliFastGlauber : public TObject {
                             Double_t b=-1.);
     void PlotBDistr(Int_t n=1000);
     void PlotLengthDistr(Int_t n=1000,Bool_t save=kFALSE,
-                        Char_t *fname="length.root");
+                        const char *fname="length.root");
     void PlotLengthB2BDistr(Int_t n=1000,Bool_t save=kFALSE,
-                           Char_t *fname="lengthB2B.root");
+                           const char *fname="lengthB2B.root");
     void CalculateI0I1(Double_t& integral0,Double_t& integral1,
                       Double_t b=0.,
                       Double_t x0=0.,Double_t y0=0.,Double_t phi0=0.,
@@ -164,11 +148,28 @@ class AliFastGlauber : public TObject {
                               Double_t&x, Double_t &y,
                               Double_t ellCut=20.,Double_t b=-1.);
     void PlotI0I1Distr(Int_t n=1000,Double_t ellCut=20.,Bool_t save=kFALSE,
-                      Char_t *fname="i0i1.root");
+                      const char *fname="i0i1.root");
     void PlotI0I1B2BDistr(Int_t n=1000,Double_t ellCut=20.,Bool_t save=kFALSE,
-                         Char_t *fname="i0i1B2B.root");
+                         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
@@ -191,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
@@ -208,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