Warnings corrected.

diff --git a/FASTSIM/AliFastMuonTrackingAcc.cxx b/FASTSIM/AliFastMuonTrackingAcc.cxx
index 5452347fc28a254b294a4327a73dd71031977785..3712c170a9f4cca75912ae4a1eb078017f32707d 100644 (file)
--- a/FASTSIM/AliFastMuonTrackingAcc.cxx
+++ b/FASTSIM/AliFastMuonTrackingAcc.cxx
@@ -49,7 +49,7 @@ void AliFastMuonTrackingAcc::Init()
 
 
 
-Float_t AliFastMuonTrackingAcc::Evaluate(Float_t pt, Float_t theta, Float_t phi)
+Float_t AliFastMuonTrackingAcc::Evaluate(Float_t /*charge*/, Float_t pt, Float_t theta, Float_t phi)
 {
 // Evaluate the tracking acceptance for 3-vector pt, theta, phi
     Float_t p = pt / TMath::Sin(theta*TMath::Pi()/180.);

diff --git a/FASTSIM/AliFastMuonTrackingAcc.h b/FASTSIM/AliFastMuonTrackingAcc.h
index 9d8f0122fb0a7580939ce1674593fcd3d6a7f9af..e4d7cb9761cb1f2ee6fc3171a988fa08688b54b0 100644 (file)
--- a/FASTSIM/AliFastMuonTrackingAcc.h
+++ b/FASTSIM/AliFastMuonTrackingAcc.h
@@ -22,16 +22,16 @@ class AliFastMuonTrackingAcc :  public AliFastResponse {
     virtual ~AliFastMuonTrackingAcc(){;}
     void SetBackground(Float_t bg = 1.) {fBackground = bg;}
     void SetCharge(Float_t charge = 1.) {fCharge     = charge;}
-    virtual void Init();
-    virtual Float_t Evaluate(Float_t pt, Float_t theta, Float_t phi);
+    virtual void    Init();
+    virtual Float_t Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi);
+    virtual void    Evaluate(Float_t charge, Float_t   p,  Float_t  theta , Float_t   phi,
+                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+       {AliFastResponse::Evaluate(charge, p, theta, phi, pS, thetaS, phiS);}
     virtual void    Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,
-                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS) {
-      AliFastResponse::Evaluate(p,  theta,  phi, pS, thetaS, phiS);
-    }
-    virtual Float_t Evaluate(AliFastParticle* part) {
-      return AliFastResponse::Evaluate(part);
-    }
-     // Copy
+                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+       {AliFastResponse::Evaluate(p, theta, phi, pS, thetaS, phiS);}
+    
+    // Copy
     AliFastMuonTrackingAcc& operator=(const AliFastMuonTrackingAcc& rhs);
  protected:
     Float_t              fBackground;   // Background level

diff --git a/FASTSIM/AliFastMuonTrackingEff.cxx b/FASTSIM/AliFastMuonTrackingEff.cxx
index 053bcac350ccf6d7d2bfeda7dfc4759eccab21c7..ce1ff34acad7c209ab849d7b7edb2419db69de6f 100644 (file)
--- a/FASTSIM/AliFastMuonTrackingEff.cxx
+++ b/FASTSIM/AliFastMuonTrackingEff.cxx
@@ -53,7 +53,7 @@ void AliFastMuonTrackingEff::Init()
 
 
 
-Float_t AliFastMuonTrackingEff::Evaluate(Float_t pt, Float_t theta, Float_t phi)
+Float_t AliFastMuonTrackingEff::Evaluate(Float_t /*charge*/, Float_t pt, Float_t theta, Float_t phi)
 {
 //
 // Evaluate the efficience for muon with 3-vector (pt, theta, phi)
@@ -62,6 +62,7 @@ Float_t AliFastMuonTrackingEff::Evaluate(Float_t pt, Float_t theta, Float_t phi)
     return eff;
 }
 
+
 AliFastMuonTrackingEff& AliFastMuonTrackingEff::operator=(const  AliFastMuonTrackingEff& rhs)
 {
 // Assignment operator

diff --git a/FASTSIM/AliFastMuonTrackingEff.h b/FASTSIM/AliFastMuonTrackingEff.h
index 087ce8b65c5e45379b63f50923750eb1bd23e9b1..450489826d0286668eb70ead1cbab94a926db4ca 100644 (file)
--- a/FASTSIM/AliFastMuonTrackingEff.h
+++ b/FASTSIM/AliFastMuonTrackingEff.h
@@ -7,7 +7,7 @@
 //
 // Class for fast simulation of the ALICE Muon Spectrometer
 // Tracking Efficiency.
-// The efficiency depends on trasverse momentum pt, polar angle theta and azimuthal angle phi.
+// The efficiency depends on transverse momentum pt, polar angle theta and azimuthal angle phi.
 //
 // Author: Alessandro de Falco 
 // alessandro.de.falco@ca.infn.it
@@ -23,15 +23,15 @@ class AliFastMuonTrackingEff :  public AliFastResponse {
     void SetBackground(Float_t bg = 1.) {fBackground = bg;}
     void SetCharge(Float_t charge = 1.) {fCharge     = charge;}
     virtual void Init();
-    virtual Float_t Evaluate(Float_t pt, Float_t theta, Float_t phi);
+    virtual Float_t Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi);
+    virtual void    Evaluate(Float_t charge, Float_t   p,  Float_t  theta , Float_t   phi,
+                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+       {AliFastResponse::Evaluate(charge, p, theta, phi, pS, thetaS, phiS);}
     virtual void    Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,
-                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS) {
-      AliFastResponse::Evaluate(p,  theta,  phi, pS, thetaS, phiS);
-    }
-    virtual Float_t Evaluate(AliFastParticle* part) {
-      return AliFastResponse::Evaluate(part);
-    }
-     // Copy
+                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+       {AliFastResponse::Evaluate(p, theta, phi, pS, thetaS, phiS);}
+    
+    // Copy
     AliFastMuonTrackingEff& operator=(const AliFastMuonTrackingEff& rhs);
  protected:
     Float_t              fBackground;   // Background level

diff --git a/FASTSIM/AliFastMuonTrackingRes.h b/FASTSIM/AliFastMuonTrackingRes.h
index 5f7ff8efee91fbb86743a57409549d09e9a8eb90..02d0641f2ca9de2b45e6fd6f6ac1b633918db1a6 100644 (file)
--- a/FASTSIM/AliFastMuonTrackingRes.h
+++ b/FASTSIM/AliFastMuonTrackingRes.h
@@ -23,15 +23,16 @@ class AliFastMuonTrackingRes :  public AliFastResponse {
     void SetBackground(Float_t bg = 1.) {fBackground = bg;}
     void SetCharge(Float_t charge = 1.) {fCharge     = charge;}
     virtual void Init();
-    virtual void Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,
-                         Float_t& pS,  Float_t& thetaS, Float_t&  phiS);
-    virtual Float_t Evaluate(AliFastParticle* part) {
-      return AliFastResponse::Evaluate(part);
-    }
-    virtual Float_t Evaluate(Float_t  pt,  Float_t  theta , Float_t   phi) {
-      return AliFastResponse::Evaluate(pt,theta,phi);
-    }
-      // Copy
+    void Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,
+                 Float_t& pS,  Float_t& thetaS, Float_t&  phiS);
+
+    void Evaluate(Float_t /*charge*/, Float_t   p,  Float_t  theta , Float_t   phi,
+                 Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+       {Evaluate(p, theta, phi, pS, thetaS, phiS);}
+    virtual Float_t Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi)
+       {return AliFastResponse::Evaluate(charge, pt, theta, phi);}
+    
+    // Copy
     AliFastMuonTrackingRes& operator=(const AliFastMuonTrackingRes & rhs);
 
  protected:

diff --git a/FASTSIM/AliFastMuonTriggerEff.h b/FASTSIM/AliFastMuonTriggerEff.h
index 536512257208c770b60a966aebbe9d7c3dbc340f..94b2689524d87433c81e0b12c2d9cb92428e5f34 100644 (file)
--- a/FASTSIM/AliFastMuonTriggerEff.h
+++ b/FASTSIM/AliFastMuonTriggerEff.h
@@ -36,7 +36,11 @@ class AliFastMuonTriggerEff : public AliFastResponse {
     virtual void    Init();
     virtual void    Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi,
                             Float_t& effLow, Float_t& effHigh, Float_t& effAny);
+    virtual void    Evaluate(Float_t pt, Float_t theta, Float_t phi,
+                            Float_t& effLow, Float_t& effHigh, Float_t& effAny)
+       {Evaluate(1., pt, theta, phi, effLow, effHigh, effAny);}
     virtual Float_t Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi);
+    
     virtual void    SetCut(Int_t cut = kLow);
     virtual Float_t Cut() const {return fCut;}
     virtual Int_t   SetBkgLevel(Float_t Bkg=0.);

diff --git a/FASTSIM/AliFastResponse.cxx b/FASTSIM/AliFastResponse.cxx
index 60331e14c2d9793bc11ee844f14e5dedb35b7098..e3191af15511f21712e5d3f6a8beaa30cdb09b6a 100644 (file)
--- a/FASTSIM/AliFastResponse.cxx
+++ b/FASTSIM/AliFastResponse.cxx
@@ -28,16 +28,24 @@
 ClassImp(AliFastResponse)
 
 
-Float_t AliFastResponse::Evaluate(AliFastParticle* part)
+Float_t AliFastResponse::Evaluate(Float_t /*charge*/, Float_t /*pt*/, Float_t /*theta*/, Float_t /*phi*/)
 {
 //
+//  Dummy implementation of this method
+// 
+    return 0.;
+}
+
+
+void AliFastResponse::Evaluate(Float_t /*charge*/, Float_t   p,  Float_t  theta , Float_t   phi,
+                              Float_t& pS,  Float_t& thetaS, Float_t&  phiS)
+{
+//    
 // Basic implementation of this method 
 //
-    Float_t theta = part->Theta();
-    Float_t phi   = part->Phi();
-    Float_t pt    = part->Pt();
-    Float_t eff   = Evaluate(pt, theta, phi);
-    return eff;
+    pS     = p;
+    thetaS = theta;
+    phiS   = phi;
 }
 
 void AliFastResponse::Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,

diff --git a/FASTSIM/AliFastResponse.h b/FASTSIM/AliFastResponse.h
index f2eed049e7c9e126a5c859d3bbbad365a2875493..97f167f05fa31be3a978b4424c6db26b8f05346c 100644 (file)
--- a/FASTSIM/AliFastResponse.h
+++ b/FASTSIM/AliFastResponse.h
@@ -21,12 +21,14 @@ class AliFastResponse : public TNamed {
     AliFastResponse(const char* Name, const char* Title): TNamed(Name, Title){}
     virtual ~AliFastResponse(){}
     virtual void    Init()                                                  = 0;
-    virtual Float_t Evaluate(Float_t  /*pt*/,  Float_t  /*theta*/ , Float_t   /*phi*/)
-       {Fatal("Evaluate","Not implemented in base class !\n"); return (-1);}
-    
+
+    virtual void    Evaluate(Float_t charge, Float_t   p,  Float_t  theta , Float_t   phi,
+                            Float_t& pS,  Float_t& thetaS, Float_t&  phiS);
     virtual void    Evaluate(Float_t   p,  Float_t  theta , Float_t   phi,
                             Float_t& pS,  Float_t& thetaS, Float_t&  phiS);
-    virtual Float_t Evaluate(AliFastParticle* part);
+ 
+    virtual Float_t Evaluate(Float_t charge, Float_t pt, Float_t theta, Float_t phi);
+ 
     void Copy(TObject&) const;
  protected:
     ClassDef(AliFastResponse,1)    // Base class for fast response