put clusters from fast clusterizer in separate branch (don't toch orig

clusters in ESD/AOD)

increase class def

diff --git a/PWG/EMCAL/AliAnalysisTaskEMCALClusterizeFast.cxx b/PWG/EMCAL/AliAnalysisTaskEMCALClusterizeFast.cxx
index 6a78c619aefccc1ca8cb4aa20e3b761c024b9815..8bb0f2cddc5311fbb01be452fa46c74cb5bdf12c 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEMCALClusterizeFast.cxx
+++ b/PWG/EMCAL/AliAnalysisTaskEMCALClusterizeFast.cxx
@@ -245,7 +245,7 @@ void AliAnalysisTaskEMCALClusterizeFast::UserExec(Option_t *)
   if (fDoClusterize)
     Clusterize();
 
-  if (fDoUpdateCells) 
+  if (fDoUpdateCells)
     UpdateCells();
 
   if (!fDoClusterize || (!fAttachClusters && !fOutputAODBranch) || !fCaloClusters)
@@ -256,6 +256,7 @@ void AliAnalysisTaskEMCALClusterizeFast::UserExec(Option_t *)
 
   if (fOutputAODBranch && fCaloClusters != fOutputAODBranch)
     CopyClusters(fCaloClusters, fOutputAODBranch);
+
 }
 
 //________________________________________________________________________

diff --git a/PWG/EMCAL/macros/AddTaskEmcalPreparation.C b/PWG/EMCAL/macros/AddTaskEmcalPreparation.C
index db3d240de2966699900b54d1101bd8ade7b4bc6e..f43b1105a38c3533488230c030cd5be9be551997 100644 (file)
--- a/PWG/EMCAL/macros/AddTaskEmcalPreparation.C
+++ b/PWG/EMCAL/macros/AddTaskEmcalPreparation.C
@@ -58,11 +58,12 @@ AliAnalysisTaskSE *AddTaskEmcalPreparation(const char *perstr  = "LHC11h",
   //----------------------- Add clusterizer -------------------------------------------------------
   clusterizer    = AliEMCALRecParam::kClusterizerv2;
   remExoticCell  = kTRUE;
+  TString tmpClusters = "tmpCaloClusters";
   gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskClusterizerFast.C");
-  AliAnalysisTaskEMCALClusterizeFast *clusterizerTask = AddTaskClusterizerFast("ClusterizerFast","","",clusterizer,cellthresh,seedthresh,
+  AliAnalysisTaskEMCALClusterizeFast *clusterizerTask = AddTaskClusterizerFast("ClusterizerFast","",tmpClusters.Data(),clusterizer,cellthresh,seedthresh,
                                                                               timeMin,timeMax,timeCut,remExoticCell,distBC,
                                                                               AliAnalysisTaskEMCALClusterizeFast::kFEEData);
-
+  
   //----------------------- Add cluster maker -----------------------------------------------------
   gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEmcalClusterMaker.C"); //cluster maker: non-linearity, 
   UInt_t nonLinFunct = AliEMCALRecoUtils::kBeamTestCorrected;
@@ -73,7 +74,8 @@ AliAnalysisTaskSE *AddTaskEmcalPreparation(const char *perstr  = "LHC11h",
       nonLinFunct = AliEMCALRecoUtils::kPi0MCv3;
   }
   remExoticClus  = kTRUE;
-  AliEmcalClusterMaker *clusMaker = AddTaskEmcalClusterMaker(nonLinFunct,remExoticClus,0,"EmcCaloClusters",0.,kTRUE);
+  AliEmcalClusterMaker *clusMaker = AddTaskEmcalClusterMaker(nonLinFunct,remExoticClus,tmpClusters.Data(),"EmcCaloClusters",0.,kTRUE);
   
   return clusterizerTask;
+  
 }

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.cxx
index c4ee78c121266a4f33b823b415ee877bc02ea9ed..503bd06f1ee09ec4f97b05ba7a70b436b43dca4e 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.cxx
@@ -39,6 +39,8 @@ AliAnalysisTaskEmcalJetSample::AliAnalysisTaskEmcalJetSample() :
   fHistJetsCorrPtArea(0),
   fHistPtDEtaDPhiTrackClus(0),
   fHistPtDEtaDPhiClusTrack(0),
+  fHistClustDx(0),
+  fHistClustDz(0),
   fJetsCont(0),
   fTracksCont(0),
   fCaloClustersCont(0)
@@ -79,6 +81,8 @@ AliAnalysisTaskEmcalJetSample::AliAnalysisTaskEmcalJetSample(const char *name) :
   fHistJetsCorrPtArea(0),
   fHistPtDEtaDPhiTrackClus(0),
   fHistPtDEtaDPhiClusTrack(0),
+  fHistClustDx(0),
+  fHistClustDz(0),
   fJetsCont(0),
   fTracksCont(0),
   fCaloClustersCont(0)
@@ -200,6 +204,12 @@ void AliAnalysisTaskEmcalJetSample::UserCreateOutputObjects()
   fHistPtDEtaDPhiClusTrack = new TH3F(histname.Data(),Form("%s;#it{p}_{T}^{clus};#Delta#eta;#Delta#varphi",histname.Data()),100,0.,100.,100,-0.1,0.1,100,-0.1,0.1);
   fOutput->Add(fHistPtDEtaDPhiClusTrack);
 
+  fHistClustDx = new TH1F("fHistClustDx","fHistClustDx;Dx",1000,0.,1.);
+  fOutput->Add(fHistClustDx);
+
+  fHistClustDz = new TH1F("fHistClustDz","fHistClustDz;Dz",1000,0.,1.);
+  fOutput->Add(fHistClustDz);
+
   PostData(1, fOutput); // Post data for ALL output slots > 0 here.
 }
 
@@ -215,14 +225,17 @@ Bool_t AliAnalysisTaskEmcalJetSample::FillHistograms()
       track = static_cast<AliVTrack*>(fTracksCont->GetNextAcceptParticle());
     }
   }
-  
+
   if (fCaloClustersCont) {
     AliVCluster *cluster = fCaloClustersCont->GetNextAcceptCluster(0); 
     while(cluster) {
       TLorentzVector nPart;
       cluster->GetMomentum(nPart, fVertex);
       fHistClustersPt[fCentBin]->Fill(nPart.Pt());
-
+      Double_t dx = cluster->GetTrackDx();
+      Double_t dz = cluster->GetTrackDz();
+      fHistClustDx->Fill(dx);
+      fHistClustDz->Fill(dz);
       cluster = fCaloClustersCont->GetNextAcceptCluster();
     }
   }

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.h
index bd759de697f03e68d5b1e42661003063031a8ac8..bd8c03088d07a51d23badf2dee2e06b2602b3808 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetSample.h
@@ -39,6 +39,9 @@ class AliAnalysisTaskEmcalJetSample : public AliAnalysisTaskEmcalJet {
   TH3                        *fHistPtDEtaDPhiTrackClus; //!track pt, delta eta, delta phi to matched cluster
   TH3                        *fHistPtDEtaDPhiClusTrack; //!cluster pt, delta eta, delta phi to matched track
 
+  TH1                        *fHistClustDx; //!
+  TH1                        *fHistClustDz; //!
+
   AliJetContainer            *fJetsCont;                   //!Jets
   AliParticleContainer       *fTracksCont;                 //!Tracks
   AliClusterContainer        *fCaloClustersCont;           //!Clusters  
@@ -47,6 +50,6 @@ class AliAnalysisTaskEmcalJetSample : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskEmcalJetSample(const AliAnalysisTaskEmcalJetSample&);            // not implemented
   AliAnalysisTaskEmcalJetSample &operator=(const AliAnalysisTaskEmcalJetSample&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalJetSample, 3) // jet sample analysis task
+  ClassDef(AliAnalysisTaskEmcalJetSample, 4) // jet sample analysis task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
index ef38d39e9d9bf8c3c1ed65ff2cf2f4bbca174aba..9ff33d56e5a049250c369f844af07c85e792db56 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
@@ -56,7 +56,7 @@ AliAnalysisTaskEmcalJetSample* AddTaskEmcalJetSample(
   jetTask->SetNCentBins(nCentBins);
 
   AliParticleContainer *trackCont  = jetTask->AddParticleContainer(ntracks);
-  trackCont->SetClassName("AliVTrack");
+  if(trackCont) trackCont->SetClassName("AliVTrack");
   AliClusterContainer *clusterCont = jetTask->AddClusterContainer(nclusters);
 
   TString strType(type);