Cannot wait for the fix -- better do it myself

[u/mrichter/AliRoot.git] / PWG3 / hfe / AliHFEpidBase.h

diff --git a/PWG3/hfe/AliHFEpidBase.h b/PWG3/hfe/AliHFEpidBase.h
index 720e8fb8218b3f98ebfd3acdd4198e09cb96b8ad..c03c1f977661b87f77579434cd5401b778484459 100644 (file)
--- a/PWG3/hfe/AliHFEpidBase.h
+++ b/PWG3/hfe/AliHFEpidBase.h
@@ -19,59 +19,20 @@
 #ifndef ALIHFEPIDBASE_H
 #define ALIHFEPIDBASE_H
  
- #ifndef ROOT_TNamed
- #include <TNamed.h>
- #endif
+#ifndef ROOT_TNamed
+#include <TNamed.h>
+#endif
+
+#ifndef ALIHFEPIDOBJECT_H
+#include "AliHFEpidObject.h"
+#endif
 
 class TList;
-class AliAODpidUtil;
-class AliESDpid;
+class AliPIDResponse;
 class AliVParticle;
 class AliMCParticle;
 class AliHFEpidQAmanager;
 
-class AliHFEpidObject{
-  public:
-    typedef enum{ 
-      kESDanalysis,
-      kAODanalysis
-    }AnalysisType_t;
-    AliHFEpidObject():
-      fkRecTrack(NULL), 
-      fAnalysisType(kESDanalysis),
-      fAbInitioPID(-1),
-      fCentrality(99.)
-      {
-      }
-    AliHFEpidObject(const AliHFEpidObject &ref):
-      fkRecTrack(ref.fkRecTrack), 
-      fAnalysisType(ref.fAnalysisType),
-      fAbInitioPID(ref.fAbInitioPID),
-      fCentrality(ref.fCentrality)
-      {
-      }
-    AliHFEpidObject &operator=(const AliHFEpidObject &ref);
-    ~AliHFEpidObject(){};
-
-    void SetRecTrack(const AliVParticle * recTrack) {fkRecTrack = recTrack; }
-    void SetMCTrack(const AliVParticle * mcTrack);
-    void SetAnalysisType(AnalysisType_t type) { fAnalysisType = type; }
-    void SetAbInitioPID(Int_t abInitioPID) { fAbInitioPID = abInitioPID; }
-    void SetCentrality(Float_t centrality) { fCentrality = centrality; }
-
-    const AliVParticle *GetRecTrack() const { return fkRecTrack; }
-    Int_t GetAbInitioPID() const { return fAbInitioPID; }
-    Float_t GetCentrality() const { return fCentrality; }
-    Bool_t IsAODanalysis() const { return fAnalysisType == static_cast<UChar_t>(kAODanalysis); }
-    Bool_t IsESDanalysis() const { return fAnalysisType == static_cast<UChar_t>(kESDanalysis); }
-
-  private:
-    const AliVParticle *fkRecTrack;    // Reconstructed track
-    UChar_t fAnalysisType;      // Analysis Mode (ESD or AOD)
-    Int_t fAbInitioPID;         // AbInitio PID
-    Float_t fCentrality;        // Centrality Information
-};
-
 class AliHFEpidBase : public TNamed{
   public:
     AliHFEpidBase();
@@ -80,18 +41,18 @@ class AliHFEpidBase : public TNamed{
     AliHFEpidBase &operator=(const AliHFEpidBase &c);
     virtual ~AliHFEpidBase() {};
     // Framework functions that have to be implemented by the detector PID classes
-    virtual Bool_t InitializePID() = 0;
-    virtual Int_t IsSelected(AliHFEpidObject *track, AliHFEpidQAmanager *pidqa = NULL) = 0;
+    virtual Bool_t InitializePID(Int_t run) = 0;
+    virtual Int_t IsSelected(const AliHFEpidObject *track, AliHFEpidQAmanager *pidqa = NULL) const = 0;
 
     Bool_t HasMCData() const { return TestBit(kHasMCData); };
 
-    void SetESDpid(AliESDpid * const pid) { fESDpid = pid; }
-    void SetAODpid(AliAODpidUtil * const pid) { fAODpid = pid; }
+    void SetPIDResponse(const AliPIDResponse * const pid) { fkPIDResponse = pid; }
     void SetHasMCData(Bool_t hasMCdata = kTRUE) { SetBit(kHasMCData,hasMCdata); };
 
+    const AliPIDResponse *GetPIDResponse() const { return fkPIDResponse; }; 
+
   protected:
-    AliESDpid *fESDpid;                         // ESD PID object
-    AliAODpidUtil *fAODpid;                     // AOD PID object
+    const AliPIDResponse *fkPIDResponse;        //! PID Response
     void Copy(TObject &ref) const;
 
   private: