From c32da87924a459f46841c6e2f09acf834b1db1a2 Mon Sep 17 00:00:00 2001 From: marian Date: Thu, 24 Apr 2008 16:02:33 +0000 Subject: [PATCH] Use abstract inteface for the calibration components using tracks Implementation of the task which use the the Calibration components AliAnaTPCTrackCalib --- TPC/AliAnaTPCTrackCalib.cxx | 2 +- TPC/AliTPCSelectorTracks.cxx | 2 +- TPC/AliTPCcalibBase.h | 4 ++-- TPC/AliTPCcalibTracks.cxx | 12 +++++++----- TPC/AliTPCcalibTracks.h | 6 +++--- TPC/TPCcalibLinkDef.h | 1 + TPC/libTPCcalib.pkg | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/TPC/AliAnaTPCTrackCalib.cxx b/TPC/AliAnaTPCTrackCalib.cxx index 70bd5ec8054..b8c33ffc7d8 100644 --- a/TPC/AliAnaTPCTrackCalib.cxx +++ b/TPC/AliAnaTPCTrackCalib.cxx @@ -103,7 +103,7 @@ Int_t AliAnaTPCTrackCalib::FillTrackHistograms(Int_t nTracks, AliESDtrack* track if (seed) { fNClusters->Fill(seed->GetNumberOfClusters()); - fCalibTracks->Process(seed, track); // analysis is done in fCalibTracks + fCalibTracks->Process(seed); // analysis is done in fCalibTracks } return 1; diff --git a/TPC/AliTPCSelectorTracks.cxx b/TPC/AliTPCSelectorTracks.cxx index e5be8e5bb5b..edb674cfb1a 100644 --- 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 4b4c7764e08..7a1278e0b6a 100644 --- 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 78685d118c4..ea5582d7832 100644 --- 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 34e4e60ab1b..f14a827b2f5 100644 --- a/TPC/AliTPCcalibTracks.h +++ b/TPC/AliTPCcalibTracks.h @@ -19,7 +19,7 @@ -#include +#include 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 45642a0a8ac..56e38e340b1 100644 --- 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 48d981cd86a..c6af906e688 100644 --- 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) -- 2.31.1