changes from saiola

diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.cxx b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.cxx
index 4ade9ae745de130639f5bef461f2cac377458ea4..9edf899b12c2b6df7bb1b39fe0758455f776ae3b 100644 (file)
--- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.cxx
+++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.cxx
@@ -35,6 +35,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() :
   fHistCentrality(0),
   fHistTracksCent(0),
   fHistClusCent(0),
+  fHistClusTracks(0),
   fHistMaxL1FastORCent(0),
   fHistMaxL1ClusCent(0),
   fHistMaxL1ThrCent(0),
@@ -43,6 +44,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA() :
   fHistTrEmcPhiEta(0),
   fHistClusPhiEtaEnergy(0),
   fHistNCellsEnergy(0),
+  fHistClusTimeEnergy(0),
   fHistCellsEnergy(0),
   fHistChVSneCells(0),
   fHistChVSneClus(0),
@@ -76,6 +78,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) :
   fHistCentrality(0),
   fHistTracksCent(0),
   fHistClusCent(0),
+  fHistClusTracks(0),
   fHistMaxL1FastORCent(0),
   fHistMaxL1ClusCent(0),
   fHistMaxL1ThrCent(0),
@@ -84,6 +87,7 @@ AliAnalysisTaskSAQA::AliAnalysisTaskSAQA(const char *name) :
   fHistTrEmcPhiEta(0),
   fHistClusPhiEtaEnergy(0),
   fHistNCellsEnergy(0),
+  fHistClusTimeEnergy(0),
   fHistCellsEnergy(0),
   fHistChVSneCells(0),
   fHistChVSneClus(0),
@@ -132,12 +136,22 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
   fHistTracksCent->GetYaxis()->SetTitle("No. of tracks");
   fOutput->Add(fHistTracksCent);
 
-  if (fAnaType == kEMCAL) {
+  if (fAnaType == kEMCAL || fAnaType == kEMCALOnly) {
     fHistClusCent = new TH2F("fHistClusCent","Clusters vs. centrality", 100, 0, 100, fNbins, 0, 2000);
     fHistClusCent->GetXaxis()->SetTitle("Centrality (%)");
     fHistClusCent->GetYaxis()->SetTitle("No. of clusters");
     fOutput->Add(fHistClusCent);
-    
+
+    fHistClusTracks = new TH2F("fHistClusTracks","Clusters vs. tracks", fNbins, 0, 4000, fNbins, 0, 2000);
+    fHistClusTracks->GetXaxis()->SetTitle("No. of tracks");
+    fHistClusTracks->GetYaxis()->SetTitle("No. of clusters");
+    fOutput->Add(fHistClusTracks);
+
+    fHistClusTimeEnergy = new TH2F("fHistClusTimeEnergy","Time vs. energy of clusters", fNbins, fMinBinPt, fMaxBinPt, fNbins,  0, 1e-6);
+    fHistClusTimeEnergy->GetXaxis()->SetTitle("Energy (GeV)");
+    fHistClusTimeEnergy->GetYaxis()->SetTitle("Time");
+    fOutput->Add(fHistClusTimeEnergy);
+
     if (fDoTrigger) {
       fHistMaxL1FastORCent = new TH2F("fHistMaxL1FastORCent","fHistMaxL1ClusCent", 100, 0, 100, 250, 0, 250);
       fHistMaxL1FastORCent->GetXaxis()->SetTitle("Centrality [%]");
@@ -171,7 +185,7 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
   fHistTrEmcPhiEta->GetYaxis()->SetTitle("#phi");
   fOutput->Add(fHistTrEmcPhiEta);
 
-  if (fAnaType == kEMCAL) {
+  if (fAnaType == kEMCAL || fAnaType == kEMCALOnly) {
     fHistClusPhiEtaEnergy = new TH3F("fHistClusPhiEtaEnergy","Phi-Eta-Energy distribution of clusters", fNbins, fMinBinPt, fMaxBinPt, 80, -2, 2, 128, 0, 6.4);
     fHistClusPhiEtaEnergy->GetXaxis()->SetTitle("E [GeV]");
     fHistClusPhiEtaEnergy->GetYaxis()->SetTitle("#eta");
@@ -184,7 +198,7 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
     fOutput->Add(fHistNCellsEnergy);
   }
 
-  if (fAnaType == kEMCAL) {
+  if (fAnaType == kEMCAL || fAnaType == kEMCALOnly) {
    
     fHistCellsEnergy = new TH1F("fHistCellsEnergy","Energy spectrum of cells", fNbins, fMinBinPt, fMaxBinPt);
     fHistCellsEnergy->GetXaxis()->SetTitle("E [GeV]");
@@ -262,7 +276,7 @@ void AliAnalysisTaskSAQA::UserCreateOutputObjects()
       fHistJetsPtTrack[i]->GetYaxis()->SetTitle("counts");
       fOutput->Add(fHistJetsPtTrack[i]);
 
-      if (fAnaType == kEMCAL) {
+      if (fAnaType == kEMCAL || fAnaType == kEMCALOnly) {
        histname = "fHistJetsPtClus_";
        histname += i;
        fHistJetsPtClus[i] = new TH1F(histname.Data(), histname.Data(), fNbins * 2.5, fMinBinPt, fMaxBinPt * 2.5);
@@ -335,11 +349,14 @@ Bool_t AliAnalysisTaskSAQA::FillHistograms()
   if (fCaloClusters)
     fHistClusCent->Fill(fCent, fCaloClusters->GetEntriesFast());
 
+  if (fTracks && fCaloClusters)
+    fHistClusTracks->Fill(fTracks->GetEntriesFast(), fCaloClusters->GetEntriesFast());
+
   Float_t trackSum = DoTrackLoop();
 
   DoJetLoop();
 
-  if (fAnaType == kEMCAL) {
+  if (fAnaType == kEMCAL || fAnaType == kEMCALOnly) {
     Float_t clusSum = DoClusterLoop();
 
     Float_t cellSum = 0, cellCutSum = 0;
@@ -422,6 +439,8 @@ Float_t AliAnalysisTaskSAQA::DoClusterLoop()
 
     fHistClusPhiEtaEnergy->Fill(cluster->E(), nPart.Eta(), nPart.Phi());
     fHistNCellsEnergy->Fill(cluster->E(), cluster->GetNCells());
+
+    fHistClusTimeEnergy->Fill(cluster->E(), cluster->GetTOF());
   }
 
   return sum;

diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
index 42afdef61495c3dbaa2d9a2b5124d3bcbf77ae46..4938d8a02c675679c9623532ca95c5df453d4c63 100644 (file)
--- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
+++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAQA.h
@@ -44,6 +44,7 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   TH1F                       *fHistCentrality;         //!Event centrality distribution
   TH2F                       *fHistTracksCent;         //!Number of tracks vs. centrality
   TH2F                       *fHistClusCent;           //!Number of clusters vs. centrality
+  TH2F                       *fHistClusTracks;         //!Number of clusters vs. number of tracks
 
   TH2F                       *fHistMaxL1FastORCent;    //!Maximum L1 trigger FastOR amplitude vs. centrality
   TH2F                       *fHistMaxL1ClusCent;      //!Maximum L1 trigger cluster amplitude vs. centrality
@@ -55,7 +56,8 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
 
   TH3F                       *fHistClusPhiEtaEnergy;     //!Phi-Eta-Energy distribution of clusters
   TH2F                       *fHistNCellsEnergy;         //!Number of cells vs. energy of cluster
-
+  TH2F                       *fHistClusTimeEnergy;       //!Time vs. energy of cluster
+  
   TH3F                       *fHistJetsPhiEtaPt[4];      //!Phi-Eta-Pt distribution of jets
   TH1F                       *fHistJetsPtNonBias[4];     //!Non biased inclusive jet pt spectrum
   TH1F                       *fHistJetsPtClus[4];        //!Inclusive jet pt spectrum cluster biased
@@ -77,6 +79,6 @@ class AliAnalysisTaskSAQA : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskSAQA(const AliAnalysisTaskSAQA&);            // not implemented
   AliAnalysisTaskSAQA &operator=(const AliAnalysisTaskSAQA&); // not implemented
 
-  ClassDef(AliAnalysisTaskSAQA, 8) // Quality task for Emcal analysis
+  ClassDef(AliAnalysisTaskSAQA, 9) // Quality task for Emcal analysis
 };
 #endif

diff --git a/PWGGA/EMCALJetTasks/macros/AddTaskSAJF.C b/PWGGA/EMCALJetTasks/macros/AddTaskSAJF.C
index 9cca3c7e7d737ca993f3d53644f879412ad776ae..8c78580757f9c8623661810c8319a8840083c169 100644 (file)
--- a/PWGGA/EMCALJetTasks/macros/AddTaskSAJF.C
+++ b/PWGGA/EMCALJetTasks/macros/AddTaskSAJF.C
@@ -59,6 +59,8 @@ AliAnalysisTaskSAJF* AddTaskSAJF(
     name += "EMCAL";
   else if (type == AliAnalysisTaskEmcal::kTPCSmall) 
     name += "TPCSmall";
+  else if (type == AliAnalysisTaskEmcal::kEMCALOnly) 
+    name += "EMCALOnly";
   AliAnalysisTaskSAJF* jetTask = new AliAnalysisTaskSAJF(name);
   jetTask->SetAnaType(type);
   jetTask->SetTracksName(ntracks);

diff --git a/PWGGA/EMCALJetTasks/macros/AddTaskSAQA.C b/PWGGA/EMCALJetTasks/macros/AddTaskSAQA.C
index c591fcbac7dfa62e294d5dbdac97f7a63c23c161..c8f5f527da64e753b46b01db5f26ebfdf704d785 100644 (file)
--- a/PWGGA/EMCALJetTasks/macros/AddTaskSAQA.C
+++ b/PWGGA/EMCALJetTasks/macros/AddTaskSAQA.C
@@ -53,6 +53,8 @@ AliAnalysisTaskSAQA* AddTaskSAQA(
     name += "EMCAL";
   else if (type == AliAnalysisTaskEmcal::kTPCSmall) 
     name += "TPCSmall";
+  else if (type == AliAnalysisTaskEmcal::kEMCALOnly) 
+    name += "EMCALOnly";
   AliAnalysisTaskSAQA* qaTask = new AliAnalysisTaskSAQA(name);
   qaTask->SetTracksName(ntracks);
   qaTask->SetClusName(nclusters);

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx
index 5d343226cf9911fa997937c14600fb8d7ef5f20d..18771beddd494ba6295027fc636e01ec17c79a07 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.cxx
@@ -38,6 +38,8 @@ AliAnalysisTaskEmcal::AliAnalysisTaskEmcal() :
   fMaxBinPt(250),
   fClusPtCut(0.15),
   fTrackPtCut(0.15),
+  fClusTimeCutLow(0.50e-6),
+  fClusTimeCutUp(0.66e-6),
   fTracks(0),
   fCaloClusters(0),
   fCent(0),
@@ -65,6 +67,8 @@ AliAnalysisTaskEmcal::AliAnalysisTaskEmcal(const char *name, Bool_t histo) :
   fMaxBinPt(250),
   fClusPtCut(0.15),
   fTrackPtCut(0.15),
+  fClusTimeCutLow(0.50e-6),
+  fClusTimeCutUp(0.66e-6),
   fTracks(0),
   fCaloClusters(0),
   fCent(0),
@@ -129,6 +133,9 @@ Bool_t AliAnalysisTaskEmcal::AcceptCluster(AliVCluster *clus, Bool_t acceptMC) c
   if (!acceptMC && clus->Chi2() == 100)
     return kFALSE;
 
+  if (clus->GetTOF() > fClusTimeCutUp || clus->GetTOF() < fClusTimeCutLow)
+    return kFALSE;
+
   TLorentzVector nPart;
   clus->GetMomentum(nPart, const_cast<Double_t*>(fVertex));
 

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.h b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.h
index c4908a0d09f41659b1dbb3a3c2ec8d02589b6433..447123760720e2cd3031df4e6afad385103f034c 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEmcal.h
@@ -43,6 +43,7 @@ class AliAnalysisTaskEmcal : public AliAnalysisTaskSE {
   void                        SetPtCut(Float_t cut)                                { SetClusPtCut(cut); SetTrackPtCut(cut); }
   void                        SetTrackPtCut(Float_t cut)                           { fTrackPtCut     = cut        ; }
   void                        SetTracksName(const char *n)                         { fTracksName     = n          ; }
+  void                        SetClusTimeCut(Float_t min, Float_t max)             { fClusTimeCutLow = min; fClusTimeCutUp = max; }
 
  protected:
   virtual void                ExecOnce()                                                                    ;
@@ -66,6 +67,8 @@ class AliAnalysisTaskEmcal : public AliAnalysisTaskSE {
   Float_t                     fMaxBinPt;                   // max pt in histograms
   Float_t                     fClusPtCut;                  // cut on cluster pt
   Float_t                     fTrackPtCut;                 // cut on track pt
+  Float_t                     fClusTimeCutLow;             // low time cut for clusters
+  Float_t                     fClusTimeCutUp;              // up time cut for clusters
   TClonesArray               *fTracks;                     //!tracks
   TClonesArray               *fCaloClusters;               //!clusters
   Float_t                     fCent;                       //!event centrality