X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STEER%2FSTEERBase%2FAliTRDPIDResponse.h;h=f1c079ba56642f75707605a470c963db8031e6ce;hp=53d90de4a7e920c8711a81231978607e32c0588c;hb=db0e2c5f7ecb63300fd90881a5a3969dfc91d2aa;hpb=ce487a7fe3b8a370df8aded503494b3d734e0dac

diff --git a/STEER/STEERBase/AliTRDPIDResponse.h b/STEER/STEERBase/AliTRDPIDResponse.h
index 53d90de4a7e..f1c079ba566 100644
--- a/STEER/STEERBase/AliTRDPIDResponse.h
+++ b/STEER/STEERBase/AliTRDPIDResponse.h
@@ -30,22 +30,25 @@
 
 class TObjArray;
 class AliVTrack;
-class AliTRDPIDParams;
-class AliTRDPIDReference;
+class AliTRDPIDResponseObject;
+
 class AliTRDPIDResponse : public TObject {
   public:
     enum ETRDPIDResponseStatus {
       kIsOwner = BIT(14)
     };
     enum ETRDPIDResponseDef {
-      kNlayer = 6
-      ,kNPBins = 6
+	kNlayer = 6
+	,kNPBins = 6
     };
     enum ETRDPIDMethod {
       kNN   = 0,
       kLQ2D = 1,
       kLQ1D = 2
     };
+    enum ETRDPIDNMethod {
+	kNMethod=3
+    };
     enum ETRDNslices {
       kNslicesLQ1D = 1,
       kNslicesLQ2D = 2,
@@ -65,19 +68,18 @@ class AliTRDPIDResponse : public TObject {
     void      SetOwner();
     void      SetPIDmethod(ETRDPIDMethod m) {fPIDmethod=m;}
     void      SetGainNormalisationFactor(Double_t gainFactor) { fGainNormalisationFactor = gainFactor; }
-    void      SetPIDParams(const AliTRDPIDParams * params) { fkPIDParams = params; }
 
-    Bool_t    Load(const Char_t *filename = NULL, const Char_t *refName = "RefTRDLQ1D");
-    Bool_t    Load(const AliTRDPIDReference *ref) { fkPIDReference = ref; return kTRUE; }
+    Bool_t    SetPIDResponseObject(const AliTRDPIDResponseObject * obj) { fkPIDResponseObject = obj; return kTRUE;}
+
+    Bool_t    Load(const Char_t *filename = NULL);
   
     Bool_t    IdentifiedAsElectron(Int_t nTracklets, const Double_t *like, Double_t p, Double_t level) const;
   
   private:
     Bool_t    CookdEdx(Int_t nSlice, const Double_t * const in, Double_t *out) const;
-    Double_t  GetProbabilitySingleLayer(Int_t species, Double_t plocal, Double_t dEdx) const;
+    Double_t  GetProbabilitySingleLayer(Int_t species, Double_t plocal, Double_t *dEdx) const;
     
-    const AliTRDPIDReference *fkPIDReference;   // PID References
-    const AliTRDPIDParams *fkPIDParams;         // PID Params
+    const AliTRDPIDResponseObject *fkPIDResponseObject;   // PID References and Params
     Double_t  fGainNormalisationFactor;         // Gain normalisation factor
     ETRDPIDMethod   fPIDmethod;                 // PID method selector
       
@@ -96,3 +98,4 @@ AliTRDPIDResponse::ETRDNslices AliTRDPIDResponse::GetNumberOfSlices() const {
   return slices;
 }
 #endif
+