From 41f87d5908731291d9d452f61090d8a82bad4a25 Mon Sep 17 00:00:00 2001 From: loizides Date: Thu, 13 Sep 2012 10:32:31 +0000 Subject: [PATCH] update from Megan --- .../UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx | 26 +++++++++++++++---- .../UserTasks/AliAnalysisTaskEmcalJetHMEC.h | 4 ++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx index 2ac55667b5c..7d67cff7cf5 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.cxx @@ -73,6 +73,8 @@ AliAnalysisTaskEmcalJetHMEC::AliAnalysisTaskEmcalJetHMEC() : for(Int_t icent = 0; icent<6; ++icent){ fHistJetPt[icent]=0; fHistJetPtBias[icent]=0; + fHistLeadJetPt[icent]=0; + fHistLeadJetPtBias[icent]=0; fHistJetPtTT[icent]=0; for(Int_t iptjet = 0; iptjet<5; ++iptjet){ for(Int_t ieta = 0; ieta<3; ++ieta){ @@ -117,6 +119,8 @@ AliAnalysisTaskEmcalJetHMEC::AliAnalysisTaskEmcalJetHMEC(const char *name) : for(Int_t icent = 0; icent<6; ++icent){ fHistJetPt[icent]=0; fHistJetPtBias[icent]=0; + fHistLeadJetPt[icent]=0; + fHistLeadJetPtBias[icent]=0; fHistJetPtTT[icent]=0; for(Int_t iptjet = 0; iptjet<5; ++iptjet){ for(Int_t ieta = 0; ieta<3; ++ieta){ @@ -179,6 +183,14 @@ void AliAnalysisTaskEmcalJetHMEC::UserCreateOutputObjects() fHistJetPtBias[icent] = new TH1F(name,name,200,0,200); fOutputList->Add(fHistJetPtBias[icent]); + sprintf(name,"fHistLeadJetPt_%i",icent); + fHistLeadJetPt[icent] = new TH1F(name,name,200,0,200); + fOutputList->Add(fHistLeadJetPt[icent]); + + sprintf(name,"fHistLeadJetPtBias_%i",icent); + fHistLeadJetPtBias[icent] = new TH1F(name,name,200,0,200); + fOutputList->Add(fHistLeadJetPtBias[icent]); + sprintf(name,"fHistJetPtTT_%i",icent); fHistJetPtTT[icent] = new TH1F(name,name,200,0,200); fOutputList->Add(fHistJetPtTT[icent]); @@ -445,11 +457,17 @@ void AliAnalysisTaskEmcalJetHMEC::UserExec(Option_t *) Double_t jetPt = jet->Pt(); Double_t jeteta=jet->Eta(); + Double_t leadjet=0; + if (ijet==ijethi) leadjet=1; + + fHistJetPt[centbin]->Fill(jet->Pt()); + fHistLeadJetPt[centbin]->Fill(jet->Pt()); - if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)) + if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)){ fHistJetPtBias[centbin]->Fill(jet->Pt()); - + fHistLeadJetPtBias[centbin]->Fill(jet->Pt()); + } fHistJetEtaPhi->Fill(jet->Eta(),jetphi); @@ -508,8 +526,6 @@ void AliAnalysisTaskEmcalJetHMEC::UserExec(Option_t *) if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)){ fHistJetHBias[centbin][iptjet][ieta]->Fill(dphijh,trackpt); - Double_t leadjet=0; - if (ijet==ijethi) leadjet=1; Double_t triggerEntries[8] = {fcent,jetPt,track->Pt(),dR,deta,dphijh,0.0,leadjet}; fhnJH->Fill(triggerEntries); @@ -533,7 +549,7 @@ void AliAnalysisTaskEmcalJetHMEC::UserExec(Option_t *) Double_t fvertex[3]={0,0,0}; InputEvent()->GetPrimaryVertex()->GetXYZ(fvertex); - Double_t zVtx=fvertex[3]; + Double_t zVtx=fvertex[2]; if(fDoEventMixing>0){ diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.h index 58129fdb690..965591a26f1 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.h +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHMEC.h @@ -75,6 +75,8 @@ class AliAnalysisTaskEmcalJetHMEC : public AliAnalysisTaskSE { TH1 *fHistJetPt[6]; TH1 *fHistJetPtBias[6]; + TH1 *fHistLeadJetPt[6]; + TH1 *fHistLeadJetPtBias[6]; TH1 *fHistJetPtTT[6]; TH2 *fHistJetH[6][5][3]; TH2 *fHistJetHBias[6][5][3]; @@ -87,6 +89,6 @@ class AliAnalysisTaskEmcalJetHMEC : public AliAnalysisTaskSE { AliAnalysisTaskEmcalJetHMEC(const AliAnalysisTaskEmcalJetHMEC&); // not implemented AliAnalysisTaskEmcalJetHMEC& operator=(const AliAnalysisTaskEmcalJetHMEC&); // not implemented - ClassDef(AliAnalysisTaskEmcalJetHMEC, 9); + ClassDef(AliAnalysisTaskEmcalJetHMEC, 10); }; #endif -- 2.43.5