- Fix compilation warning

- extend base class interface

diff --git a/TRD/qaRec/AliTRDrecoTask.cxx b/TRD/qaRec/AliTRDrecoTask.cxx
index b04fc1e884b6b122284bff6e74c54ba49be790ca..6019cc11f51182ff2a11538c0f9fb3a667588ece 100644 (file)
--- a/TRD/qaRec/AliTRDrecoTask.cxx
+++ b/TRD/qaRec/AliTRDrecoTask.cxx
@@ -107,7 +107,7 @@ void AliTRDrecoTask::InitFunctorList()
     TString name(m->GetName());
     if(!name.BeginsWith("Plot")) continue;
     if(!fPlotFuncList) fPlotFuncList = new TList();
-    fPlotFuncList->AddLast(new TMethodCall(c, (const char*)name, "const AliTRDtrackV1*"));
+    fPlotFuncList->AddLast(new TMethodCall(c, (const char*)name, ""));
     printf("%s%s\n", m->GetName(), m->GetSignature());
   }
 }

diff --git a/TRD/qaRec/AliTRDrecoTask.h b/TRD/qaRec/AliTRDrecoTask.h
index c331afb12cbe861e46f76422eac222607dac38ae..d6ebd0c452fe06bfc7ea84686a83bd33a767733f 100644 (file)
--- a/TRD/qaRec/AliTRDrecoTask.h
+++ b/TRD/qaRec/AliTRDrecoTask.h
@@ -41,6 +41,7 @@ public:
   Bool_t         HasFriends() const {return TestBit(kFriends);};
   Bool_t         HasMCdata() const {return TestBit(kMCdata);};
   Bool_t         HasPostProcess() const {return TestBit(kPostProcess);};
+  virtual TObjArray* Histos() {return fContainer;}
 
   virtual Bool_t Load(const Char_t *filename);
   virtual Bool_t PostProcess();

diff --git a/TRD/qaRec/AliTRDtrackingResolution.cxx b/TRD/qaRec/AliTRDtrackingResolution.cxx
index a2e511e94050d1002ebdfbe7a9c60985d20a3a93..836d8647b42942780661933835aa1ecd943b4f86 100644 (file)
--- a/TRD/qaRec/AliTRDtrackingResolution.cxx
+++ b/TRD/qaRec/AliTRDtrackingResolution.cxx
@@ -115,36 +115,6 @@ void AliTRDtrackingResolution::CreateOutputObjects()
   OpenFile(0, "RECREATE");
 
   fContainer = Histos();
-
-  // cluster to tracklet residuals [2]
-  fContainer->AddAt(new TH2I("fYClRes", "Clusters Residuals", 21, -21., 21., 100, -.5, .5), kClusterResidual);
-//   // tracklet to Riemann fit residuals [2]
-//   fContainer->AddAt(new TH2I("fYTrkltRRes", "Tracklet Riemann Residuals", 21, -21., 21., 100, -.5, .5), kTrackletRiemanYResidual);
-//   fContainer->AddAt(new TH2I("fAngleTrkltRRes", "Tracklet Riemann Angular Residuals", 21, -21., 21., 100, -.5, .5), kTrackletRiemanAngleResidual);
-//   fContainer->AddAt(new TH2I("fYTrkltKRes", "Tracklet Kalman Residuals", 21, -21., 21., 100, -.5, .5), kTrackletKalmanYResidual);
-//   fContainer->AddAt(new TH2I("fAngleTrkltKRes", "Tracklet Kalman Angular Residuals", 21, -21., 21., 100, -.5, .5), kTrackletKalmanAngleResidual);
-
-  // Resolution histos
-  if(HasMCdata()){
-    // cluster y resolution [0]
-    fContainer->AddAt(new TH2I("fCY", "Cluster Resolution", 31, -31., 31., 100, -.5, .5), kClusterResolution);
-    // tracklet y resolution [0]
-    fContainer->AddAt(new TH2I("fY", "Tracklet Resolution", 31, -31., 31., 100, -.5, .5), kTrackletYResolution);
-    // tracklet y resolution [0]
-    fContainer->AddAt(new TH2I("fY", "Tracklet Resolution", 31, -31., 31., 100, -.5, .5), kTrackletZResolution);
-    // tracklet angular resolution [1]
-    fContainer->AddAt(new TH2I("fPhi", "Tracklet Angular Resolution", 31, -31., 31., 100, -10., 10.), kTrackletAngleResolution);
-
-//     // Riemann track resolution [y, z, angular]
-//     fContainer->AddAt(new TH2I("fYRT", "Track Riemann Y Resolution", 21, -21., 21., 100, -.5, .5), kTrackRYResolution);
-//     fContainer->AddAt(new TH2I("fZRT", "Track Riemann Z Resolution", 21, -21., 21., 100, -.5, .5), kTrackRZResolution);
-//     fContainer->AddAt(new TH2I("fPhiRT", "Track Riemann Angular Resolution", 21, -21., 21., 100, -10., 10.), kTrackRAngleResolution);
-// 
-//     Kalman track resolution [y, z, angular]
-//     fContainer->AddAt(new TH2I("fYKT", "", 21, -21., 21., 100, -.5, .5), kTrackKYResolution);
-//     fContainer->AddAt(new TH2I("fZKT", "", 21, -21., 21., 100, -.5, .5), kTrackKZResolution);
-//     fContainer->AddAt(new TH2I("fPhiKT", "", 21, -21., 21., 100, -10., 10.), kTrackKAngleResolution);
-  }
 }
 
 // //________________________________________________________
@@ -500,7 +470,7 @@ TH1* AliTRDtrackingResolution::PlotResolution(const AliTRDtrackV1 *track)
 
     Int_t istk = AliTRDgeometry::GetStack(det); 
     AliTRDpadPlane *pp = fGeo->GetPadPlane(ily, istk);
-    Float_t z0 = pp->GetRow0() + AliTRDSimParam::Instance()->GetAnodeWireOffset();
+    Float_t zr0 = pp->GetRow0() + AliTRDSimParam::Instance()->GetAnodeWireOffset();
     Float_t tilt = fTracklet->GetTilt();
 
     AliTRDcluster *c = 0x0;
@@ -520,7 +490,7 @@ TH1* AliTRDtrackingResolution::PlotResolution(const AliTRDtrackV1 *track)
       
       // Fill Debug Tree
       if(fDebugLevel>=1){
-        Float_t d = z0 - zt;
+        Float_t d = zr0 - zt;
         d -= ((Int_t)(2 * d)) / 2.0;
         if (d > 0.25) d  = 0.5 - d;
   
@@ -819,7 +789,39 @@ void AliTRDtrackingResolution::AdjustF1(TH1 *h, TF1 *f)
 //________________________________________________________
 TObjArray* AliTRDtrackingResolution::Histos()
 {
-  if(!fContainer) fContainer  = new TObjArray(5);
+  if(fContainer) return fContainer;
+
+  fContainer  = new TObjArray(5);
+
+  // cluster to tracklet residuals [2]
+  fContainer->AddAt(new TH2I("fYClRes", "Clusters Residuals", 21, -21., 21., 100, -.5, .5), kClusterResidual);
+//   // tracklet to Riemann fit residuals [2]
+//   fContainer->AddAt(new TH2I("fYTrkltRRes", "Tracklet Riemann Residuals", 21, -21., 21., 100, -.5, .5), kTrackletRiemanYResidual);
+//   fContainer->AddAt(new TH2I("fAngleTrkltRRes", "Tracklet Riemann Angular Residuals", 21, -21., 21., 100, -.5, .5), kTrackletRiemanAngleResidual);
+//   fContainer->AddAt(new TH2I("fYTrkltKRes", "Tracklet Kalman Residuals", 21, -21., 21., 100, -.5, .5), kTrackletKalmanYResidual);
+//   fContainer->AddAt(new TH2I("fAngleTrkltKRes", "Tracklet Kalman Angular Residuals", 21, -21., 21., 100, -.5, .5), kTrackletKalmanAngleResidual);
+
+  // Resolution histos
+  if(HasMCdata()){
+    // cluster y resolution [0]
+    fContainer->AddAt(new TH2I("fCY", "Cluster Resolution", 31, -31., 31., 100, -.5, .5), kClusterResolution);
+    // tracklet y resolution [0]
+    fContainer->AddAt(new TH2I("fY", "Tracklet Resolution", 31, -31., 31., 100, -.5, .5), kTrackletYResolution);
+    // tracklet y resolution [0]
+    fContainer->AddAt(new TH2I("fY", "Tracklet Resolution", 31, -31., 31., 100, -.5, .5), kTrackletZResolution);
+    // tracklet angular resolution [1]
+    fContainer->AddAt(new TH2I("fPhi", "Tracklet Angular Resolution", 31, -31., 31., 100, -10., 10.), kTrackletAngleResolution);
+
+//     // Riemann track resolution [y, z, angular]
+//     fContainer->AddAt(new TH2I("fYRT", "Track Riemann Y Resolution", 21, -21., 21., 100, -.5, .5), kTrackRYResolution);
+//     fContainer->AddAt(new TH2I("fZRT", "Track Riemann Z Resolution", 21, -21., 21., 100, -.5, .5), kTrackRZResolution);
+//     fContainer->AddAt(new TH2I("fPhiRT", "Track Riemann Angular Resolution", 21, -21., 21., 100, -10., 10.), kTrackRAngleResolution);
+// 
+//     Kalman track resolution [y, z, angular]
+//     fContainer->AddAt(new TH2I("fYKT", "", 21, -21., 21., 100, -.5, .5), kTrackKYResolution);
+//     fContainer->AddAt(new TH2I("fZKT", "", 21, -21., 21., 100, -.5, .5), kTrackKZResolution);
+//     fContainer->AddAt(new TH2I("fPhiKT", "", 21, -21., 21., 100, -10., 10.), kTrackKAngleResolution);
+  }
   return fContainer;
 }
 

diff --git a/TRD/qaRec/AliTRDtrackingResolution.h b/TRD/qaRec/AliTRDtrackingResolution.h
index eb7c82d05ee68eb27e006c8147d256993a084ef5..7c14dd1b4497279e661f8dc53cb756ffa778e485 100644 (file)
--- a/TRD/qaRec/AliTRDtrackingResolution.h
+++ b/TRD/qaRec/AliTRDtrackingResolution.h
@@ -54,6 +54,7 @@ public:
   void    CreateOutputObjects();
   //void    Exec(Option_t *);
   void    GetRefFigure(Int_t ifig);
+  TObjArray*  Histos(); 
   Bool_t  IsVerbose() const {return TESTBIT(fStatus, kVerbose);}
   Bool_t  IsVisual() const {return TESTBIT(fStatus, kVisual);}
   Bool_t  PostProcess();
@@ -71,7 +72,6 @@ private:
   AliTRDtrackingResolution(const AliTRDtrackingResolution&);
   AliTRDtrackingResolution& operator=(const AliTRDtrackingResolution&);
   void        AdjustF1(TH1 *h, TF1 *f);
-  TObjArray*  Histos(); 
 
 private:
   UChar_t               fStatus;          // steer parameter of the task