-Added separeate dXY and dZ histograms

-Removed dR histogram

diff --git a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
index 3ed61bb7fe8331d81936e969fb6cf7a2b9941d0e..718a4f18c8682a4a49e2e4cba6f0dd17aaa2c77a 100644 (file)
--- a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
+++ b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.cxx
@@ -38,18 +38,13 @@
 #include "TString.h"
 
 AliHLTCaloHistoMatchedTracks::AliHLTCaloHistoMatchedTracks(TString det) :
-  fHistMatchDistance(NULL),
+  fHistDxy(NULL),
+  fHistDz(NULL),
   fHistDxyDz(NULL),
   fHistMatchedEnergy(NULL),
   fHistUnMatchedEnergy(NULL)
 {
 
-  fHistMatchDistance = new TH1F( Form("%s_fHistMatchDistance", det.Data()), Form("%s Track - Cluster residuals (cm)", det.Data()), 50, 0, 50);
-  fHistMatchDistance->GetXaxis()->SetTitle("Distance (cm)");
-  fHistMatchDistance->GetYaxis()->SetTitle("Count");
-  fHistMatchDistance->SetMarkerStyle(21);
-  fHistArray->AddLast(fHistMatchDistance);
-
   fHistMatchedEnergy = new TH1F( Form("%s_fHistMatchedEnergy", det.Data()), Form("%s Energy distribution of clusters with matching tracks", det.Data()), 5000, 0, 100);
   fHistMatchedEnergy->GetXaxis()->SetTitle("Cluster Energy (GeV)");
   fHistMatchedEnergy->GetYaxis()->SetTitle("Number of clusters");
@@ -66,19 +61,22 @@ AliHLTCaloHistoMatchedTracks::AliHLTCaloHistoMatchedTracks(TString det) :
   fHistDxyDz = new TH2F( Form("%s_fHistdXYdZ", det.Data()), Form("%s dXY - dZ distribution of track - cluster residuals", det.Data()), 50, -50, 50, 50, -50, 50);
   fHistDxyDz->GetXaxis()->SetTitle("sqrt(dx^2 + dy^2)  (cm)");
   fHistDxyDz->GetYaxis()->SetTitle("dz (cm)");
-  //fHistDxyDz->SetMarkerStyle(21);
   fHistArray->AddLast(fHistDxyDz);
 
+  fHistDxy = new TH1F( Form("%s_fHistdXY", det.Data()), Form("%s #sqrt(dx^2 + dy^2)", det.Data()), 100, -50, 50);
+  fHistDxy->GetXaxis()->SetTitle("sqrt(dx^2 + dy^2)  (cm)");
+  fHistArray->AddLast(fHistDxy);
+                      
+  fHistDz = new TH1F( Form("%s_fHistdZ", det.Data()), Form("%s dZ", det.Data()),100, -50, 50);
+  fHistDz->GetXaxis()->SetTitle("dZ (cm)");
+  fHistArray->AddLast(fHistDz);
+
 }
 
 
 AliHLTCaloHistoMatchedTracks::~AliHLTCaloHistoMatchedTracks()
 {
 
-  if(fHistMatchDistance)
-    delete fHistMatchDistance;
-  fHistMatchDistance = NULL;
-
   if(fHistMatchedEnergy) 
     delete fHistMatchedEnergy;
   fHistMatchedEnergy = NULL;
@@ -91,6 +89,14 @@ AliHLTCaloHistoMatchedTracks::~AliHLTCaloHistoMatchedTracks()
     delete fHistDxyDz;
   fHistDxyDz = NULL;
 
+  if (fHistDxy) 
+    delete fHistDxy;
+  fHistDxy = NULL;
+
+  if (fHistDz) 
+    delete fHistDz;
+  fHistDz = NULL;
+
 }
   
 
@@ -117,7 +123,8 @@ Int_t AliHLTCaloHistoMatchedTracks::FillMatchedTracks(T* cluster){
 
   if(cluster->GetNTracksMatched() > 0) {
     fHistMatchedEnergy->Fill(cluster->E());
-    fHistMatchDistance->Fill(cluster->GetEmcCpvDistance());
+    fHistDz->Fill(cluster->GetTrackDz());
+    fHistDxy->Fill(cluster->GetTrackDx());
     fHistDxyDz->Fill(cluster->GetTrackDx(), cluster->GetTrackDz());
   } else {
     fHistUnMatchedEnergy->Fill(cluster->E());

diff --git a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.h b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.h
index 6d419243eb44fc2a2d6cbd2b7aa06173921cf46f..e33abe253708ecb0e7a00cf2fbadb13913ef26a5 100644 (file)
--- a/HLT/global/physics/AliHLTCaloHistoMatchedTracks.h
+++ b/HLT/global/physics/AliHLTCaloHistoMatchedTracks.h
@@ -80,7 +80,8 @@ class AliHLTCaloHistoMatchedTracks : public AliHLTCaloHistoProducer {
   AliHLTCaloHistoMatchedTracks & operator= (const AliHLTCaloHistoMatchedTracks);
 
   /** Histograms of the track - cluster residuals */
-  TH1F *fHistMatchDistance;                  //!transient
+  TH1F *fHistDxy;                  //!transient
+  TH1F *fHistDz;                  //!transient
   TH2F *fHistDxyDz;                           //!transient
   
   /** Histograms of the energy distribution of mached and unmatched clusters */