Use abstract inteface for the calibration components using tracks

Implementation of the task which use the the Calibration components
AliAnaTPCTrackCalib

diff --git a/TPC/AliAnaTPCTrackCalib.cxx b/TPC/AliAnaTPCTrackCalib.cxx
index 70bd5ec80545156b8f1deb04d04eaa260b4bd9b7..b8c33ffc7d8df42512d10d8b4b0343e5a644b104 100644 (file)
--- a/TPC/AliAnaTPCTrackCalib.cxx
+++ b/TPC/AliAnaTPCTrackCalib.cxx
@@ -103,7 +103,7 @@ Int_t AliAnaTPCTrackCalib::FillTrackHistograms(Int_t nTracks, AliESDtrack* track
   \r
    if (seed) {\r
       fNClusters->Fill(seed->GetNumberOfClusters());\r
-      fCalibTracks->Process(seed, track);   // analysis is done in fCalibTracks\r
+      fCalibTracks->Process(seed);   // analysis is done in fCalibTracks\r
    }\r
  \r
   return 1;\r

diff --git a/TPC/AliTPCSelectorTracks.cxx b/TPC/AliTPCSelectorTracks.cxx
index e5be8e5bb5b08b1f9a3575749f9321fb95464a70..edb674cfb1ac62754811b23f3f6299c9ef3ec69b 100644 (file)
--- a/TPC/AliTPCSelectorTracks.cxx
+++ b/TPC/AliTPCSelectorTracks.cxx
@@ -182,7 +182,7 @@ Int_t AliTPCSelectorTracks::ProcessIn(Long64_t entry)
       if (seed) {
          fNClusters->Fill(seed->GetNumberOfClusters());
          //
-         fCalibTracks->Process(seed, esdTrack);   // analysis is done in fCalibTracks
+         fCalibTracks->Process(seed);   // analysis is done in fCalibTracks
          fCalibTracksGain->Process(seed);
       }
    }

diff --git a/TPC/AliTPCcalibBase.h b/TPC/AliTPCcalibBase.h
index 4b4c7764e08d4e0c80bbc237442906483ea60451..7a1278e0b6a79431f739260cebfa8f673b8e5668 100644 (file)
--- a/TPC/AliTPCcalibBase.h
+++ b/TPC/AliTPCcalibBase.h
@@ -10,14 +10,14 @@
 
 #include "TNamed.h"
 class AliTPCseed;
-class AliESDevent;
+class AliESDEvent;
 class TCollection;
 
 class AliTPCcalibBase:public TNamed {
 public:
   AliTPCcalibBase(); 
   virtual ~AliTPCcalibBase();
-  virtual void     Process(AliESDevent */*event*/){return;}
+  virtual void     Process(AliESDEvent */*event*/){return;}
   virtual void     Process(AliTPCseed */*track*/){return;}
   virtual Long64_t Merge(TCollection */*li*/){return 0;}
   virtual void     Analyze(){return;}

diff --git a/TPC/AliTPCcalibTracks.cxx b/TPC/AliTPCcalibTracks.cxx
index 78685d118c4d55cef6d9d9d65c7205361b839196..ea5582d78327158f3860a87fb14ec2771a4f9e9f 100644 (file)
--- a/TPC/AliTPCcalibTracks.cxx
+++ b/TPC/AliTPCcalibTracks.cxx
@@ -102,7 +102,7 @@ ClassImp(AliTPCcalibTracks)
 
 
 AliTPCcalibTracks::AliTPCcalibTracks():
-  TNamed(),
+  AliTPCcalibBase(),
   fClusterParam(0),
   fDebugStream(0),
   fROC(0),
@@ -145,7 +145,7 @@ AliTPCcalibTracks::AliTPCcalibTracks():
 
 
 AliTPCcalibTracks::AliTPCcalibTracks(const AliTPCcalibTracks& calibTracks):
-TNamed(),
+  AliTPCcalibBase(),
   fClusterParam(0),
   fDebugStream(0),
   fROC(0),
@@ -260,7 +260,7 @@ AliTPCcalibTracks & AliTPCcalibTracks::operator=(const AliTPCcalibTracks& calibT
 
 
 AliTPCcalibTracks::AliTPCcalibTracks(const Text_t *name, const Text_t *title, AliTPCClusterParam *clusterParam,  AliTPCcalibTracksCuts* cuts, Int_t logLevel) : 
-  TNamed(name, title),
+  AliTPCcalibBase(),
   fClusterParam(0),
   fDebugStream(0),
   fROC(0),
@@ -304,6 +304,9 @@ AliTPCcalibTracks::AliTPCcalibTracks(const Text_t *name, const Text_t *title, Al
    // 
    // All histograms are instatiated in this constructor.
    // 
+   this->SetName(name);
+   this->SetTitle(title);
+
    if (fDebugLevel > 0) cout << " ***** this is AliTPCcalibTracks' main constructor ***** " << endl;
    G__SetCatchException(0);     
    
@@ -543,8 +546,7 @@ void AliTPCcalibTracks::AddInfo(TChain * chain, char* fileName){
    cout << "Clusterparametrization added to the chain." << endl;
 }
 
-   
-void AliTPCcalibTracks::Process(AliTPCseed *track, AliESDtrack */*esd*/){
+void AliTPCcalibTracks::Process(AliTPCseed *track){
    // 
    // To be called in the selector
    // first AcceptTrack is evaluated, then calls all the following analyse functions: 

diff --git a/TPC/AliTPCcalibTracks.h b/TPC/AliTPCcalibTracks.h
index 34e4e60ab1b6e47ec9ac44a31ad8fbd065972092..f14a827b2f5f1467d023885c8814146712fc72f4 100644 (file)
--- a/TPC/AliTPCcalibTracks.h
+++ b/TPC/AliTPCcalibTracks.h
@@ -19,7 +19,7 @@
 
 
 
-#include <TNamed.h>
+#include <AliTPCcalibBase.h>
 class TF2;
 class TH3F;
 class TH1F;
@@ -43,7 +43,7 @@ class TMutex;
 
 using namespace std;
 
-class AliTPCcalibTracks : public TNamed {
+class AliTPCcalibTracks : public AliTPCcalibBase {
 public :
    AliTPCcalibTracks();                         // default constructor
   AliTPCcalibTracks(const AliTPCcalibTracks&calibTracks); // copy constructor
@@ -53,7 +53,7 @@ public :
    virtual ~AliTPCcalibTracks();                // destructor
    
    static void     AddInfo(TChain *chain, char *fileName);        // add clusterParametrization as user info to the chain
-   void            Process(AliTPCseed *track, AliESDtrack *esd);  // to be called by the Selector
+   void            Process(AliTPCseed *track);  // to be called by the Selector
    
    Int_t           AcceptTrack(AliTPCseed * track);
    void            FillResolutionHistoLocal(AliTPCseed * track);  // the MAIN-FUNCTION, called for each track to fill the histograms, called by Process(...)

diff --git a/TPC/TPCcalibLinkDef.h b/TPC/TPCcalibLinkDef.h
index 45642a0a8acc00e8f0c8393a2de2094726b541a8..56e38e340b1e45edd128903bdea28bdafb37bfb4 100644 (file)
--- a/TPC/TPCcalibLinkDef.h
+++ b/TPC/TPCcalibLinkDef.h
@@ -24,6 +24,7 @@
 #pragma link C++ class  AliTPCcalibAlign+;
 #pragma link C++ class  AliTPCcalibAlignment+;
 #pragma link C++ class  AliTPCcalibV0+;
+#pragma link C++ class  AliTPCAnalysisTaskcalib+;
 #pragma link C++ class AliTPCCalibKr+;
 
 #endif

diff --git a/TPC/libTPCcalib.pkg b/TPC/libTPCcalib.pkg
index 48d981cd86a1c8d7c7527c816bdcc90958524f48..c6af906e688875b9f062de57bc0dfbee5a97dd98 100644 (file)
--- a/TPC/libTPCcalib.pkg
+++ b/TPC/libTPCcalib.pkg
@@ -1,7 +1,7 @@
 #-*- Mode: Makefile -*-
 
 SRCS = AliTPCcalibTracksCuts.cxx   AliTPCcalibTracks.cxx   AliTPCcalibTracksGain.cxx  \
-        AliTPCSelectorESD.cxx   AliTPCSelectorTracks.cxx   AliTPCCalPadRegion.cxx AliTPCFitPad.cxx AliAnaTPCTrackBase.cxx AliAnaTPCTrackCalib.cxx AliTPCcalibAlign.cxx AliTPCcalibAlignment.cxx  AliTPCcalibV0.cxx AliTPCCalibKr.cxx AliTPCcalibBase.cxx 
+        AliTPCSelectorESD.cxx   AliTPCSelectorTracks.cxx   AliTPCCalPadRegion.cxx AliTPCFitPad.cxx AliAnaTPCTrackBase.cxx AliAnaTPCTrackCalib.cxx AliTPCcalibAlign.cxx AliTPCcalibAlignment.cxx  AliTPCcalibV0.cxx AliTPCCalibKr.cxx AliTPCcalibBase.cxx AliTPCAnalysisTaskcalib.cxx 
 
 HDRS:= $(SRCS:.cxx=.h)