Improvements in the GlobalQA

diff --git a/PWG1/global/AliAnalysisTaskGlobalQA.cxx b/PWG1/global/AliAnalysisTaskGlobalQA.cxx
index d104f542b6ad4f9844fbff4b0259cc2fcef9e795..ea23659747ffb78ec2aae51f8512642d5e367651 100644 (file)
--- a/PWG1/global/AliAnalysisTaskGlobalQA.cxx
+++ b/PWG1/global/AliAnalysisTaskGlobalQA.cxx
@@ -63,6 +63,16 @@ void AliAnalysisTaskGlobalQA::UserCreateOutputObjects()
   fArrayQA = new TObjArray(kLast);
 
 
+  {// Event related QA
+    const Char_t *name[]={
+      "hGlobalPrimaryVertex"
+    };
+    const Char_t *title[]={
+      "Z-distribution of the primary vertex"
+    };
+    Add2ESDsList(new TH1F(name[0],title[0],100,-20.,20.),kEvt0);
+  }
+ 
   {// Cluster related QA
     const Char_t *name[]={
       "hGlobalFractionAssignedClustersITS",
@@ -190,6 +200,16 @@ void AliAnalysisTaskGlobalQA::UserExec(Option_t *)
     return;
   }
 
+  // Event related QA
+  const AliESDVertex *vtx=esd->GetPrimaryVertex();
+  if (!vtx->GetStatus()) return;
+
+  Double_t xv=vtx->GetXv();
+  Double_t yv=vtx->GetYv();
+  Double_t zv=vtx->GetZv();
+  GetESDsData(kEvt0)->Fill(zv);
+
+
   for (Int_t iTracks = 0; iTracks < esd->GetNumberOfTracks(); iTracks++) {
       AliESDtrack* track = esd->GetTrack(iTracks);
       if (!track) {
@@ -232,7 +252,7 @@ void AliAnalysisTaskGlobalQA::UserExec(Option_t *)
     // Track related QA
     if (track->IsOn(AliESDtrack::kTPCrefit)) {
       Float_t dz[2]; 
-      track->GetDZ(0.,0.,0.,esd->GetMagneticField(),dz); 
+      track->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz); 
       if ((TMath::Abs(dz[0])<3.) && (TMath::Abs(dz[1])<3.)) { // beam pipe
         Double_t phi=track->Phi();
        GetESDsData(kTrk0)->Fill(phi);
@@ -251,10 +271,6 @@ void AliAnalysisTaskGlobalQA::UserExec(Option_t *)
     const AliExternalTrackParam *innTrack=track->GetInnerParam();
     if (tpcTrack)
     if (innTrack) {
-       const AliESDVertex *vtx=esd->GetPrimaryVertex();
-       Double_t xv=vtx->GetXv();
-       Double_t yv=vtx->GetYv();
-       Double_t zv=vtx->GetZv();
        Float_t dz[2];
        tpcTrack->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz);
        dz[0]*=10.; // in mm
@@ -282,11 +298,17 @@ void AliAnalysisTaskGlobalQA::UserExec(Option_t *)
       }
     }
     if (p>1.0) {
-      if (track->IsOn(AliESDtrack::kTOFpid)) {
-        Double_t times[10];
-        track->GetIntegratedTimes(times);
-        Double_t tof=track->GetTOFsignal();
-        GetESDsData(kPid2)->Fill(times[2]-tof);
+      if (track->IsOn(AliESDtrack::kITSrefit))
+      if (track->IsOn(AliESDtrack::kTPCrefit))
+      if (track->IsOn(AliESDtrack::kTOFout)) {
+         Float_t dz[2];
+         track->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz);
+         if (dz[1]<3.) {
+            Double_t times[10];
+            track->GetIntegratedTimes(times);
+            Double_t tof=track->GetTOFsignal()/*-847055 -1771207*/;
+            GetESDsData(kPid2)->Fill(times[2]-tof);
+        }
       }
     }
     const AliExternalTrackParam *par=track->GetInnerParam();
@@ -318,6 +340,14 @@ void AliAnalysisTaskGlobalQA::UserExec(Option_t *)
     Double_t mass;
     AliESDv0 v0(*esd->GetV0(i));
 
+    Int_t nidx=TMath::Abs(v0.GetNindex());
+    AliESDtrack *ntrack1=esd->GetTrack(nidx);
+    if (!ntrack1->IsOn(AliESDtrack::kTPCrefit)) continue;
+
+    Int_t pidx=TMath::Abs(v0.GetPindex());
+    AliESDtrack *ptrack1=esd->GetTrack(pidx);
+    if (!ptrack1->IsOn(AliESDtrack::kTPCrefit)) continue;
+
     v0.ChangeMassHypothesis(kK0Short);
     mass=v0.GetEffMass();
     if (v0.GetOnFlyStatus())

diff --git a/PWG1/global/AliAnalysisTaskGlobalQA.h b/PWG1/global/AliAnalysisTaskGlobalQA.h
index 9abbd2a58cf45b031ee0c5800e66513f4ffc230c..7a85c95438d1615ed6053302376a33f69bd015e5 100644 (file)
--- a/PWG1/global/AliAnalysisTaskGlobalQA.h
+++ b/PWG1/global/AliAnalysisTaskGlobalQA.h
@@ -15,6 +15,7 @@
 class AliAnalysisTaskGlobalQA : public AliAnalysisTaskSE {
 public:
   enum {
+    kEvt0,
     kClr0,kClr1,kClr2,kClr3,
     kTrk0,kTrk1,kTrk2,kTrk3,kTrk4,kTrk5,kTrk6,kTrk7,kTrk8,kTrk9,kTrk10,
     kK0on,kK0off,kL0on,kL0off,

diff --git a/STEER/AliGlobalQADataMaker.cxx b/STEER/AliGlobalQADataMaker.cxx
index 64c5dc1cb654ebc54f36843c45c70c51fea7073f..5b79f7751fa4a7d4b27965bc9a0486065dbe454b 100644 (file)
--- a/STEER/AliGlobalQADataMaker.cxx
+++ b/STEER/AliGlobalQADataMaker.cxx
@@ -192,8 +192,19 @@ void AliGlobalQADataMaker::InitESDs() {
   //------------------------------------------------------
 
   const Bool_t expert   = kTRUE ; 
-  const Bool_t image    = kTRUE ; 
- {// Cluster related QA
+  const Bool_t image    = kTRUE ;
+
+  {// Event related QA
+    const Char_t *name[]={
+      "hGlobalPrimaryVertex"
+    };
+    const Char_t *title[]={
+      "Z-distribution of the primary vertex"
+    };
+    Add2ESDsList(new TH1F(name[0],title[0],100,-20.,20.),kEvt0,!expert,image);
+  }
+ 
+  {// Cluster related QA
     const Char_t *name[]={
       "hGlobalFractionAssignedClustersITS",
       "hGlobalFractionAssignedClustersTPC",
@@ -323,6 +334,16 @@ void AliGlobalQADataMaker::MakeESDs(AliESDEvent * event) {
 
   const AliESDEvent *esd=event;
 
+  // Event related QA
+  const AliESDVertex *vtx=esd->GetPrimaryVertex();
+  if (!vtx->GetStatus()) return;
+
+  Double_t xv=vtx->GetXv();
+  Double_t yv=vtx->GetYv();
+  Double_t zv=vtx->GetZv();
+  GetESDsData(kEvt0)->Fill(zv);
+
+
   Int_t ntrk=esd->GetNumberOfTracks() ; 
   for (Int_t i=0; i<ntrk; i++) {
     const AliESDtrack *track=esd->GetTrack(i);
@@ -361,7 +382,7 @@ void AliGlobalQADataMaker::MakeESDs(AliESDEvent * event) {
     // Track related QA
     if (track->IsOn(AliESDtrack::kTPCrefit)) {
       Float_t dz[2]; 
-      track->GetDZ(0.,0.,0.,esd->GetMagneticField(),dz); 
+      track->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz); 
       if ((TMath::Abs(dz[0])<3.) && (TMath::Abs(dz[1])<3.)) { // beam pipe
         Double_t phi=track->Phi();
        GetESDsData(kTrk0)->Fill(phi);
@@ -380,10 +401,6 @@ void AliGlobalQADataMaker::MakeESDs(AliESDEvent * event) {
     const AliExternalTrackParam *innTrack=track->GetInnerParam();
     if (tpcTrack)
     if (innTrack) {
-       const AliESDVertex *vtx=esd->GetPrimaryVertex();
-       Double_t xv=vtx->GetXv();
-       Double_t yv=vtx->GetYv();
-       Double_t zv=vtx->GetZv();
        Float_t dz[2];
        tpcTrack->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz);
        dz[0]*=10.; // in mm
@@ -411,11 +428,17 @@ void AliGlobalQADataMaker::MakeESDs(AliESDEvent * event) {
       }
     }
     if (p>1.0) {
-      if (track->IsOn(AliESDtrack::kTOFpid)) {
-        Double_t times[10];
-        track->GetIntegratedTimes(times);
-        Double_t tof=track->GetTOFsignal();
-        GetESDsData(kPid2)->Fill(times[2]-tof);
+      if (track->IsOn(AliESDtrack::kITSrefit))
+      if (track->IsOn(AliESDtrack::kTPCrefit))
+      if (track->IsOn(AliESDtrack::kTOFout)) {
+         Float_t dz[2];
+         track->GetDZ(xv,yv,zv,esd->GetMagneticField(),dz);
+         if (dz[1]<3.) {
+            Double_t times[10];
+            track->GetIntegratedTimes(times);
+            Double_t tof=track->GetTOFsignal()/*-847055 -1771207*/;
+            GetESDsData(kPid2)->Fill(times[2]-tof);
+        }
       }
     }
     const AliExternalTrackParam *par=track->GetInnerParam();
@@ -455,6 +478,14 @@ void AliGlobalQADataMaker::MakeESDs(AliESDEvent * event) {
     Double_t mass;
     AliESDv0 v0(*esd->GetV0(i));
 
+    Int_t nidx=TMath::Abs(v0.GetNindex());
+    AliESDtrack *ntrack1=esd->GetTrack(nidx);
+    if (!ntrack1->IsOn(AliESDtrack::kTPCrefit)) continue;
+
+    Int_t pidx=TMath::Abs(v0.GetPindex());
+    AliESDtrack *ptrack1=esd->GetTrack(pidx);
+    if (!ptrack1->IsOn(AliESDtrack::kTPCrefit)) continue;
+
     v0.ChangeMassHypothesis(kK0Short);
     mass=v0.GetEffMass();
     if (v0.GetOnFlyStatus())

diff --git a/STEER/AliGlobalQADataMaker.h b/STEER/AliGlobalQADataMaker.h
index fd69b1063b95f65ffcfa1d72bbaeaf45c1ba2de0..9e13f68144dd9d09b414cc288d1d51290035c1ab 100644 (file)
--- a/STEER/AliGlobalQADataMaker.h
+++ b/STEER/AliGlobalQADataMaker.h
@@ -15,6 +15,7 @@ class AliESDEvent;
 class AliGlobalQADataMaker: public AliQADataMakerRec {
 public:
   enum {
+    kEvt0,
     kClr0,kClr1,kClr2,kClr3,
     kTrk0,kTrk1,kTrk2,kTrk3,kTrk4,kTrk5,kTrk6,kTrk7,kTrk8,kTrk9,kTrk10,
     kK0on,kK0off,kL0on,kL0off,