modified the task to use Branches which are generated by JetTask like as UA1 and...

diff --git a/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx b/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx
index 006351f4fcfc18c69916ee7066679b289e8c5834..a8adf825be81e64ea91a2e033dcad7e6517559cf 100755 (executable)
--- a/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx
@@ -106,7 +106,7 @@ ClassImp(AliAnalysisTaskCheckSingleTrackJetRejection)
                                                                fH1jetAKT04_pt           [j]=0;
 
                                                                fH2jetMCAKT04_Eratio       [j]=0;
-                                                               fH1jetMCAKT04_match        [j]=0;
+                                                               fH1jetMCAKT04_ptmatch        [j]=0;
                                }
 
                                // Default constructor
@@ -147,7 +147,7 @@ AliAnalysisTaskCheckSingleTrackJetRejection::AliAnalysisTaskCheckSingleTrackJetR
                                                                fH1jetAKT04_pt           [j]=0;
 
                                                                fH2jetMCAKT04_Eratio       [j]=0;
-                                                               fH1jetMCAKT04_match        [j]=0;
+                                                               fH1jetMCAKT04_ptmatch        [j]=0;
                                }
 
                                // Constructor
@@ -182,13 +182,13 @@ void AliAnalysisTaskCheckSingleTrackJetRejection::UserCreateOutputObjects()
                                                                for(int j=0;j<6;j++){
                                                                                                histname = Form("fH1jetMCAKT04_pt%d",j);
                                                                                                fH1jetMCAKT04_pt[j] = new TH1F(histname,histname,200,0,200);
-                                                                                               histname = Form("fH2jetAKT04_pt%d",j);
+                                                                                               histname = Form("fH1jetAKT04_pt%d",j);
                                                                                                fH1jetAKT04_pt[j] = new TH1F(histname,histname,200,0,200);
 
                                                                                                histname = Form("fH2jetMCAKT04_Eratio%d",j);
                                                                                                fH2jetMCAKT04_Eratio[j] = new TH2F(histname,histname,200,0,200,100,0,30);
-                                                                                               histname = Form("fH1jetMCAKT04_match%d",j);
-                                                                                               fH1jetMCAKT04_match[j] = new TH1F(histname,histname,200,0,200);
+                                                                                               histname = Form("fH1jetMCAKT04_ptmatch%d",j);
+                                                                                               fH1jetMCAKT04_ptmatch[j] = new TH1F(histname,histname,200,0,200);
                                                                }
                                                                fHistList->Add(fH1Xsec);
                                                                fHistList->Add(fH1Trials);
@@ -198,7 +198,7 @@ void AliAnalysisTaskCheckSingleTrackJetRejection::UserCreateOutputObjects()
                                                                                                fHistList->Add(fH1jetAKT04_pt[j]);
                                                                                                fHistList->Add(fH1jetMCAKT04_pt[j]);
                                                                                                fHistList->Add(fH2jetMCAKT04_Eratio[j]);
-                                                                                               fHistList->Add(fH1jetMCAKT04_match[j]);
+                                                                                               fHistList->Add(fH1jetMCAKT04_ptmatch[j]);
                                                                }
                                }
                                else    {
@@ -206,7 +206,7 @@ void AliAnalysisTaskCheckSingleTrackJetRejection::UserCreateOutputObjects()
                                                                histname = Form("fH2jetAKT04_Jetpt_maxpt");
                                                                fH2jetAKT04_Jetpt_maxpt = new TH2F(histname,histname,400,0,400,400,0,400);
                                                                for(int j=0;j<6;j++){
-                                                                                               histname = Form("fH2jetAKT04_pt%d",j);
+                                                                                               histname = Form("fH1jetAKT04_pt%d",j);
                                                                                                fH1jetAKT04_pt[j] = new TH1F(histname,histname,200,0,200);
                                                                }
                                                                fHistList->Add(fH1Events);
@@ -495,7 +495,7 @@ void AliAnalysisTaskCheckSingleTrackJetRejection::UserExec(Option_t *)
                                                                                                if(TMath::Abs(Jet_eta[0][njetMC])<eta_cut_Jet){
                                                                                                                                for(int cut=0;cut<6;cut++){
                                                                                                                                                                if(fFIND[cut][njetMC]==true){
-                                                                                                                                                                                               fH1jetMCAKT04_match[cut]->Fill(Jet_pt[0][njetMC]);
+                                                                                                                                                                                               fH1jetMCAKT04_ptmatch[cut]->Fill(Jet_pt[0][njetMC]);
                                                                                                                                                                                                fH2jetMCAKT04_Eratio[cut]->Fill(Jet_pt[0][njetMC],Jet_pt[1][nearrecID[njetMC]]/Jet_pt[0][njetMC]);
                                                                                                                                                                }
                                                                                                                                }

diff --git a/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.h b/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.h
index 82bf4fc90f569c813b9ef0d2a4e1450914c0fa0e..1f7d37bcb900fa9d020fd2e1496dee33e8045419 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.h
+++ b/PWGJE/UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.h
@@ -102,7 +102,7 @@ class AliAnalysisTaskCheckSingleTrackJetRejection : public AliAnalysisTaskSE
                TH2F         *fH2jetAKT04_Jetpt_maxpt  ;\r
 \r
                TH2F         *fH2jetMCAKT04_Eratio       [6];\r
-               TH1F         *fH1jetMCAKT04_match        [6];\r
+               TH1F         *fH1jetMCAKT04_ptmatch        [6];\r
 \r
 \r
 \r

diff --git a/PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx b/PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
index daa2ea28412b61666a392ec56902bb652c4b80be..5e180e09dabed11ca040aa1114c7f1c50bd53407 100755 (executable)
--- a/PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
@@ -622,7 +622,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
 \r
                                AliInputEventHandler* inputHandler = (AliInputEventHandler*)\r
                                                                ((AliAnalysisManager::GetAnalysisManager())->GetInputEventHandler());\r
-                               if(!(inputHandler->IsEventSelected() & AliVEvent::kAny)){\r
+                               if(!(inputHandler->IsEventSelected() & AliVEvent::kMB)){\r
                                                                if (fDebug > 1 ) Printf(" Trigger Selection: event REJECTED ... ");\r
                                                                return;\r
                                }\r
@@ -689,15 +689,26 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
 \r
 \r
                                TString cAdd = "";\r
-                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));\r
-                               cAdd += Form("B%d",(int)BackM);\r
-                               cAdd += Form("_Filter%05d",Filtermask);\r
-                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));\r
-                               cAdd += Form("_Skip%02d",SkipCone);\r
                                TString Branchname_gen,Branchname_gen2,Branchname_rec;\r
-                               Branchname_gen  = Form("clustersAODMC_%s%s",JFAlg.Data(),cAdd.Data());\r
-                               Branchname_gen2 = Form("clustersAODMC2_%s%s",JFAlg.Data(),cAdd.Data());\r
-                               Branchname_rec  = Form("clustersAOD_%s%s",JFAlg.Data(),cAdd.Data());\r
+                               if((JFAlg=="ANTIKT")||(JFAlg=="KT")){\r
+                                                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));\r
+                                                               cAdd += Form("B%d",(int)BackM);\r
+                                                               cAdd += Form("_Filter%05d",Filtermask);\r
+                                                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));\r
+                                                               cAdd += Form("_Skip%02d",SkipCone);\r
+                                                               Branchname_gen  = Form("clustersAODMC_%s%s",JFAlg.Data(),cAdd.Data());\r
+                                                               Branchname_gen2 = Form("clustersAODMC2_%s%s",JFAlg.Data(),cAdd.Data());\r
+                                                               Branchname_rec  = Form("clustersAOD_%s%s",JFAlg.Data(),cAdd.Data());\r
+                               }\r
+                               else{\r
+                                                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));\r
+                                                               cAdd += Form("B%d",(int)BackM);\r
+                                                               cAdd += Form("_Filter%05d",Filtermask);\r
+                                                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));\r
+                                                               Branchname_gen  = Form("jetsAODMC_%s%s",JFAlg.Data(),cAdd.Data());\r
+                                                               Branchname_gen2 = Form("jetsAODMC2_%s%s",JFAlg.Data(),cAdd.Data());\r
+                                                               Branchname_rec  = Form("jetsAOD_%s%s",JFAlg.Data(),cAdd.Data());\r
+                               }\r
 \r
 \r
                                for(int algorithm=0;algorithm<3;algorithm++){\r
@@ -1131,6 +1142,10 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                if(findDiJetMC)fH2MleadCorrelation_MCRec->Fill(MleadMC,Mlead);\r
                                                                                                }\r
                                                                }\r
+                                                               fH2Mult_Mtrack->Fill(Mult,Track_n); \r
+                                                               fH2Mult_Mjet  ->Fill(Mult,Mjet_tot);\r
+                                                               fH2Mult_Njet  ->Fill(Mult,Njet_tot);\r
+                                                               if(findLJetAOD)fH2Mult_Mlead ->Fill(Mult,Mlead);   \r
                                }\r
                                else{\r
                                                                fH2Mult_Mtrack->Fill(Mult,Track_n); \r