]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGJE/UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
end-of-line normalization
[u/mrichter/AliRoot.git] / PWGJE / UserTasks / AliAnalysisTaskJetHadronCorrelation.cxx
index 5da5578b39fbf90b75fc1109a8a72d18a96e20f4..f833776b6f7960299f4328c1ccb049eae7421384 100755 (executable)
@@ -72,7 +72,6 @@ ClassImp(AliAnalysisTaskJetHadronCorrelation)
                                AliAnalysisTaskJetHadronCorrelation::AliAnalysisTaskJetHadronCorrelation():
                                                                AliAnalysisTaskSE(),
                                                                fUseAODInput(kFALSE),
-                                                               fFillAOD(kFALSE),
                                                                fJetBranch("jets"),
                                                                fNonStdFile(""),
                                                                fAODIn(0x0),
@@ -89,10 +88,8 @@ ClassImp(AliAnalysisTaskJetHadronCorrelation)
                                                                TrackEScale(1.),
                                                                fxsec(0.),
                                                                ftrial(1.),
-                                                               fJetRecEtaWindow(0.5),       // eta window for rec jets
-                                                               fMinJetPt(10), 
                                                                fHistList(0x0), // Output list
-                                                               fIfiles(0),
+  fIfiles(0),
                                                                fH1Events(0x0),
                                                                fH1Xsec(0x0),
                                                                fH1Trials(0x0),
@@ -111,29 +108,30 @@ ClassImp(AliAnalysisTaskJetHadronCorrelation)
                                                                fH1leadJet_pt            (0x0),
                                                                fH1leadJet_pt_dijet      (0x0),
                                                                fH1subJet_pt_dijet       (0x0),
-                                                               fH2JetsJet_dphi          (0x0),
-                                                               fH2JetsJet_deta          (0x0),
-                                                               fH2JetsJet_Aj            (0x0),
-                                                               fH2JetsJet_pt            (0x0),
                                                                fH1JetMC_pt              (0x0),
                                                                fH1leadJetMC_pt          (0x0),
                                                                fH1leadJetMC_pt_dijet    (0x0),
                                                                fH1subJetMC_pt_dijet     (0x0),
+                                                               fH2JetsJet_dphi          (0x0),
+                                                               fH2JetsJet_deta          (0x0),
+                                                               fH2JetsJet_Aj            (0x0),
+                                                               fH2JetsJet_pt            (0x0),
                                                                fH2JetsJetMC_dphi        (0x0),
                                                                fH2JetsJetMC_deta        (0x0),
                                                                fH2JetsJetMC_Aj          (0x0),
                                                                fH2JetsJetMC_pt          (0x0),
-                                                               fH2Mult_Mtrack          (0x0),
-                                                               fH2Mult_Mlead           (0x0),
-                                                               fH2Mult_Mjet            (0x0),
-                                                               fH2Mult_Njet            (0x0),
-                                                               fH2Mult_Aj              (0x0),
-                                                               fH2Mlead_Aj             (0x0),
-                                                               fH2Jet_pt_Mlead         (0x0),
-                                                               fH2Jet_pt_Munder        (0x0),
-                                                               fH2leadJetMCptResolution(0x0),
-                                                               fH2TrackMCptResolution(0x0),
-                                                               fH2AjCorrelation_MCRec(0x0),
+                                                               fH2Mult_Mtrack           (0x0),
+                                                               fH2Mult_Mlead            (0x0),
+                                                               fH2Mult_Mjet             (0x0),
+                                                               fH2Mult_Njet             (0x0),
+                                                               fH2Mult_Aj               (0x0),
+                                                               fH2Mlead_Aj              (0x0),
+                                                               fH2Jet_pt_Mlead          (0x0),
+                                                               fH2Jet_pt_Munder         (0x0),
+                                                               fH2leadJetMCptResolution (0x0),
+                                                               fH2TrackMCptResolution   (0x0),
+                                                               fH2TrackMCptEfficiency   (0x0),
+                                                               fH2AjCorrelation_MCRec   (0x0),
                                                                fH2MleadCorrelation_MCRec(0x0)
 {
                                for(int j=0;j<5;j++){
@@ -175,7 +173,6 @@ ClassImp(AliAnalysisTaskJetHadronCorrelation)
 AliAnalysisTaskJetHadronCorrelation::AliAnalysisTaskJetHadronCorrelation(const char *name):
                                AliAnalysisTaskSE(name),
                                fUseAODInput(kFALSE),
-                               fFillAOD(kFALSE),
                                fJetBranch("jets"),
                                fNonStdFile(""),
                                fAODIn(0x0), 
@@ -192,11 +189,8 @@ AliAnalysisTaskJetHadronCorrelation::AliAnalysisTaskJetHadronCorrelation(const c
                                TrackEScale(1.),
                                fxsec(0.),
                                ftrial(1.),
-                               fJetRecEtaWindow(0.5),       // eta window for rec jets
-                               fMinJetPt(10), 
                                fHistList(0x0), // Output list
                                fIfiles(0),
-
                                fH1Events(0x0),
                                fH1Xsec(0x0),
                                fH1Trials(0x0),
@@ -215,31 +209,33 @@ AliAnalysisTaskJetHadronCorrelation::AliAnalysisTaskJetHadronCorrelation(const c
                                fH1leadJet_pt            (0x0),
                                fH1leadJet_pt_dijet      (0x0),
                                fH1subJet_pt_dijet       (0x0),
-                               fH2JetsJet_dphi          (0x0),
-                               fH2JetsJet_deta          (0x0),
-                               fH2JetsJet_Aj            (0x0),
-                               fH2JetsJet_pt            (0x0),
                                fH1JetMC_pt              (0x0),
                                fH1leadJetMC_pt          (0x0),
                                fH1leadJetMC_pt_dijet    (0x0),
                                fH1subJetMC_pt_dijet     (0x0),
+                               fH2JetsJet_dphi          (0x0),
+                               fH2JetsJet_deta          (0x0),
+                               fH2JetsJet_Aj            (0x0),
+                               fH2JetsJet_pt            (0x0),
                                fH2JetsJetMC_dphi        (0x0),
                                fH2JetsJetMC_deta        (0x0),
                                fH2JetsJetMC_Aj          (0x0),
                                fH2JetsJetMC_pt          (0x0),
-                               fH2Mult_Mtrack          (0x0),
-                               fH2Mult_Mlead           (0x0),
-                               fH2Mult_Mjet            (0x0),
-                               fH2Mult_Njet            (0x0),
-                               fH2Mult_Aj              (0x0),
-                               fH2Mlead_Aj             (0x0),
-                               fH2Jet_pt_Mlead         (0x0),
-                               fH2Jet_pt_Munder        (0x0),
-                               fH2leadJetMCptResolution(0x0),
-                               fH2TrackMCptResolution(0x0),
-                               fH2AjCorrelation_MCRec(0x0),
+                               fH2Mult_Mtrack           (0x0),
+                               fH2Mult_Mlead            (0x0),
+                               fH2Mult_Mjet             (0x0),
+                               fH2Mult_Njet             (0x0),
+                               fH2Mult_Aj               (0x0),
+                               fH2Mlead_Aj              (0x0),
+                               fH2Jet_pt_Mlead          (0x0),
+                               fH2Jet_pt_Munder         (0x0),
+                               fH2leadJetMCptResolution (0x0),
+                               fH2TrackMCptResolution   (0x0),
+                               fH2TrackMCptEfficiency   (0x0),
+                               fH2AjCorrelation_MCRec   (0x0),
                                fH2MleadCorrelation_MCRec(0x0)
 {
+
                                for(int j=0;j<5;j++){
                                                                fH1ndiJ_ediv                             [j]=0;
                                                                fH1Aj                                    [j]=0;
@@ -299,77 +295,58 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
 
                                char *histname;
 
-                               fH1Events                   = new TH1F    ("Events"             ,"Events"                 ,1,0,1);
-                               fH1Xsec                     = new TProfile("Xsec"               ,"Xsec"                   ,1,0,1);
-                               fH1Trials                   = new TH1F    ("Trials"             ,"Trials"                 ,1,0,1);
-
-                               fH1JetMC_pt                = new TH1F("JetMC_pt"          ,"JetMC_pt"          ,400,0,400);
-                               fH1leadJetMC_pt            = new TH1F("leadJetMC_pt"      ,"leadJetMC_pt"      ,400,0,400);
-                               fH1leadJetMC_pt_dijet      = new TH1F("leadJetMC_pt_dijet","leadJetMC_pt_dijet",400,0,400);
-                               fH1subJetMC_pt_dijet       = new TH1F("subJetMC_pt_dijet" ,"subJetMC_pt_dijet" ,400,0,400);
-
-                               histname = Form("JetsJetMC_dphi");
-                               fH2JetsJetMC_dphi          = new TH2F(histname,histname,200,0,400,100,-2*pi,2*pi);
-                               histname = Form("JetsJetMC_deta");
-                               fH2JetsJetMC_deta          = new TH2F(histname,histname,200,0,400,100,-1.5,1.5);
-                               histname = Form("JetsJetMC_Aj");
-                               fH2JetsJetMC_Aj            = new TH2F(histname,histname,200,0,400,100,0,1.2);
-                               histname = Form("JetsJetMC_pt");
-                               fH2JetsJetMC_pt            = new TH2F(histname,histname,200,0,400,200,0,400);
-
-                               fH1Track_pt                = new TH1F("Track_pt"          ,"Track_pt"          ,400,0,400);
+                               fH1Events                  = new TH1F    ("Events"        ,"Events"            ,1,0,1);
+                               fH1Xsec                    = new TProfile("Xsec"          ,"Xsec"              ,1,0,1);
+                               fH1Trials                  = new TH1F    ("Trials"        ,"Trials"            ,1,0,1);
+
+                               fH1Track_pt                = new TH1F("Track_pt"          ,"Track_pt"          ,200,0,200);
                                fH1Track_phi               = new TH1F("Track_phi"         ,"Track_phi"         ,100,0,2*pi);
                                fH1Track_eta               = new TH1F("Track_eta"         ,"Track_eta"         ,100,-1.,1);
-                               fH1MCTrack_pt              = new TH1F("MCTrack_pt"        ,"MCTrack_pt"        ,400,0,400);
+                               fH1MCTrack_pt              = new TH1F("MCTrack_pt"        ,"MCTrack_pt"        ,200,0,200);
                                fH1MCTrack_phi             = new TH1F("MCTrack_phi"       ,"MCTrack_phi"       ,100,0,2*pi);
                                fH1MCTrack_eta             = new TH1F("MCTrack_eta"       ,"MCTrack_eta"       ,100,-1.,1);
-                               fH1MCPrimTrack_pt          = new TH1F("MCPrimTrack_pt"    ,"MCPrimTrack_pt"    ,400,0,400);
+                               fH1MCPrimTrack_pt          = new TH1F("MCPrimTrack_pt"    ,"MCPrimTrack_pt"    ,200,0,200);
                                fH1MCPrimTrack_phi         = new TH1F("MCPrimTrack_phi"   ,"MCPrimTrack_phi"   ,100,0,2*pi);
                                fH1MCPrimTrack_eta         = new TH1F("MCPrimTrack_eta"   ,"MCPrimTrack_eta"   ,100,-1.,1);
-                               fH1Jet_pt                  = new TH1F("Jet_pt"            ,"Jet_pt"            ,400,0,400);
+                               fH1Jet_pt                  = new TH1F("Jet_pt"            ,"Jet_pt"            ,200,0,200);
                                fH1Jet_phi                 = new TH1F("Jet_phi"           ,"Jet_pt"            ,100,0,2*pi);
                                fH1Jet_eta                 = new TH1F("Jet_eta"           ,"Jet_pt"            ,100,-1.,1);
-                               fH1leadJet_pt              = new TH1F("leadJet_pt"        ,"leadJet_pt"        ,400,0,400);
-                               fH1leadJet_pt_dijet        = new TH1F("leadJet_pt_dijet"  ,"leadJet_pt_dijet"  ,400,0,400);
-                               fH1subJet_pt_dijet         = new TH1F("subJet_pt_dijet"   ,"subJet_pt_dijet"   ,400,0,400);
-                               histname = Form("JetsJet_dphi");
-                               fH2JetsJet_dphi            = new TH2F(histname,histname,200,0,400,100,-2*pi,2*pi);
-                               histname = Form("JetsJet_deta");
-                               fH2JetsJet_deta            = new TH2F(histname,histname,200,0,400,100,-1.5,1.5);
-                               histname = Form("JetsJet_Aj");
-                               fH2JetsJet_Aj              = new TH2F(histname,histname,200,0,400,100,0,1.2);
-                               histname = Form("JetsJet_pt");
-                               fH2JetsJet_pt              = new TH2F(histname,histname,200,0,400,200,0,400);
-
-
-                               histname = Form("Mult_Mtrack");                                             
-                               fH2Mult_Mtrack             = new TH2F(histname,histname,50,0,250,50,0,250); 
-                               histname = Form("Mult_Mlead");                                              
-                               fH2Mult_Mlead             = new TH2F(histname,histname,50,0,250,25,0,25);   
-                               histname = Form("Mult_Mjet");                                               
-                               fH2Mult_Mjet              = new TH2F(histname,histname,50,0,250,50,0,100);  
-                               histname = Form("Mult_Njet");                                               
-                               fH2Mult_Njet              = new TH2F(histname,histname,50,0,250,50,0,50);   
-                               histname = Form("Mult_Aj");                                                 
-                               fH2Mult_Aj                = new TH2F(histname,histname,50,0,250,25,0,1.2);  
-                               histname = Form("Mlead_Aj");                                                
-                               fH2Mlead_Aj               = new TH2F(histname,histname,25,0,25,25,0,1.2);   
-                               histname = Form("Jet_pt_Mlead");                                                
-                               fH2Jet_pt_Mlead               = new TH2F(histname,histname,50,0,200,25,0,25);   
-                               histname = Form("Jet_pt_Munder");                                               
-                               fH2Jet_pt_Munder              = new TH2F(histname,histname,50,0,200,25,0,5);    
-                               histname = Form("leadJetMCptResolution");                                               
-                               fH2leadJetMCptResolution      = new TH2F(histname,histname,100,0,200,100,0,200);    
-                               histname = Form("TrackMCptResolution");                                               
-                               fH2TrackMCptResolution      = new TH2F(histname,histname,100,0,200,100,0,200);    
-                               histname = Form("AjCorrelation_MCRec");                                               
-                               fH2AjCorrelation_MCRec      = new TH2F(histname,histname,60,0,1.2,60,0,1.2);    
-                               histname = Form("MleadCorrelation_MCRec");                                               
-                               fH2MleadCorrelation_MCRec      = new TH2F(histname,histname,60,0,60,60,0,60);    
+                               fH1leadJet_pt              = new TH1F("leadJet_pt"        ,"leadJet_pt"        ,200,0,200);
+                               fH1leadJet_pt_dijet        = new TH1F("leadJet_pt_dijet"  ,"leadJet_pt_dijet"  ,200,0,200);
+                               fH1subJet_pt_dijet         = new TH1F("subJet_pt_dijet"   ,"subJet_pt_dijet"   ,200,0,200);
+                               fH1JetMC_pt                = new TH1F("JetMC_pt"          ,"JetMC_pt"          ,200,0,200);
+                               fH1leadJetMC_pt            = new TH1F("leadJetMC_pt"      ,"leadJetMC_pt"      ,200,0,200);
+                               fH1leadJetMC_pt_dijet      = new TH1F("leadJetMC_pt_dijet","leadJetMC_pt_dijet",200,0,200);
+                               fH1subJetMC_pt_dijet       = new TH1F("subJetMC_pt_dijet" ,"subJetMC_pt_dijet" ,200,0,200);
+                               fH2JetsJet_dphi            = new TH2F("JetsJet_dphi"      ,"JetsJet_dphi"      ,200,0,200,100,-2*pi,2*pi);
+                               fH2JetsJet_deta            = new TH2F("JetsJet_deta"      ,"JetsJet_deta"      ,200,0,200,100,-1.5,1.5);
+                               fH2JetsJet_Aj              = new TH2F("JetsJet_Aj"        ,"JetsJet_Aj"        ,200,0,200,100,0,1.2);
+                               fH2JetsJet_pt              = new TH2F("JetsJet_pt"        ,"JetsJet_pt"        ,200,0,200,200,0,200);
+                               fH2JetsJetMC_dphi          = new TH2F("JetsJetMC_dphi"    ,"JetsJetMC_dphi"    ,200,0,200,100,-2*pi,2*pi);
+                               fH2JetsJetMC_deta          = new TH2F("JetsJetMC_deta"    ,"JetsJetMC_deta"    ,200,0,200,100,-1.5,1.5);
+                               fH2JetsJetMC_Aj            = new TH2F("JetsJetMC_Aj"      ,"JetsJetMC_Aj"      ,200,0,200,100,0,1.2);
+                               fH2JetsJetMC_pt            = new TH2F("JetsJetMC_pt"      ,"JetsJetMC_pt"      ,200,0,200,200,0,200);
+                               fH2Mult_Mtrack             = new TH2F("Mult_Mtrack"       ,"Mult_Mtrack"       ,50,0,250,50,0,250); 
+                               fH2Mult_Mlead              = new TH2F("Mult_Mlead"        ,"Mult_Mlead"        ,50,0,250,25,0,25);   
+                               fH2Mult_Mjet               = new TH2F("Mult_Mjet"         ,"Mult_Mjet"         ,50,0,250,50,0,100);  
+                               fH2Mult_Njet               = new TH2F("Mult_Njet"         ,"Mult_Njet"         ,50,0,250,50,0,50);   
+                               fH2Mult_Aj                 = new TH2F("Mult_Aj"           ,"Mult_Aj"           ,50,0,250,25,0,1.2);  
+                               fH2Mlead_Aj                = new TH2F("Mlead_Aj"          ,"Mlead_Aj"          ,25,0,25,25,0,1.2);   
+                               fH2Jet_pt_Mlead            = new TH2F("Jet_pt_Mlead"      ,"Jet_pt_Mlead"      ,50,0,200,25,0,25);   
+                               fH2Jet_pt_Munder           = new TH2F("Jet_pt_Munder"     ,"Jet_pt_Munder"     ,50,0,200,25,0,5);    
+                               fH2leadJetMCptResolution   = new TH2F("leadJetMCptResolution" ,"leadJetMCptResolution" ,200,0,200,200,0,200);    
+                               fH2TrackMCptResolution     = new TH2F("TrackMCptResolution"   ,"TrackMCptResolution"   ,200,0,200,200,0,200);    
+                               fH2TrackMCptEfficiency     = new TH2F("TrackMCptEfficiency"   ,"TrackMCptEfficiency"   ,200,0,200,100,0,1.2);    
+                               fH2AjCorrelation_MCRec     = new TH2F("AjCorrelation_MCRec"   ,"AjCorrelation_MCRec"   ,60,0,1.2,60,0,1.2);    
+                               fH2MleadCorrelation_MCRec  = new TH2F("MleadCorrelation_MCRec","MleadCorrelation_MCRec",60,0,60,60,0,60);    
 
                                for(int j=0;j<5;j++){
                                                                histname = Form("ndiJ_ediv%d",j);
                                                                fH1ndiJ_ediv[j]= new TH1F(histname,histname,1,1,2);
+                                                               histname        = Form("Aj%d",j);                    
+                                                               fH1Aj[j]    = new TH1F(histname,histname,50,0,1.2);  
+                                                               histname        = Form("Mlead%d",j);                 
+                                                               fH1Mlead[j] = new TH1F(histname,histname,50,0,50);   
                                                                histname = Form("leadJetMC_dphiResolution%d",j);
                                                                fH1leadJetMC_dphiResolution[j] = new TH1F(histname,histname,200,-2*pi,2*pi);
                                                                histname = Form("subJetMC_dphiResolution%d",j);
@@ -378,11 +355,6 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
                                                                fH1leadJetMC_Efficiency[j] = new TH1F(histname,histname,100,0,1.2);
                                                                histname = Form("subJetMC_Efficiency%d",j);
                                                                fH1subJetMC_Efficiency[j] = new TH1F(histname,histname,100,0,1.2);
-
-                                                               histname        = Form("Aj%d",j);                    
-                                                               fH1Aj[j]    = new TH1F(histname,histname,50,0,1.2);  
-                                                               histname        = Form("Mlead%d",j);                 
-                                                               fH1Mlead[j] = new TH1F(histname,histname,50,0,50);   
                                                                for(int k=0;k<5;k++){
                                                                                                histname = Form("JetHadron_dphi_ediv%d%d",j,k);
                                                                                                fH1JetHadron_dphi_ediv             [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
@@ -390,14 +362,12 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
                                                                                                fH1JetHadron_dphi_tptweight_ediv   [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
                                                                                                histname = Form("JetHadron_dphi_tJptweight_ediv%d%d",j,k);
                                                                                                fH1JetHadron_dphi_tJptweight_ediv  [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
-
                                                                                                histname = Form("JetHadronMC_dphi_ediv%d%d",j,k);
                                                                                                fH1JetHadronMC_dphi_ediv             [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
                                                                                                histname = Form("JetHadronMC_dphi_tptweight_ediv%d%d",j,k);
                                                                                                fH1JetHadronMC_dphi_tptweight_ediv   [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
                                                                                                histname = Form("JetHadronMC_dphi_tJptweight_ediv%d%d",j,k);
                                                                                                fH1JetHadronMC_dphi_tJptweight_ediv  [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
-
                                                                                                histname = Form("JetHadronMCPrim_dphi_ediv%d%d",j,k);
                                                                                                fH1JetHadronMCPrim_dphi_ediv             [j][k]= new TH1F(histname,histname,200,-1./2.*pi,3./2.*pi);
                                                                                                histname = Form("JetHadronMCPrim_dphi_tptweight_ediv%d%d",j,k);
@@ -429,45 +399,57 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
 
 
                                if(IsMC){
-                                                               fHistList->Add(fH1Xsec);
-                                                               fHistList->Add(fH1Trials);
-                                                               fHistList->Add(fH1Track_pt        );
-                                                               fHistList->Add(fH1Track_phi       );
-                                                               fHistList->Add(fH1Track_eta       );
-                                                               fHistList->Add(fH1MCTrack_pt      );
-                                                               fHistList->Add(fH1MCTrack_phi     );
-                                                               fHistList->Add(fH1MCTrack_eta     );
-                                                               fHistList->Add(fH1MCPrimTrack_pt  );
-                                                               fHistList->Add(fH1MCPrimTrack_phi );
-                                                               fHistList->Add(fH1MCPrimTrack_eta );
-                                                               fHistList->Add(fH1JetMC_pt          );
-                                                               fHistList->Add(fH1leadJetMC_pt      );
-                                                               fHistList->Add(fH1leadJetMC_pt_dijet);
-                                                               fHistList->Add(fH1subJetMC_pt_dijet );
+                                                               fHistList->Add(fH1Events            );
+                                                               fHistList->Add(fH1Xsec              );
+                                                               fHistList->Add(fH1Trials            );
+                                                               fHistList->Add(fH1Track_pt          );
+                                                               fHistList->Add(fH1Track_phi         );
+                                                               fHistList->Add(fH1Track_eta         );
+                                                               fHistList->Add(fH1MCTrack_pt        );
+                                                               fHistList->Add(fH1MCTrack_phi       );
+                                                               fHistList->Add(fH1MCTrack_eta       );
+                                                               fHistList->Add(fH1MCPrimTrack_pt    );
+                                                               fHistList->Add(fH1MCPrimTrack_phi   );
+                                                               fHistList->Add(fH1MCPrimTrack_eta   );
                                                                fHistList->Add(fH1Jet_pt            );
                                                                fHistList->Add(fH1Jet_phi           );
                                                                fHistList->Add(fH1Jet_eta           );
                                                                fHistList->Add(fH1leadJet_pt        );
                                                                fHistList->Add(fH1leadJet_pt_dijet  );
                                                                fHistList->Add(fH1subJet_pt_dijet   );
-                                                               fHistList->Add(fH2JetsJetMC_dphi    );
-                                                               fHistList->Add(fH2JetsJetMC_deta    );
-                                                               fHistList->Add(fH2JetsJetMC_Aj      );
-                                                               fHistList->Add(fH2JetsJetMC_pt      );
+                                                               fHistList->Add(fH1JetMC_pt          );
+                                                               fHistList->Add(fH1leadJetMC_pt      );
+                                                               fHistList->Add(fH1leadJetMC_pt_dijet);
+                                                               fHistList->Add(fH1subJetMC_pt_dijet );
                                                                fHistList->Add(fH2JetsJet_dphi      );
                                                                fHistList->Add(fH2JetsJet_deta      );
                                                                fHistList->Add(fH2JetsJet_Aj        );
                                                                fHistList->Add(fH2JetsJet_pt        );
-                                                               fHistList->Add(fH2leadJetMCptResolution);
-                                                               fHistList->Add(fH2TrackMCptResolution);
-                                                               fHistList->Add(fH2AjCorrelation_MCRec);
+                                                               fHistList->Add(fH2JetsJetMC_dphi    );
+                                                               fHistList->Add(fH2JetsJetMC_deta    );
+                                                               fHistList->Add(fH2JetsJetMC_Aj      );
+                                                               fHistList->Add(fH2JetsJetMC_pt      );
+                                                               fHistList->Add(fH2Mult_Mtrack       );
+                                                               fHistList->Add(fH2Mult_Mlead        ); 
+                                                               fHistList->Add(fH2Mult_Mjet         );  
+                                                               fHistList->Add(fH2Mult_Njet         );  
+                                                               fHistList->Add(fH2Mult_Aj           );    
+                                                               fHistList->Add(fH2Mlead_Aj          );   
+                                                               fHistList->Add(fH2Jet_pt_Mlead      );   
+                                                               fHistList->Add(fH2Jet_pt_Munder     );  
+                                                               fHistList->Add(fH2leadJetMCptResolution );
+                                                               fHistList->Add(fH2TrackMCptResolution   );
+                                                               fHistList->Add(fH2TrackMCptEfficiency   );
+                                                               fHistList->Add(fH2AjCorrelation_MCRec   );
                                                                fHistList->Add(fH2MleadCorrelation_MCRec);
                                                                for(int j=0;j<5;j++){
                                                                                                fHistList->Add(fH1ndiJ_ediv                        [j]);
-                                                                                               fHistList->Add(fH1leadJetMC_dphiResolution          [j]);
-                                                                                               fHistList->Add(fH1subJetMC_dphiResolution           [j]);
-                                                                                               fHistList->Add(fH1leadJetMC_Efficiency              [j]);
-                                                                                               fHistList->Add(fH1subJetMC_Efficiency               [j]);
+                                                                                               fHistList->Add(fH1Aj                               [j]);
+                                                                                               fHistList->Add(fH1Mlead                            [j]);
+                                                                                               fHistList->Add(fH1leadJetMC_dphiResolution         [j]);
+                                                                                               fHistList->Add(fH1subJetMC_dphiResolution          [j]);
+                                                                                               fHistList->Add(fH1leadJetMC_Efficiency             [j]);
+                                                                                               fHistList->Add(fH1subJetMC_Efficiency              [j]);
                                                                                                for(int k=0;k<5;k++){
                                                                                                                                fHistList->Add(fH1JetHadron_dphi_ediv               [j][k]);
                                                                                                                                fHistList->Add(fH1JetHadron_dphi_tptweight_ediv     [j][k]);
@@ -494,36 +476,36 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
                                                                }
                                }
                                else{
-                                                               fHistList->Add(fH1Events);
-                                                               fHistList->Add(fH1Track_pt        );
-                                                               fHistList->Add(fH1Track_phi       );
-                                                               fHistList->Add(fH1Track_eta       );
-                                                               fHistList->Add(fH1Jet_pt          );
-                                                               fHistList->Add(fH1Jet_phi         );
-                                                               fHistList->Add(fH1Jet_eta         );
-                                                               fHistList->Add(fH1leadJet_pt      );
-                                                               fHistList->Add(fH1leadJet_pt_dijet);
-                                                               fHistList->Add(fH1subJet_pt_dijet );
-                                                               fHistList->Add(fH2JetsJet_dphi    );
-                                                               fHistList->Add(fH2JetsJet_deta    );
-                                                               fHistList->Add(fH2JetsJet_Aj      );
-                                                               fHistList->Add(fH2JetsJet_pt      );
-                                                               fHistList->Add(fH2Mult_Mtrack     );
-                                                               fHistList->Add(fH2Mult_Mlead      ); 
-                                                               fHistList->Add(fH2Mult_Mjet       );  
-                                                               fHistList->Add(fH2Mult_Njet       );  
-                                                               fHistList->Add(fH2Mult_Aj         );    
-                                                               fHistList->Add(fH2Mlead_Aj        );   
-                                                               fHistList->Add(fH2Jet_pt_Mlead    );   
-                                                               fHistList->Add(fH2Jet_pt_Munder   );  
+                                                               fHistList->Add(fH1Events            );
+                                                               fHistList->Add(fH1Track_pt          );
+                                                               fHistList->Add(fH1Track_phi         );
+                                                               fHistList->Add(fH1Track_eta         );
+                                                               fHistList->Add(fH1Jet_pt            );
+                                                               fHistList->Add(fH1Jet_phi           );
+                                                               fHistList->Add(fH1Jet_eta           );
+                                                               fHistList->Add(fH1leadJet_pt        );
+                                                               fHistList->Add(fH1leadJet_pt_dijet  );
+                                                               fHistList->Add(fH1subJet_pt_dijet   );
+                                                               fHistList->Add(fH2JetsJet_dphi      );
+                                                               fHistList->Add(fH2JetsJet_deta      );
+                                                               fHistList->Add(fH2JetsJet_Aj        );
+                                                               fHistList->Add(fH2JetsJet_pt        );
+                                                               fHistList->Add(fH2Mult_Mtrack       );
+                                                               fHistList->Add(fH2Mult_Mlead        ); 
+                                                               fHistList->Add(fH2Mult_Mjet         );  
+                                                               fHistList->Add(fH2Mult_Njet         );  
+                                                               fHistList->Add(fH2Mult_Aj           );    
+                                                               fHistList->Add(fH2Mlead_Aj          );   
+                                                               fHistList->Add(fH2Jet_pt_Mlead      );   
+                                                               fHistList->Add(fH2Jet_pt_Munder     );  
                                                                for(int j=0;j<5;j++){
-                                                                                               fHistList->Add(fH1ndiJ_ediv    [j]);
-                                                                                               fHistList->Add(fH1Aj           [j]);
-                                                                                               fHistList->Add(fH1Mlead        [j]);
+                                                                                               fHistList->Add(fH1ndiJ_ediv                        [j]);
+                                                                                               fHistList->Add(fH1Aj                               [j]);
+                                                                                               fHistList->Add(fH1Mlead                            [j]);
                                                                                                for(int k=0;k<5;k++){
-                                                                                                                               fHistList->Add(fH1JetHadron_dphi_ediv             [j][k]);
-                                                                                                                               fHistList->Add(fH1JetHadron_dphi_tptweight_ediv   [j][k]);
-                                                                                                                               fHistList->Add(fH1JetHadron_dphi_tJptweight_ediv  [j][k]);
+                                                                                                                               fHistList->Add(fH1JetHadron_dphi_ediv               [j][k]);
+                                                                                                                               fHistList->Add(fH1JetHadron_dphi_tptweight_ediv     [j][k]);
+                                                                                                                               fHistList->Add(fH1JetHadron_dphi_tJptweight_ediv    [j][k]);
                                                                                                }
                                                                }
                                                                for(int j=0;j<3;j++){
@@ -553,6 +535,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserCreateOutputObjects()
                                PostData(1,fHistList);
 }
 
+
 //----------------------------------------------------------------------                                                 
 void AliAnalysisTaskJetHadronCorrelation::Init()
 {
@@ -565,7 +548,6 @@ Bool_t AliAnalysisTaskJetHadronCorrelation::Notify()
 {
 
 
-                               fIfiles++;
                                fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
                                fAODOut = AODEvent();
                                if(fNonStdFile.Length()!=0){
@@ -645,7 +627,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                if (fDebug > 1 ) Printf(" Trigger Selection: event REJECTED ... ");
                                                                return;
                                }
-                               if(!IsMC)fH1Events->Fill(0);
+                               fH1Events->Fill(0);
 
                                AliAODHeader* aliH = dynamic_cast <AliAODHeader*> (fAODIn->GetHeader());
                                if(!aliH){
@@ -657,15 +639,12 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                // start jet analysis  -------------------------Init.
                                Float_t pi=TMath::Pi();
 
-                               Double_t Jet_n    [20];
                                Double_t Jet_pt   [20][5000];
                                Double_t Jet_phi  [20][5000];
                                Double_t Jet_eta  [20][5000];
                                Double_t Jet_area [20][5000];
-                               Double_t subJet_n  [20];
                                Double_t subJet_pt [20][5000];
                                Double_t subJet_eta[20][5000];
-                               Double_t subJet_phi[20][5000];
                                Double_t Track_n  ;
                                Double_t Track_pt [5000];
                                Double_t Track_eta[5000];
@@ -677,15 +656,12 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
 
                                Track_n=0;MCTrack_n=0;
                                for(int i=0;i<20;i++){
-                                                               Jet_n[i]=0;
-                                                               subJet_n[i]=0;
                                                                for(int j=0;j<1000;j++){
                                                                                                Jet_pt[i][j]=0.;
                                                                                                Jet_phi[i][j]=999.;
                                                                                                Jet_eta[i][j]=999.;
                                                                                                Jet_area[i][j]=999.;
                                                                                                subJet_pt[i][j]=0.;
-                                                                                               subJet_phi[i][j]=999.;
                                                                                                subJet_eta[i][j]=999.;
                                                                                                Track_pt [j]=0.;
                                                                                                Track_phi[j]=999.;
@@ -696,15 +672,13 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                }
                                }
 
-                               int nLJetAOD=999; double ptLJetAOD=0;double phiLJetAOD=999.;double etaLJetAOD=999.;int nsLJetAOD=900;double ptsLJetAOD=0;double phisLJetAOD=900.;double etasLJetAOD=900.;
-                               int nLJetMC2=999; double ptLJetMC2=0;double phiLJetMC2=999.;double etaLJetMC2=999.;int nsLJetMC2=900;double ptsLJetMC2=0;double phisLJetMC2=900.;double etasLJetMC2=900.;
-                               int nLJetMC =999; double ptLJetMC =0;double phiLJetMC =999.;double etaLJetMC =999.;int nsLJetMC =900;double ptsLJetMC =0;double phisLJetMC =900.;double etasLJetMC =900.;
-                               bool findLJetAOD=false;bool findsLJetAOD=false;
-                               bool findLJetMC2=false;bool findsLJetMC2=false;
-                               bool findLJetMC =false;bool findsLJetMC =false;
+                               int nLJetAOD=999; double ptLJetAOD=0;double phiLJetAOD=999.;double etaLJetAOD=999.;double ptsLJetAOD=0;double phisLJetAOD=900.;double etasLJetAOD=900.;
+                               int nLJetMC2=999; double ptLJetMC2=0;double phiLJetMC2=999.;double etaLJetMC2=999.;double ptsLJetMC2=0;double phisLJetMC2=900.;double etasLJetMC2=900.;
+                               int nLJetMC =999; double ptLJetMC =0;double phiLJetMC =999.;double etaLJetMC =999.;double ptsLJetMC =0;double phisLJetMC =900.;double etasLJetMC =900.;
+                               bool findLJetAOD=false;
+                               bool findLJetMC2=false;
                                bool findDiJet=false,findDiJetMC=false;
                                int nLJet = 999;
-                               int nsLJet =999;
                                int Mjet_tot =0;
                                int Njet_tot =0;
 
@@ -712,19 +686,116 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                double Mlead=99.,MleadMC=99.;
                                int    Munder=99.;
 
-                               //--------------------------------------------------------------------Init.
-
+                               ////--------------------------------------------------------------------Init.
 
                                TString cAdd = "";
-                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));
-                               cAdd += Form("B%d",(int)BackM);
-                               cAdd += Form("_Filter%05d",Filtermask);
-                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));
-                               cAdd += Form("_Skip%02d",SkipCone);
                                TString Branchname_gen,Branchname_gen2,Branchname_rec;
-                               Branchname_gen  = Form("clustersAODMC_%s%s",JFAlg.Data(),cAdd.Data());
-                               Branchname_gen2 = Form("clustersAODMC2_%s%s",JFAlg.Data(),cAdd.Data());
-                               Branchname_rec  = Form("clustersAOD_%s%s",JFAlg.Data(),cAdd.Data());
+                               if((JFAlg=="ANTIKT")||(JFAlg=="KT")){
+                                                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));
+                                                               cAdd += Form("B%d",(int)BackM);
+                                                               cAdd += Form("_Filter%05d",Filtermask);
+                                                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));
+                                                               cAdd += Form("_Skip%02d",SkipCone);
+                                                               Branchname_gen  = Form("clustersAODMC_%s%s",JFAlg.Data(),cAdd.Data());
+                                                               Branchname_gen2 = Form("clustersAODMC2_%s%s",JFAlg.Data(),cAdd.Data());
+                                                               Branchname_rec  = Form("clustersAOD_%s%s",JFAlg.Data(),cAdd.Data());
+                               }
+                               else{
+                                                               cAdd += Form("%02d_",(int)((Radius+0.01)*10.));
+                                                               cAdd += Form("B%d",(int)BackM);
+                                                               cAdd += Form("_Filter%05d",Filtermask);
+                                                               cAdd += Form("_Cut%05d",(int)(1000.*TrackPtcut));
+                                                               Branchname_gen  = Form("jetsAODMC_%s%s",JFAlg.Data(),cAdd.Data());
+                                                               Branchname_gen2 = Form("jetsAODMC2_%s%s",JFAlg.Data(),cAdd.Data());
+                                                               Branchname_rec  = Form("jetsAOD_%s%s",JFAlg.Data(),cAdd.Data());
+                               }
+
+
+
+                               //count number of tracks@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 
+                               //Reconstructed Track
+                               TClonesArray* tracks = dynamic_cast <TClonesArray*> (fAODIn->GetTracks());
+                               if(!tracks){
+                                                               if (fDebug > 1)  Printf("%s:%d could not get AODtracks", (char*)__FILE__,__LINE__);
+                                                               return;
+                               }
+
+                               Bool_t TrackEff[5000];
+                               for(int i=0;i<5000;i++){
+                                                               TrackEff[i]=false;
+                               }
+                               Int_t nt = fAODIn->GetNumberOfTracks();
+                               AliAODTrack* trackAOD=NULL;
+                               for(int ntrack =0;ntrack<nt;ntrack++){
+                                                               trackAOD = (AliAODTrack*) (tracks->At(ntrack));
+                                                               Bool_t bgoodT=false;
+                                                               if(Filtermask!=272){if(trackAOD->TestFilterMask(Filtermask))bgoodT=true;}
+                                                               else               {if(trackAOD->IsHybridGlobalConstrainedGlobal())bgoodT=true;} //for hybrid Track cuts
+                                                               if(!bgoodT)continue;
+                                                               if(TMath::Abs(trackAOD->Eta())<0.9){
+                                                                                               Track_n++;
+                                                                                               fH1Track_pt ->Fill(trackAOD->Pt()*TrackEScale);
+                                                                                               fH1Track_phi->Fill(trackAOD->Phi());
+                                                                                               fH1Track_eta->Fill(trackAOD->Eta());
+                                                                                               //cout<<"Scale "<<TrackEScale<<"  org pt "<<trackAOD->Pt()<< " scaled pt "<< trackAOD->Pt()*TrackEScale <<endl;
+                                                                                               if(IsMC){
+                                                                                                                               // track pt resplution-------------------
+                                                                                                                               Int_t MCID = TMath::Abs(trackAOD->GetLabel());
+                                                                                                                               TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
+                                                                                                                               if(!mctracks){
+                                                                                                                                                               if (fDebug > 1)  Printf("%s:%d could not get AODMCtracks", (char*)__FILE__,__LINE__);
+                                                                                                                                                               continue;
+                                                                                                                               }
+                                                                                                                               AliAODMCParticle *trackMCAOD = (AliAODMCParticle*) mctracks->At(MCID);
+                                                                                                                               fH2TrackMCptResolution->Fill(trackMCAOD->Pt(),trackAOD->Pt());
+                                                                                                                               TrackEff[MCID]=true;
+                                                                                                                               // --------------------------------------
+                                                                                               }
+                                                               }
+                               }
+                               if(IsMC){
+                                                               //MC Track
+                                                               TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
+                                                               if(!mctracks){
+                                                                                               if (fDebug > 1)  Printf("%s:%d could not get AODMCtracks", (char*)__FILE__,__LINE__);
+                                                                                               return;
+                                                               }
+                                                               Int_t ntmc = mctracks->GetEntriesFast();
+                                                               AliAODMCParticle* trackMCAOD;
+                                                               int lastprim=0;
+                                                               for(int ntrack =0;ntrack<ntmc;ntrack++){
+                                                                                               trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
+                                                                                               if((trackMCAOD->IsPhysicalPrimary())==1)lastprim=ntrack;
+                                                               }
+                                                               for(int ntrack =0;ntrack<ntmc;ntrack++){
+                                                                                               trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
+                                                                                               if((trackMCAOD->GetPdgCode()>10)&&((trackMCAOD->GetMother())>1)&&(ntrack>lastprim)&&(trackMCAOD->Charge())){// for Decay particles
+                                                                                                                               if(TMath::Abs(trackMCAOD->Eta())<0.9){
+                                                                                                                                                               fH1MCTrack_pt ->Fill(trackMCAOD->Pt());
+                                                                                                                                                               fH1MCTrack_phi->Fill(trackMCAOD->Phi());
+                                                                                                                                                               fH1MCTrack_eta->Fill(trackMCAOD->Eta());
+                                                                                                                                                               if(TrackEff[ntrack])fH2TrackMCptEfficiency->Fill(trackMCAOD->Pt(),1);
+                                                                                                                                                               else                fH2TrackMCptEfficiency->Fill(trackMCAOD->Pt(),0);
+                                                                                                                               }
+                                                                                               }
+                                                                                               if((trackMCAOD->IsPhysicalPrimary())&&(trackMCAOD->Charge())){// for Physical particles
+                                                                                                                               if(TMath::Abs(trackMCAOD->Eta())<0.9){
+                                                                                                                                                               MCTrack_n++;
+                                                                                                                                                               fH1MCTrack_pt ->Fill(trackMCAOD->Pt());
+                                                                                                                                                               fH1MCTrack_phi->Fill(trackMCAOD->Phi());
+                                                                                                                                                               fH1MCTrack_eta->Fill(trackMCAOD->Eta());
+                                                                                                                                                               fH1MCPrimTrack_pt ->Fill(trackMCAOD->Pt());
+                                                                                                                                                               fH1MCPrimTrack_phi->Fill(trackMCAOD->Phi());
+                                                                                                                                                               fH1MCPrimTrack_eta->Fill(trackMCAOD->Eta());
+                                                                                                                                                               if(TrackEff[ntrack])fH2TrackMCptEfficiency->Fill(trackMCAOD->Pt(),1);
+                                                                                                                                                               else                fH2TrackMCptEfficiency->Fill(trackMCAOD->Pt(),0);
+                                                                                                                               }
+                                                                                               }
+                                                               }
+                               }
+                               //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  count number of tracks
+
+
 
 
                                for(int algorithm=0;algorithm<3;algorithm++){
@@ -743,15 +814,6 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                Int_t nj = jets->GetEntriesFast();
                                                                if (fDebug) printf("There are %5d jets in the event \n", nj);
                                                                AliAODJet* jetsAOD;
-                                                               Jet_n[algorithm] = nj;
-                                                               int nLjet_in05_pthdiv[20][20];
-                                                               int nsLjet_in05_pthdiv[20][20];
-                                                               for(int i=0;i<20;i++){
-                                                                                               for(int j=0;j<20;j++){
-                                                                                                                               nLjet_in05_pthdiv [i][j]=0;
-                                                                                                                               nsLjet_in05_pthdiv[i][j]=0;
-                                                                                               }
-                                                               }
                                                                //Find Leading Jet -------------------------------------------------------
                                                                for(int njet =0;njet<nj;njet++){
                                                                                                jetsAOD = (AliAODJet*) (jets->At(njet));
@@ -760,6 +822,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                Jet_eta  [algorithm][njet] = jetsAOD->Eta();
                                                                                                Jet_area [algorithm][njet] = jetsAOD->EffectiveAreaCharged();
 
+
                                                                                                TRefArray *reftracks = jetsAOD->GetRefTracks();
                                                                                                if(algorithm==0){if(Jet_pt[algorithm][njet]>1.)Mjet_tot +=  reftracks->GetEntriesFast();Njet_tot++;}
                                                                                                double eta_cut_Jet=0.5;
@@ -782,7 +845,6 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                }
                                                                                                                                if(algorithm==2){
                                                                                                                                                                if(Jet_pt[algorithm][njet]>ptLJetMC){
-                                                                                                                                                                                               findLJetMC=true;
                                                                                                                                                                                                nLJetMC=njet;ptLJetMC=Jet_pt[algorithm][njet];phiLJetMC=Jet_phi[algorithm][njet];etaLJetMC=Jet_eta[algorithm][njet];
                                                                                                                                                                }
                                                                                                                                }
@@ -796,8 +858,8 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                TRefArray *reftracks = jetsAOD->GetRefTracks();
                                                                                                Mlead = reftracks->GetEntriesFast();
                                                                }
-                                                               if(findLJetAOD&&(algorithm==1)){
-                                                                                               jetsAOD = (AliAODJet*) (jets->At(nLJet));
+                                                               if(findLJetMC2&&(algorithm==1)){
+                                                                                               jetsAOD = (AliAODJet*) (jets->At(nLJetMC2));
                                                                                                TRefArray *reftracks = jetsAOD->GetRefTracks();
                                                                                                MleadMC = reftracks->GetEntriesFast();
                                                                }
@@ -808,27 +870,20 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                if(njet==nLJet)continue;
                                                                                                jetsAOD = (AliAODJet *)jets->At(njet);
                                                                                                subJet_pt [algorithm][njet] = jetsAOD->Pt()*JetEScale;
-                                                                                               subJet_phi[algorithm][njet] = jetsAOD->Phi();
                                                                                                subJet_eta[algorithm][njet] = jetsAOD->Eta();
                                                                                                double eta_cut_Jet=0.5;
                                                                                                if((TMath::Abs(subJet_eta[algorithm][njet])<eta_cut_Jet) && (subJet_pt[algorithm][njet]>10.)){
                                                                                                                                if(subJet_pt[algorithm][njet]>ptsLJetAOD&&algorithm==0){
-                                                                                                                                                               findsLJetAOD=true;
-                                                                                                                                                               nsLJetAOD=njet;ptsLJetAOD=Jet_pt[algorithm][njet];phisLJetAOD=Jet_phi[algorithm][njet];etasLJetAOD=Jet_eta[algorithm][njet];
+                                                                                                                                                               ptsLJetAOD=Jet_pt[algorithm][njet];phisLJetAOD=Jet_phi[algorithm][njet];etasLJetAOD=Jet_eta[algorithm][njet];
                                                                                                                                }
                                                                                                                                if(subJet_pt[algorithm][njet]>ptsLJetMC2 &&algorithm==1){
-                                                                                                                                                               findsLJetMC2=true;
-                                                                                                                                                               nsLJetMC2=njet;ptsLJetMC2=Jet_pt[algorithm][njet];phisLJetMC2=Jet_phi[algorithm][njet];etasLJetMC2=Jet_eta[algorithm][njet];
+                                                                                                                                                               ptsLJetMC2=Jet_pt[algorithm][njet];phisLJetMC2=Jet_phi[algorithm][njet];etasLJetMC2=Jet_eta[algorithm][njet];
                                                                                                                                }
                                                                                                                                if(subJet_pt[algorithm][njet]>ptsLJetMC &&algorithm==2){
-                                                                                                                                                               findsLJetMC=true;
-                                                                                                                                                               nsLJetMC =njet;ptsLJetMC =Jet_pt[algorithm][njet];phisLJetMC =Jet_phi[algorithm][njet];etasLJetMC =Jet_eta[algorithm][njet];
+                                                                                                                                                               ptsLJetMC =Jet_pt[algorithm][njet];phisLJetMC =Jet_phi[algorithm][njet];etasLJetMC =Jet_eta[algorithm][njet];
                                                                                                                                }
                                                                                                }
                                                                }
-                                                               if(algorithm==0){nsLJet=nsLJetAOD;}
-                                                               if(algorithm==1){nsLJet=nsLJetMC2;}
-                                                               if(algorithm==2){nsLJet=nsLJetMC ;}
                                                                //====================================================== Sub leading Jet 
 
                                                                double Leading_pt=0.;double Leading_phi=999.;double Leading_eta=999.;double sLeading_pt=0.;double sLeading_phi=999.;double sLeading_eta=999.;
@@ -851,8 +906,8 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                if(algorithm==0)Aj   = (Leading_pt-sLeading_pt)/(Leading_pt+sLeading_pt);
                                                                                                if(algorithm==1)AjMC = (Leading_pt-sLeading_pt)/(Leading_pt+sLeading_pt);
                                                                                                if(algorithm==0){
-                                                                                                                               fH1leadJet_pt_dijet->Fill(Leading_pt);
                                                                                                                                fH1subJet_pt_dijet ->Fill(sLeading_pt);
+                                                                                                                               fH1leadJet_pt_dijet->Fill(Leading_pt);
                                                                                                                                fH2JetsJet_Aj      ->Fill(Leading_pt,Aj);
                                                                                                                                fH2JetsJet_pt      ->Fill(Leading_pt,sLeading_pt);
                                                                                                                                fH2Mult_Aj         ->Fill(Mult,Aj); 
@@ -875,138 +930,8 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                }
                                                                ////+++++++++++++++++++++++++++++++++++++++++++++++ Di-Jet event trigger 
 
-                                                               //if(algorithm==1){//IDEAL Jet-Hadron Correlation
-                                                               //                              if((findDiJet)&&(Leading_pt>10.)&&(sLeading_pt>10.)){
-                                                               //                                                              double eta_cut_Jet=0.5;
-                                                               //                                                              if(TMath::Abs(Leading_eta)<eta_cut_Jet){
-                                                               //                                                                                              for(int eb=0;eb<5;eb++){
-                                                               //                                                                                                                              if(TMath::Abs(Leading_pt -10.-20.*(eb))<10.){
-                                                               //                                                                                                                                                              //fH1ndiJMCIdeal_ediv[eb]->Fill(1);
-                                                               //                                                                                                                                                              //if(eb==1){
-                                                               //                                                                                                                                                              //                              if((0<Mlead)&&Mlead<7)              {fH1ndiJ_2040Mlead[0]->Fill(1);}
-                                                               //                                                                                                                                                              //                              else if((7<=Mlead)&&(Mlead<10))     {fH1ndiJ_2040Mlead[1]->Fill(1);}
-                                                               //                                                                                                                                                              //                              else                                {fH1ndiJ_2040Mlead[2]->Fill(1);}
-                                                               //                                                                                                                                                              //                              if((0<Aj)&&(Aj<0.19))               {fH1ndiJ_2040Aj   [0]->Fill(1);}
-                                                               //                                                                                                                                                              //                              else if((0.19<=Aj)&&(Aj<0.38))      {fH1ndiJ_2040Aj   [1]->Fill(1);}
-                                                               //                                                                                                                                                              //                              else                                {fH1ndiJ_2040Aj   [2]->Fill(1);}
-                                                               //                                                                                                                                                              //}
-                                                               //                                                                                                                                                              //fH1MleadMCIdeal[eb]->Fill(Mlead);
-                                                               //                                                                                                                                                              //fH1AjIdeal[eb]   ->Fill(Aj);
-
-                                                               //                                                                                                                                                              //MC Track
-                                                               //                                                                                                                                                              TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
-                                                               //                                                                                                                                                              if(!mctracks){
-                                                               //                                                                                                                                                                                              if (fDebug > 1)  Printf("%s:%d could not get AODMCtracks", (char*)__FILE__,__LINE__);
-                                                               //                                                                                                                                                                                              continue;
-                                                               //                                                                                                                                                              }
-                                                               //                                                                                                                                                              Int_t ntmc = mctracks->GetEntriesFast();
-                                                               //                                                                                                                                                              AliAODMCParticle* trackMCAOD;
-                                                               //                                                                                                                                                              int lastprim=0;
-                                                               //                                                                                                                                                              for(int ntrack =0;ntrack<ntmc;ntrack++){
-                                                               //                                                                                                                                                                                              trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
-                                                               //                                                                                                                                                                                              if((trackMCAOD->IsPhysicalPrimary())==1)lastprim=ntrack;
-                                                               //                                                                                                                                                              }
-                                                               //                                                                                                                                                              for(int ntrack =0;ntrack<ntmc;ntrack++){
-                                                               //                                                                                                                                                                                              trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
-                                                               //                                                                                                                                                                                              if((trackMCAOD->IsPhysicalPrimary())&&(trackMCAOD->Charge())){// for Physical particles
-                                                               //                                                                                                                                                                                                                              double DelPhi = DeltaPhi(Leading_phi,trackMCAOD->Phi());
-                                                               //                                                                                                                                                                                                                              if(TMath::Abs(trackMCAOD->Era())<0.9){
-                                                               //                                                                                                                                                                                                                                                              for(int teb=0;teb<5;teb++){
-                                                               //                                                                                                                                                                                                                                                                                              if(teb==0){if(!( trackMCAOD->Pt()>0.15))continue;}
-                                                               //                                                                                                                                                                                                                                                                                              if(teb==1){if(!((trackMCAOD->Pt()<1.5)&&(trackMCAOD->Pt()>0.15)))continue;}
-                                                               //                                                                                                                                                                                                                                                                                              if(teb==2){if(!((trackMCAOD->Pt()<3.0)&&(trackMCAOD->Pt()>1.5)))continue;}
-                                                               //                                                                                                                                                                                                                                                                                              if(teb==3){if(!((trackMCAOD->Pt()<4.5)&&(trackMCAOD->Pt()>3.0)))continue;}
-                                                               //                                                                                                                                                                                                                                                                                              if(teb==4){if(!( trackMCAOD->Pt()>4.5))continue;}
-                                                               //                                                                                                                                                                                                                                                                                              fH1JetHadronMCIdeal_dphi_ediv                [eb][teb]->Fill(DelPhi); 
-                                                               //                                                                                                                                                                                                                                                                                              fH1JetHadronMCIdeal_dphi_tptweight_ediv      [eb][teb]->Fill(DelPhi,trackMCAOD->Pt());
-                                                               //                                                                                                                                                                                                                                                                                              fH1JetHadronMCIdeal_dphi_tJptweight_ediv     [eb][teb]->Fill(DelPhi,trackMCAOD->Pt()/Leading_pt);
-                                                               //                                                                                                                                                                                                                                                                                              if(eb==1){
-                                                               //                                                                                                                                                                                                                                                                                                                              if((0<Mlead)&&Mlead<7)         {fH1JetHadronMCIdeal_dphi_tptweight2040_Mleaddep[0][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                                                              else if((7<=Mlead)&&(Mlead<10)){fH1JetHadronMCIdeal_dphi_tptweight2040_Mleaddep[1][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                                                              else                           {fH1JetHadronMCIdeal_dphi_tptweight2040_Mleaddep[2][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                                                              if((0<Aj)&&(Aj<0.19))          {fH1JetHadronMCIdeal_dphi_tptweight2040_Ajdep   [0][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                                                              else if((0.19<=Aj)&&(Aj<0.38)) {fH1JetHadronMCIdeal_dphi_tptweight2040_Ajdep   [1][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                                                              else                           {fH1JetHadronMCIdeal_dphi_tptweight2040_Ajdep   [2][teb]->Fill(DelPhi,trackMCAOD->Pt());}
-                                                               //                                                                                                                                                                                                                                                                                              }
-                                                               //                                                                                                                                                                                                                                                              }
-                                                               //                                                                                                                                                                                                                              }
-                                                               //                                                                                                                                                                                              }
-                                                               //                                                                                                                                                              }//Track Loop
-                                                               //                                                                                                                              }
-                                                               //                                                                                              }
-                                                               //                                                              }
-                                                               //                              }
-                                                               //}
-
                                                                if(algorithm!=0)continue;// for only data & reconstructed Jets
 
-                                                               //count number of tracks@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 
-                                                               //Reconstructed Track
-                                                               TClonesArray* tracks = dynamic_cast <TClonesArray*> (fAODIn->GetTracks());
-                                                               if(!tracks){
-                                                                                               if (fDebug > 1)  Printf("%s:%d could not get AODtracks", (char*)__FILE__,__LINE__);
-                                                                                               continue;
-                                                               }
-
-                                                               Int_t nt = fAODIn->GetNumberOfTracks();
-                                                               AliAODTrack* trackAOD=NULL;
-                                                               for(int ntrack =0;ntrack<nt;ntrack++){
-                                                                                               trackAOD = (AliAODTrack*) (tracks->At(ntrack));
-                                                                                               Bool_t bgoodT=false;
-                                                                                               if(Filtermask!=768){if(trackAOD->TestFilterMask(Filtermask))bgoodT=true;}
-                                                                                               else               {if(trackAOD->IsHybridGlobalConstrainedGlobal())bgoodT=true;} //for hybrid Track cuts
-                                                                                               if(!bgoodT)continue;
-                                                                                               if(TMath::Abs(trackAOD->Eta())<0.9){
-                                                                                                                               Track_n++;
-                                                                                                                               fH1Track_pt ->Fill(trackAOD->Pt()*TrackEScale);
-                                                                                                                               fH1Track_phi->Fill(trackAOD->Phi());
-                                                                                                                               fH1Track_eta->Fill(trackAOD->Eta());
-
-                                                                                                                               // track pt resplution-------------------
-                                                                                                                               Int_t MCID = TMath::Abs(trackAOD->GetLabel());
-                                                                                                                               TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
-                                                                                                                               if(!mctracks){
-                                                                                                                                                               if (fDebug > 1)  Printf("%s:%d could not get AODMCtracks", (char*)__FILE__,__LINE__);
-                                                                                                                                                               continue;
-                                                                                                                               }
-                                                                                                                               AliAODMCParticle *trackMCAOD = (AliAODMCParticle*) mctracks->At(MCID);
-                                                                                                                               fH2TrackMCptResolution->Fill(trackMCAOD->Pt(),trackAOD->Pt());
-                                                                                                                               // --------------------------------------
-                                                                                               }
-                                                               }
-                                                               if(IsMC){// still under construction
-                                                                                               //MC Track
-                                                                                               TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
-                                                                                               if(!mctracks){
-                                                                                                                               if (fDebug > 1)  Printf("%s:%d could not get AODMCtracks", (char*)__FILE__,__LINE__);
-                                                                                                                               continue;
-                                                                                               }
-                                                                                               Int_t ntmc = mctracks->GetEntriesFast();
-                                                                                               AliAODMCParticle* trackMCAOD;
-                                                                                               int lastprim=0;
-                                                                                               for(int ntrack =0;ntrack<ntmc;ntrack++){
-                                                                                                                               trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
-                                                                                                                               if((trackMCAOD->IsPhysicalPrimary())==1)lastprim=ntrack;
-                                                                                               }
-                                                                                               for(int ntrack =0;ntrack<ntmc;ntrack++){
-                                                                                                                               trackMCAOD = (AliAODMCParticle*) (mctracks->At(ntrack));
-                                                                                                                               if((trackMCAOD->GetPdgCode()>10)&&((trackMCAOD->GetMother())>1)&&(ntrack>lastprim)&&(trackMCAOD->Charge())){// for Decay particles
-                                                                                                                                                               fH1MCTrack_pt ->Fill(trackAOD->Pt());
-                                                                                                                                                               fH1MCTrack_phi->Fill(trackAOD->Phi());
-                                                                                                                                                               fH1MCTrack_eta->Fill(trackAOD->Eta());
-                                                                                                                               }
-                                                                                                                               if((trackMCAOD->IsPhysicalPrimary())&&(trackMCAOD->Charge())){// for Physical particles
-                                                                                                                                                               MCTrack_n++;
-                                                                                                                                                               fH1MCTrack_pt ->Fill(trackAOD->Pt());
-                                                                                                                                                               fH1MCTrack_phi->Fill(trackAOD->Phi());
-                                                                                                                                                               fH1MCTrack_eta->Fill(trackAOD->Eta());
-                                                                                                                                                               fH1MCPrimTrack_pt ->Fill(trackAOD->Pt());
-                                                                                                                                                               fH1MCPrimTrack_phi->Fill(trackAOD->Phi());
-                                                                                                                                                               fH1MCPrimTrack_eta->Fill(trackAOD->Eta());
-                                                                                                                               }
-                                                                                               }
-                                                               }//still under construction
-                                                               //@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  count number of tracks
 
                                                                //Jet-Hadron Correlation###############################################
                                                                if((findDiJet)&&(Leading_pt>10.)&&(sLeading_pt>10.)){
@@ -1027,12 +952,15 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                                                                                for(int ntrack =0;ntrack<nt;ntrack++){
                                                                                                                                                                                                                                trackAOD = (AliAODTrack*) (fAODIn->GetTrack(ntrack));
                                                                                                                                                                                                                                Bool_t bgoodT=false;
-                                                                                                                                                                                                                               if(Filtermask!=768){if(trackAOD->TestFilterMask(Filtermask))bgoodT=true;}
+                                                                                                                                                                                                                               if(Filtermask!=272){if(trackAOD->TestFilterMask(Filtermask))bgoodT=true;}
                                                                                                                                                                                                                                else{               if(trackAOD->IsHybridGlobalConstrainedGlobal())bgoodT=true;} //for hybrid Track cuts
                                                                                                                                                                                                                                if(!bgoodT)continue;
-                                                                                                                                                                                                                               Track_pt   [ntrack]      = trackAOD->Pt()*TrackEScale;
+                                                                                                                                                                                                                               Track_pt   [ntrack]      = (trackAOD->Pt()*TrackEScale);
                                                                                                                                                                                                                                Track_phi  [ntrack]      = trackAOD->Phi();
                                                                                                                                                                                                                                Track_eta  [ntrack]      = trackAOD->Eta();
+
+                                                                                                                                                                                                                               //cout<<"Scale "<<TrackEScale<<"  org pt "<<trackAOD->Pt()<< " scaled pt "<< trackAOD->Pt()*TrackEScale <<endl;
+
                                                                                                                                                                                                                                double DelPhi = DeltaPhi(Leading_phi,Track_phi[ntrack]);
                                                                                                                                                                                                                                if(TMath::Abs(Track_eta[ntrack])<0.9){
                                                                                                                                                                                                                                                                if((TMath::Abs(DelPhi-pi/2.)<pi/8.)||((DelPhi+pi/2.)<pi/8.)||(TMath::Abs(DelPhi-3./2.*pi)<pi/8.))Munder++;
@@ -1056,7 +984,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                                                                                                                                                }
                                                                                                                                                                                                                                }
                                                                                                                                                                                                }//Track Loop
-                                                                                                                                                                                               if(IsMC){// still under construction
+                                                                                                                                                                                               if(IsMC){
                                                                                                                                                                                                                                //MC Track
                                                                                                                                                                                                                                TClonesArray* mctracks = dynamic_cast <TClonesArray*> (fAODIn->GetList()->FindObject(AliAODMCParticle::StdBranchName()));
                                                                                                                                                                                                                                if(!mctracks){
@@ -1135,7 +1063,7 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                                                                                                                                                                                }
                                                                                                                                                                                                                                                                }
                                                                                                                                                                                                                                }
-                                                                                                                                                                                               }//still under construction
+                                                                                                                                                                                               }
                                                                                                                                                                }
                                                                                                                                }// Momentum Loop Jet
                                                                                                                                fH2Jet_pt_Munder   ->Fill(Leading_pt,(double)Munder/(1.8*pi/2.)*Jet_area[0][nLJet]);
@@ -1166,6 +1094,10 @@ void AliAnalysisTaskJetHadronCorrelation::UserExec(Option_t *)
                                                                                                                                if(findDiJetMC)fH2MleadCorrelation_MCRec->Fill(MleadMC,Mlead);
                                                                                                }
                                                                }
+                                                               fH2Mult_Mtrack->Fill(Mult,Track_n); 
+                                                               fH2Mult_Mjet  ->Fill(Mult,Mjet_tot);
+                                                               fH2Mult_Njet  ->Fill(Mult,Njet_tot);
+                                                               if(findLJetAOD)fH2Mult_Mlead ->Fill(Mult,Mlead);   
                                }
                                else{
                                                                fH2Mult_Mtrack->Fill(Mult,Track_n);