]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.cxx
changed binning for event pool, added more trigger QA histos, added more mixed event...
[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / UserTasks / AliAnalysisTaskEmcalJetHadEPpid.cxx
index 44b9adfb2e7fe295c27fed4380fddbbcf339ad8b..f8d22a0ebe4ca9c21fc2ad4af245f16842fdd68c 100644 (file)
@@ -47,6 +47,7 @@
 #include "AliESDInputHandler.h"
 #include "AliPicoTrack.h"
 #include "AliEventPoolManager.h"
+#include "AliESDtrackCuts.h"
 
 // PID includes
 #include "AliPIDResponse.h"
@@ -74,24 +75,31 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid() :
   fEtamin(-0.9), fEtamax(0.9),
   fAreacut(0.0), fTrkBias(5), fClusBias(5), fTrkEta(0.9), 
   fJetPtcut(15.0), fJetRad(0.4), fConstituentCut(0.15),
-  fDoEventMixing(0), fMixingTracks(50000),
+  fesdTrackCuts(0),
+  fDoEventMixing(0), fMixingTracks(50000), fNMIXtracks(5000), fNMIXevents(5),
+  fTriggerEventType(AliVEvent::kAny), fMixingEventType(AliVEvent::kAny),
   doPlotGlobalRho(0), doVariableBinning(0), dovarbinTHnSparse(0), 
-  makeQAhistos(0), makeBIAShistos(0), makeextraCORRhistos(0),
-  useAOD(0), fcutType("EMCAL"), doPID(0), doPIDtrackBIAS(0),
+  makeQAhistos(0), makeBIAShistos(0), makeextraCORRhistos(0), makeoldJEThadhistos(0),
+  allpidAXIS(0), fcutType("EMCAL"), doPID(0), doPIDtrackBIAS(0),
   doComments(0),
+  doFlavourJetAnalysis(0), fJetFlavTag(-99),
+  fBeam(kNA),
   fLocalRhoVal(0),
-  fTracksName(""), fJetsName(""),
+  fTracksName(""), fTracksNameME(""), fJetsName(""),
   event(0),
-  isPItpc(0), isKtpc(0), isPtpc(0), nPIDtpc(0) ,   // pid TPC
-  isPIits(0), isKits(0), isPits(0), nPIDits(0) ,  // pid ITS
-  isPItof(0), isKtof(0), isPtof(0), nPIDtof(0) ,  // pid TOF
+  isPItpc(0), isKtpc(0), isPtpc(0), // pid TPC
+  isPIits(0), isKits(0), isPits(0), // pid ITS
+  isPItof(0), isKtof(0), isPtof(0), // pid TOF
   fPoolMgr(0x0),
   fPIDResponse(0x0), fTPCResponse(),
-  fESD(0), fAOD(0),
+  fESD(0), fAOD(0), fVevent(0),  
+  fHistEventQA(0), fHistEventSelectionQA(0),
+  fHistCentZvertGA(0), fHistCentZvertJE(0), fHistCentZvertMB(0), fHistCentZvertAny(0),
   fHistTPCdEdX(0), fHistITSsignal(0), //fHistTOFsignal(0),
   fHistRhovsCent(0), fHistNjetvsCent(0), fHistCentrality(0),
   fHistZvtx(0), fHistMult(0),
   fHistJetPhi(0), fHistTrackPhi(0),
+  fHistLocalRhoJetpt(0),
   fHistJetHaddPhiIN(0), fHistJetHaddPhiOUT(0), fHistJetHaddPhiMID(0),
   fHistJetHaddPhiBias(0), fHistJetHaddPhiINBias(0), fHistJetHaddPhiOUTBias(0), fHistJetHaddPhiMIDBias(0),
   fHistMEdPHI(0),
@@ -100,14 +108,14 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid() :
   fHistSEphieta(0), fHistMEphieta(0),
   fHistJetHaddPHI(0),
   fHistPID(0),
-  fhnPID(0x0), fhnMixedEvents(0x0), fhnJH(0x0),
+  fhnPID(0x0), fhnMixedEvents(0x0), fhnJH(0x0), fhnCorr(0x0),
   fJetsCont(0), fTracksCont(0), fCaloClustersCont(0),
   fContainerAllJets(0), fContainerPIDJets(1)
 {
   // Default Constructor 
   for(Int_t ilab=0; ilab<4; ilab++){
     for(Int_t ipta=0; ipta<7; ipta++){
-      fHistTrackEtaPhi[ilab][ipta]=0;
+      //fHistTrackEtaPhi[ilab][ipta]=0; // keep out for now
     }  // end of pt-associated loop
   } // end of lab loop
     
@@ -118,12 +126,7 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid() :
     fHistJetHadbindPhiOUT[itrackpt]=0;
   } // end of trackpt bin loop
 
-  for(Int_t icent = 0; icent<2; ++icent){
-    fHistJetPt[icent]=0;
-    fHistJetPtBias[icent]=0;
-    fHistJetPtTT[icent]=0;
-    fHistAreavsRawPt[icent]=0;
-    
+  for(Int_t icent = 0; icent<6; ++icent){
     for(Int_t iptjet = 0; iptjet<5; ++iptjet){
       for(Int_t ieta = 0; ieta<3; ++ieta){
         fHistJetH[icent][iptjet][ieta]=0;
@@ -135,6 +138,10 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid() :
 
   // centrality dependent histo's
   for (Int_t i = 0;i<6;++i){
+    fHistJetPt[i]                              = 0;
+    fHistJetPtBias[i]                  = 0;
+    fHistJetPtTT[i]                            = 0;
+    fHistAreavsRawPt[i]                        = 0;
     fHistJetPtvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
@@ -163,9 +170,6 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid() :
 
   SetMakeGeneralHistograms(kTRUE);
   
-  // define input and output slots here
-  DefineInput(0, TChain::Class());
-  DefineOutput(1, TList::Class());
 }
 
 //________________________________________________________________________
@@ -175,24 +179,31 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid(const char *nam
   fEtamin(-0.9), fEtamax(0.9),
   fAreacut(0.0), fTrkBias(5), fClusBias(5), fTrkEta(0.9), 
   fJetPtcut(15.0), fJetRad(0.4), fConstituentCut(0.15),
-  fDoEventMixing(0), fMixingTracks(50000),
+  fesdTrackCuts(0),
+  fDoEventMixing(0), fMixingTracks(50000), fNMIXtracks(5000), fNMIXevents(5),
+  fTriggerEventType(AliVEvent::kAny), fMixingEventType(AliVEvent::kAny),
   doPlotGlobalRho(0), doVariableBinning(0), dovarbinTHnSparse(0), 
-  makeQAhistos(0), makeBIAShistos(0), makeextraCORRhistos(0),
-  useAOD(0), fcutType("EMCAL"), doPID(0), doPIDtrackBIAS(0),
+  makeQAhistos(0), makeBIAShistos(0), makeextraCORRhistos(0), makeoldJEThadhistos(0),
+  allpidAXIS(0), fcutType("EMCAL"), doPID(0), doPIDtrackBIAS(0),
   doComments(0),
+  doFlavourJetAnalysis(0), fJetFlavTag(-99),
+  fBeam(kNA),
   fLocalRhoVal(0),
-  fTracksName(""), fJetsName(""),
+  fTracksName(""), fTracksNameME(""), fJetsName(""),
   event(0),
-  isPItpc(0), isKtpc(0), isPtpc(0), nPIDtpc(0),   // pid TPC
-  isPIits(0), isKits(0), isPits(0), nPIDits(0),   // pid ITS
-  isPItof(0), isKtof(0), isPtof(0), nPIDtof(0),   // pid TOF
+  isPItpc(0), isKtpc(0), isPtpc(0), // pid TPC
+  isPIits(0), isKits(0), isPits(0), // pid ITS
+  isPItof(0), isKtof(0), isPtof(0), // pid TOF
   fPoolMgr(0x0),
   fPIDResponse(0x0), fTPCResponse(),
-  fESD(0), fAOD(0),
+  fESD(0), fAOD(0), fVevent(0),  
+  fHistEventQA(0), fHistEventSelectionQA(0),
+  fHistCentZvertGA(0), fHistCentZvertJE(0), fHistCentZvertMB(0), fHistCentZvertAny(0),
   fHistTPCdEdX(0), fHistITSsignal(0), //fHistTOFsignal(0),
   fHistRhovsCent(0), fHistNjetvsCent(0), fHistCentrality(0),
   fHistZvtx(0), fHistMult(0),
   fHistJetPhi(0), fHistTrackPhi(0),
+  fHistLocalRhoJetpt(0),
   fHistJetHaddPhiIN(0), fHistJetHaddPhiOUT(0), fHistJetHaddPhiMID(0),
   fHistJetHaddPhiBias(0), fHistJetHaddPhiINBias(0), fHistJetHaddPhiOUTBias(0), fHistJetHaddPhiMIDBias(0),
   fHistMEdPHI(0),
@@ -201,14 +212,14 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid(const char *nam
   fHistSEphieta(0), fHistMEphieta(0),
   fHistJetHaddPHI(0),
   fHistPID(0),
-  fhnPID(0x0), fhnMixedEvents(0x0), fhnJH(0x0),
+  fhnPID(0x0), fhnMixedEvents(0x0), fhnJH(0x0), fhnCorr(0x0),
   fJetsCont(0), fTracksCont(0), fCaloClustersCont(0),
   fContainerAllJets(0), fContainerPIDJets(1)
 {   
   // Default Constructor 
   for(Int_t ilab=0; ilab<4; ilab++){
     for(Int_t ipta=0; ipta<7; ipta++){
-      fHistTrackEtaPhi[ilab][ipta]=0;
+      //fHistTrackEtaPhi[ilab][ipta]=0; //keep out for now
     }  // end of pt-associated loop
   } // end of lab loop
 
@@ -219,12 +230,7 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid(const char *nam
     fHistJetHadbindPhiOUT[itrackpt]=0;
   } // end of trackpt bin loop
     
-  for(Int_t icent = 0; icent<2; ++icent){
-    fHistJetPt[icent]=0;
-    fHistJetPtBias[icent]=0;
-    fHistJetPtTT[icent]=0;
-    fHistAreavsRawPt[icent]=0;
-    
+  for(Int_t icent = 0; icent<6; ++icent){
     for(Int_t iptjet = 0; iptjet<5; ++iptjet){
       for(Int_t ieta = 0; ieta<3; ++ieta){
         fHistJetH[icent][iptjet][ieta]=0;
@@ -236,6 +242,10 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid(const char *nam
 
   // centrality dependent histo's
   for (Int_t i = 0;i<6;++i){
+    fHistJetPt[i]                              = 0;
+    fHistJetPtBias[i]                  = 0;
+    fHistJetPtTT[i]                            = 0;
+    fHistAreavsRawPt[i]                        = 0;
     fHistJetPtvsTrackPt[i]      = 0;
     fHistRawJetPtvsTrackPt[i]   = 0;
     fHistTrackPt[i]             = 0;
@@ -264,9 +274,6 @@ AliAnalysisTaskEmcalJetHadEPpid::AliAnalysisTaskEmcalJetHadEPpid(const char *nam
 
   SetMakeGeneralHistograms(kTRUE);
 
-  // define input and output slots here
-  DefineInput(0, TChain::Class());
-  DefineOutput(1, TList::Class());
 }
 
 //_______________________________________________________________________
@@ -290,16 +297,61 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
   int nchar = 200;
   char name[nchar];
 
+  // strings for titles
+  TString name1;
+  TString title1;
+
   // create histograms that arn't array
+  fHistNjetvsCent = new TH2F("NjetvsCent", "NjetvsCent", 100, 0.0, 100.0, 100, 0, 100);
+  fHistJetHaddPHI = new TH1F("fHistJetHaddPHI", "Jet-Hadron #Delta#varphi", 128,-0.5*TMath::Pi(),1.5*TMath::Pi());
+  fHistJetHaddPhiIN = new TH1F("fHistJetHaddPhiIN","Jet-Hadron #Delta#varphi IN PLANE", 128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+  fHistJetHaddPhiOUT = new TH1F("fHistJetHaddPhiOUT","Jet-Hadron #Delta#varphi OUT PLANE",128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+  fHistJetHaddPhiMID = new TH1F("fHistJetHaddPhiMID","Jet-Hadron #Delta#varphi MIDDLE of PLANE",128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+  fHistLocalRhoJetpt = new TH1F("fHistLocalRhoJetpt","Local Rho corrected Jet p_{T}", 50, -50, 200);
+
+  // Centrality and Zvertex distribution for various triggers - Event Mixing QA
+  fHistCentZvertGA = new TH2F("fHistCentZvertGA", "Centrality - Z-vertex distribution for GA trigger", 20, 0, 100, 10, -10, 10);
+  fOutput->Add(fHistCentZvertGA);
+  fHistCentZvertJE = new TH2F("fHistCentZvertJE", "Centrality - Z-vertex distribution for JE trigger", 20, 0, 100, 10, -10, 10);
+  fOutput->Add(fHistCentZvertJE);
+  fHistCentZvertMB = new TH2F("fHistCentZvertMB", "Centrality - Z-vertex distribution for MB trigger", 20, 0, 100, 10, -10, 10);
+  fOutput->Add(fHistCentZvertMB);
+  fHistCentZvertAny = new TH2F("fHistCentZvertAny", "Centrality - Z-vertex distribution for kAny trigger", 20, 0, 100, 10, -10, 10);
+  fOutput->Add(fHistCentZvertAny);
+
+  // Event QA histo  
+  fHistEventQA = new TH1F("fHistEventQA", "Event Counter at checkpoints in code", 20, 0.5, 20.5);
+  SetfHistQAcounterLabels(fHistEventQA); 
+  fOutput->Add(fHistEventQA);
+
+  // Event Selection QA histo
+  fHistEventSelectionQA = new TH1F("fHistEventSelectionQA", "Trigger Selection Counter", 20, 0.5, 20.5);
+  SetfHistEvtSelQALabels(fHistEventSelectionQA);
+  fOutput->Add(fHistEventSelectionQA);
+
+  // add to output lists
+  fOutput->Add(fHistNjetvsCent);
+  fOutput->Add(fHistJetHaddPHI);
+  fOutput->Add(fHistJetHaddPhiIN);
+  fOutput->Add(fHistJetHaddPhiOUT);
+  fOutput->Add(fHistJetHaddPhiMID);
+  fOutput->Add(fHistLocalRhoJetpt);
+
+  // create histo's used for general QA
   if (makeQAhistos) {
     fHistTPCdEdX = new TH2F("TPCdEdX", "TPCdEdX", 2000, 0.0, 100.0, 500, 0, 500); 
     fHistITSsignal = new TH2F("ITSsignal", "ITSsignal", 2000, 0.0, 100.0, 500, 0, 500);
-  //  fHistTOFsignal = new TH2F("TOFsignal", "TOFsignal", 2000, 0.0, 100.0, 500, 0, 500);
+    //  fHistTOFsignal = new TH2F("TOFsignal", "TOFsignal", 2000, 0.0, 100.0, 500, 0, 500);
     fHistCentrality = new TH1F("fHistCentrality","centrality",100,0,100);
     fHistZvtx = new TH1F("fHistZvertex","z vertex",60,-30,30);
     fHistJetPhi = new TH1F("fHistJetPhi", "Jet #phi Distribution", 128, -2.0*TMath::Pi(), 2.0*TMath::Pi());
     fHistTrackPhi = new TH1F("fHistTrackPhi", "Track #phi Distribution", 128, -2.0*TMath::Pi(), 2.0*TMath::Pi());  
     fHistRhovsCent = new TH2F("RhovsCent", "RhovsCent", 100, 0.0, 100.0, 500, 0, 500);
+    fHistTrackPtallcent = new TH1F("fHistTrackPtallcent", "p_{T} distribution", 1000, 0.0, 100.0);
+    fHistJetEtaPhi = new TH2F("fHistJetEtaPhi","Jet #eta-#phi",512,-1.8,1.8,512,-3.2,3.2);
+    fHistJetHEtaPhi = new TH2F("fHistJetHEtaPhi","Jet-Hadron #Delta#eta-#Delta#phi", 72, -1.8, 1.8, 72, -1.6, 4.8);
+    fHistSEphieta = new TH2F("fHistSEphieta", "Single Event #phi-#eta distribution", 64,-0.5*TMath::Pi(), 1.5*TMath::Pi(), 64,-1.8,1.8);  // was 64 bins
+    fHistMEphieta = new TH2F("fHistMEphieta", "Mixed Event #phi-#eta distribution", 64, -0.5*TMath::Pi(), 1.5*TMath::Pi(), 64,-1.8,1.8);  // was 64 bins
 
     // add to output list
     fOutput->Add(fHistTPCdEdX);
@@ -310,14 +362,85 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
     fOutput->Add(fHistJetPhi);
     fOutput->Add(fHistTrackPhi);
     //fOutput->Add(fHistTrackEtaPhi);
+    fOutput->Add(fHistTrackPtallcent);
+    fOutput->Add(fHistJetEtaPhi);
+    fOutput->Add(fHistJetHEtaPhi);
+    fOutput->Add(fHistSEphieta);
+    fOutput->Add(fHistMEphieta);
+
+    //for(Int_t ipta=0; ipta<7; ++ipta){ 
+    //  for(Int_t ilab=0; ilab<4; ++ilab){
+    //    snprintf(name, nchar, "fHistTrackEtaPhi_%i_%i", ilab,ipta);
+    //    fHistTrackEtaPhi[ilab][ipta] = new TH2F(name,name,400,-1,1,640,0.0,2.*TMath::Pi());
+    //    fOutput->Add(fHistTrackEtaPhi[ilab][ipta]);
+    //  } // end of lab loop
+    //} // end of pt-associated loop
+
+    for (Int_t i = 0;i<6;++i){
+      name1 = TString(Form("EP0_%i",i));
+      title1 = TString(Form("EP VZero cent bin %i",i));
+      fHistEP0[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
+      fOutput->Add(fHistEP0[i]);
+
+      name1 = TString(Form("EP0A_%i",i));
+      title1 = TString(Form("EP VZero cent bin %i",i));
+      fHistEP0A[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
+      fOutput->Add(fHistEP0A[i]);
 
-    for(Int_t ipta=0; ipta<7; ++ipta){ 
-      for(Int_t ilab=0; ilab<4; ++ilab){
-        snprintf(name, nchar, "fHistTrackEtaPhi_%i_%i", ilab,ipta);
-        fHistTrackEtaPhi[ilab][ipta] = new TH2F(name,name,400,-1,1,640,0.0,2.*TMath::Pi());
-        fOutput->Add(fHistTrackEtaPhi[ilab][ipta]);
-      } // end of lab loop
-    } // end of pt-associated loop
+      name1 = TString(Form("EP0C_%i",i));
+      title1 = TString(Form("EP VZero cent bin %i",i));
+      fHistEP0C[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
+      fOutput->Add(fHistEP0C[i]);
+
+      name1 = TString(Form("EPAvsC_%i",i));
+      title1 = TString(Form("EP VZero cent bin %i",i));
+      fHistEPAvsC[i] = new TH2F(name1,title1,144,-TMath::Pi(),TMath::Pi(),144,-TMath::Pi(),TMath::Pi());
+      fOutput->Add(fHistEPAvsC[i]);
+
+      name1 = TString(Form("JetPtvsTrackPt_%i",i));
+      title1 = TString(Form("Jet p_{T} vs Leading Track p_{T} cent bin %i",i));
+      fHistJetPtvsTrackPt[i] = new TH2F(name1,title1,250,-50,200,250,0,50);
+      fOutput->Add(fHistJetPtvsTrackPt[i]);
+
+      name1 = TString(Form("RawJetPtvsTrackPt_%i",i));
+      title1 = TString(Form("Raw Jet p_{T} vs Leading Track p_{T} cent bin %i",i));
+      fHistRawJetPtvsTrackPt[i] = new TH2F(name1,title1,250,-50,200,250,0,50);
+      fOutput->Add(fHistRawJetPtvsTrackPt[i]);
+
+      name1 = TString(Form("TrackPt_%i",i));
+      title1 = TString(Form("Track p_{T} cent bin %i",i));
+      fHistTrackPt[i] = new TH1F(name1,title1,1000,0,100); // up to 200?
+      fOutput->Add(fHistTrackPt[i]);   
+
+      name1 = TString(Form("JetPtcorrGLrho_%i",i));
+      title1 = TString(Form("Jet p_{T} corrected with Global #rho cent bin %i",i));
+      fHistJetPtcorrGlRho[i] = new TH1F(name1,title1,300,-100,200); // up to 200?
+      fOutput->Add(fHistJetPtcorrGlRho[i]);  
+    
+      name1 = TString(Form("JetPtvsdEP_%i",i));
+      title1 = TString(Form("Jet p_{T} vs #DeltaEP cent bin %i",i));
+      fHistJetPtvsdEP[i] = new TH2F(name1,title1,250,-50,200,288,-2*TMath::Pi(),2*TMath::Pi());
+      fOutput->Add(fHistJetPtvsdEP[i]);
+
+      name1 = TString(Form("RhovsdEP_%i",i));
+      title1 = TString(Form("#rho vs #DeltaEP cent bin %i",i));
+      fHistRhovsdEP[i] = new TH2F(name1,title1,500,0,500,288,-2*TMath::Pi(),2*TMath::Pi());
+      fOutput->Add(fHistRhovsdEP[i]);
+
+      name1 = TString(Form("JetEtaPhiPt_%i",i));
+      title1 = TString(Form("Jet #eta-#phi p_{T} cent bin %i",i));
+      fHistJetEtaPhiPt[i] = new TH3F(name1,title1,250,-50,200,100,-1,1,64,-3.2,3.2);
+      fOutput->Add(fHistJetEtaPhiPt[i]);
+
+      name1 = TString(Form("JetPtArea_%i",i));
+      title1 = TString(Form("Jet p_{T} Area cent bin %i",i));
+      fHistJetPtArea[i] = new TH2F(name1,title1,250,-50,200,100,0,1);
+      fOutput->Add(fHistJetPtArea[i]);
+
+      snprintf(name, nchar, "fHistAreavsRawPt_%i",i);
+      fHistAreavsRawPt[i] = new TH2F(name,name,100,0,1,200,0,200);
+      fOutput->Add(fHistAreavsRawPt[i]);
+    } // loop over centrality
 
   } // QA histo switch
 
@@ -332,52 +455,31 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
     fOutput->Add(fHistJetHaddPhiINBias);
     fOutput->Add(fHistJetHaddPhiOUTBias);
     fOutput->Add(fHistJetHaddPhiMIDBias);
-  }
 
-  fHistNjetvsCent = new TH2F("NjetvsCent", "NjetvsCent", 100, 0.0, 100.0, 100, 0, 100);
-  fHistTrackPtallcent = new TH1F("fHistTrackPtallcent", "p_{T} distribution", 1000, 0.0, 100.0);
-  fHistJetEtaPhi = new TH2F("fHistJetEtaPhi","Jet #eta-#phi",512,-1.8,1.8,512,-3.2,3.2);
-  fHistJetHEtaPhi = new TH2F("fHistJetHEtaPhi","Jet-Hadron #Delta#eta-#Delta#phi",512,-1.8,1.8,256,-1.6,4.8);
-  fHistSEphieta = new TH2F("fHistSEphieta", "Single Event #phi-#eta distribution", 64,-0.5*TMath::Pi(), 1.5*TMath::Pi(), 64,-1.8,1.8);  // was 64 bins
-  fHistMEphieta = new TH2F("fHistMEphieta", "Mixed Event #phi-#eta distribution", 64, -0.5*TMath::Pi(), 1.5*TMath::Pi(), 64,-1.8,1.8);  // was 64 bins
-  fHistJetHaddPHI = new TH1F("fHistJetHaddPHI", "Jet-Hadron #Delta#varphi", 128,-0.5*TMath::Pi(),1.5*TMath::Pi());
-  fHistJetHaddPhiIN = new TH1F("fHistJetHaddPhiIN","Jet-Hadron #Delta#varphi IN PLANE", 128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-  fHistJetHaddPhiOUT = new TH1F("fHistJetHaddPhiOUT","Jet-Hadron #Delta#varphi OUT PLANE",128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-  fHistJetHaddPhiMID = new TH1F("fHistJetHaddPhiMID","Jet-Hadron #Delta#varphi MIDDLE of PLANE",128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+    for (Int_t i = 0;i<6;++i){
+      name1 = TString(Form("JetPtvsdEPBias_%i",i));
+      title1 = TString(Form("Bias Jet p_{T} vs #DeltaEP cent bin %i",i));
+      fHistJetPtvsdEPBias[i] = new TH2F(name1,title1,250,-50,200,288,-2*TMath::Pi(),2*TMath::Pi());
+      fOutput->Add(fHistJetPtvsdEPBias[i]);
 
-  // add to output lists
-  fOutput->Add(fHistNjetvsCent);
-  fOutput->Add(fHistTrackPtallcent);
-  fOutput->Add(fHistJetEtaPhi);
-  fOutput->Add(fHistJetHEtaPhi);
-  fOutput->Add(fHistJetHaddPhiIN);
-  fOutput->Add(fHistJetHaddPhiOUT);
-  fOutput->Add(fHistJetHaddPhiMID);
-  fOutput->Add(fHistSEphieta);
-  fOutput->Add(fHistMEphieta);
-  fOutput->Add(fHistJetHaddPHI);
-
-  // jet hadron (binned) correlations in dPHI
-  for(Int_t itrackpt=0; itrackpt<9; itrackpt++){
-    snprintf(name, nchar, "fHistJetHadbindPhi_%i",itrackpt);
-    fHistJetHadbindPhi[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHadbindPhi[itrackpt]);
+      name1 = TString(Form("JetEtaPhiPtBias_%i",i));
+      title1 = TString(Form("Jet #eta-#phi p_{T} Bias cent bin %i",i));
+      fHistJetEtaPhiPtBias[i] = new TH3F(name1,title1,250,-50,200,100,-1,1,64,-3.2,3.2);
+      fOutput->Add(fHistJetEtaPhiPtBias[i]);
 
-    snprintf(name, nchar, "fHistJetHadbindPhiIN_%i",itrackpt);
-    fHistJetHadbindPhiIN[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHadbindPhiIN[itrackpt]);
-
-    snprintf(name, nchar, "fHistJetHadbindPhiMID_%i",itrackpt);
-    fHistJetHadbindPhiMID[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHadbindPhiMID[itrackpt]);
+      name1 = TString(Form("JetPtAreaBias_%i",i));
+      title1 = TString(Form("Jet p_{T} Area Bias cent bin %i",i));
+      fHistJetPtAreaBias[i] = new TH2F(name1,title1,250,-50,200,100,0,1);
+      fOutput->Add(fHistJetPtAreaBias[i]);
+    }  // end of centrality loop
+  } // bias histos
 
-    snprintf(name, nchar, "fHistJetHadbindPhiOUT_%i",itrackpt);
-    fHistJetHadbindPhiOUT[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHadbindPhiOUT[itrackpt]);
-  } // end of trackpt bin loop
+  if (makeoldJEThadhistos) {
+    for(Int_t icent = 0; icent<6; ++icent){
+      snprintf(name, nchar, "fHistJetPtTT_%i",icent);
+      fHistJetPtTT[icent] = new TH1F(name,name,200,0,200);
+      fOutput->Add(fHistJetPtTT[icent]);
 
-  if (makeextraCORRhistos) {
-    for(Int_t icent = 0; icent<2; ++icent){
       snprintf(name, nchar, "fHistJetPt_%i",icent);
       fHistJetPt[icent] = new TH1F(name,name,200,0,200);
       fOutput->Add(fHistJetPt[icent]);
@@ -386,14 +488,6 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
       fHistJetPtBias[icent] = new TH1F(name,name,200,0,200);
       fOutput->Add(fHistJetPtBias[icent]);
 
-      snprintf(name, nchar, "fHistJetPtTT_%i",icent);
-      fHistJetPtTT[icent] = new TH1F(name,name,200,0,200);
-      fOutput->Add(fHistJetPtTT[icent]);
-
-      snprintf(name, nchar, "fHistAreavsRawPt_%i",icent);
-      fHistAreavsRawPt[icent] = new TH2F(name,name,100,0,1,200,0,200);
-      fOutput->Add(fHistAreavsRawPt[icent]);
-
       for(Int_t iptjet = 0; iptjet<5; ++iptjet){
         for(Int_t ieta = 0; ieta<3; ++ieta){
           snprintf(name, nchar, "fHistJetH_%i_%i_%i",icent,iptjet,ieta);
@@ -412,103 +506,40 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
     } // end of centrality loop
   } // make JetHadhisto old
 
-  // strings for titles
-  TString name1;
-  TString title1;
-
-  for (Int_t i = 0;i<6;++i){
-    if (makeQAhistos) {
-      name1 = TString(Form("EP0_%i",i));
-      title1 = TString(Form("EP VZero cent bin %i",i));
-      fHistEP0[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
-      fOutput->Add(fHistEP0[i]);
-
-      name1 = TString(Form("EP0A_%i",i));
-      title1 = TString(Form("EP VZero cent bin %i",i));
-      fHistEP0A[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
-      fOutput->Add(fHistEP0A[i]);
-
-      name1 = TString(Form("EP0C_%i",i));
-      title1 = TString(Form("EP VZero cent bin %i",i));
-      fHistEP0C[i] = new TH1F(name1,title1,144,-TMath::Pi(),TMath::Pi());
-      fOutput->Add(fHistEP0C[i]);
-
-      name1 = TString(Form("EPAvsC_%i",i));
-      title1 = TString(Form("EP VZero cent bin %i",i));
-      fHistEPAvsC[i] = new TH2F(name1,title1,144,-TMath::Pi(),TMath::Pi(),144,-TMath::Pi(),TMath::Pi());
-      fOutput->Add(fHistEPAvsC[i]);
-
-      name1 = TString(Form("JetPtvsTrackPt_%i",i));
-      title1 = TString(Form("Jet p_{T} vs Leading Track p_{T} cent bin %i",i));
-      fHistJetPtvsTrackPt[i] = new TH2F(name1,title1,250,-50,200,250,0,50);
-      fOutput->Add(fHistJetPtvsTrackPt[i]);
-
-      name1 = TString(Form("RawJetPtvsTrackPt_%i",i));
-      title1 = TString(Form("Raw Jet p_{T} vs Leading Track p_{T} cent bin %i",i));
-      fHistRawJetPtvsTrackPt[i] = new TH2F(name1,title1,250,-50,200,250,0,50);
-      fOutput->Add(fHistRawJetPtvsTrackPt[i]);
-
-      name1 = TString(Form("TrackPt_%i",i));
-      title1 = TString(Form("Track p_{T} cent bin %i",i));
-      fHistTrackPt[i] = new TH1F(name1,title1,1000,0,100); // up to 200?
-      fOutput->Add(fHistTrackPt[i]);   
-
-      name1 = TString(Form("JetPtcorrGLrho_%i",i));
-      title1 = TString(Form("Jet p_{T} corrected with Global #rho cent bin %i",i));
-      fHistJetPtcorrGlRho[i] = new TH1F(name1,title1,300,-100,200); // up to 200?
-      fOutput->Add(fHistJetPtcorrGlRho[i]);  
-    }
-
-    name1 = TString(Form("JetPtvsdEP_%i",i));
-    title1 = TString(Form("Jet p_{T} vs #DeltaEP cent bin %i",i));
-    fHistJetPtvsdEP[i] = new TH2F(name1,title1,250,-50,200,288,-2*TMath::Pi(),2*TMath::Pi());
-    fOutput->Add(fHistJetPtvsdEP[i]);
-
-    name1 = TString(Form("JetPtvsdEPBias_%i",i));
-    title1 = TString(Form("Bias Jet p_{T} vs #DeltaEP cent bin %i",i));
-    fHistJetPtvsdEPBias[i] = new TH2F(name1,title1,250,-50,200,288,-2*TMath::Pi(),2*TMath::Pi());
-    fOutput->Add(fHistJetPtvsdEPBias[i]);
-
-    name1 = TString(Form("RhovsdEP_%i",i));
-    title1 = TString(Form("#rho vs #DeltaEP cent bin %i",i));
-    fHistRhovsdEP[i] = new TH2F(name1,title1,500,0,500,288,-2*TMath::Pi(),2*TMath::Pi());
-    fOutput->Add(fHistRhovsdEP[i]);
-
-    name1 = TString(Form("JetEtaPhiPt_%i",i));
-    title1 = TString(Form("Jet #eta-#phi p_{T} cent bin %i",i));
-    fHistJetEtaPhiPt[i] = new TH3F(name1,title1,250,-50,200,100,-1,1,64,-3.2,3.2);
-    fOutput->Add(fHistJetEtaPhiPt[i]);
-
-    name1 = TString(Form("JetEtaPhiPtBias_%i",i));
-    title1 = TString(Form("Jet #eta-#phi p_{T} Bias cent bin %i",i));
-    fHistJetEtaPhiPtBias[i] = new TH3F(name1,title1,250,-50,200,100,-1,1,64,-3.2,3.2);
-    fOutput->Add(fHistJetEtaPhiPtBias[i]);
-
-    name1 = TString(Form("JetPtArea_%i",i));
-    title1 = TString(Form("Jet p_{T} Area cent bin %i",i));
-    fHistJetPtArea[i] = new TH2F(name1,title1,250,-50,200,100,0,1);
-    fOutput->Add(fHistJetPtArea[i]);
-
-    name1 = TString(Form("JetHaddPhiINcent_%i",i));
-    title1 = TString(Form("Jet Hadron #Delta#varphi Distribution IN PLANE cent bin %i",i));
-    fHistJetHaddPhiINcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHaddPhiINcent[i]);
+  if (makeextraCORRhistos) {
+    for(Int_t itrackpt=0; itrackpt<9; itrackpt++){
+      snprintf(name, nchar, "fHistJetHadbindPhi_%i",itrackpt);
+      fHistJetHadbindPhi[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHadbindPhi[itrackpt]);
+
+      snprintf(name, nchar, "fHistJetHadbindPhiIN_%i",itrackpt);
+      fHistJetHadbindPhiIN[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHadbindPhiIN[itrackpt]);
+
+      snprintf(name, nchar, "fHistJetHadbindPhiMID_%i",itrackpt);
+      fHistJetHadbindPhiMID[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHadbindPhiMID[itrackpt]);
+
+      snprintf(name, nchar, "fHistJetHadbindPhiOUT_%i",itrackpt);
+      fHistJetHadbindPhiOUT[itrackpt] = new TH1F(name,name,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHadbindPhiOUT[itrackpt]);
+    } // end of trackpt bin loop
+
+    for (Int_t i = 0;i<6;++i){
+      name1 = TString(Form("JetHaddPhiINcent_%i",i));
+      title1 = TString(Form("Jet Hadron #Delta#varphi Distribution IN PLANE cent bin %i",i));
+      fHistJetHaddPhiINcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHaddPhiINcent[i]);
   
-    name1 = TString(Form("JetHaddPhiOUTcent_%i",i));
-    title1 = TString(Form("Jet Hadron #Delta#varphi Distribution OUT PLANE cent bin %i",i));
-    fHistJetHaddPhiOUTcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHaddPhiOUTcent[i]);
+      name1 = TString(Form("JetHaddPhiOUTcent_%i",i));
+      title1 = TString(Form("Jet Hadron #Delta#varphi Distribution OUT PLANE cent bin %i",i));
+      fHistJetHaddPhiOUTcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHaddPhiOUTcent[i]);
 
-    name1 = TString(Form("JetHaddPhiMIDcent_%i",i));
-    title1 = TString(Form("Jet Hadron #Delta#varphi Distribution MIDDLE of PLANE cent bin %i",i));
-    fHistJetHaddPhiMIDcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
-    fOutput->Add(fHistJetHaddPhiMIDcent[i]);
-
-    if (makeextraCORRhistos) {
-      name1 = TString(Form("JetPtAreaBias_%i",i));
-      title1 = TString(Form("Jet p_{T} Area Bias cent bin %i",i));
-      fHistJetPtAreaBias[i] = new TH2F(name1,title1,250,-50,200,100,0,1);
-      fOutput->Add(fHistJetPtAreaBias[i]);
+      name1 = TString(Form("JetHaddPhiMIDcent_%i",i));
+      title1 = TString(Form("Jet Hadron #Delta#varphi Distribution MIDDLE of PLANE cent bin %i",i));
+      fHistJetHaddPhiMIDcent[i] = new TH1F(name1,title1,128,-0.5*TMath::Pi(), 1.5*TMath::Pi());
+      fOutput->Add(fHistJetHaddPhiMIDcent[i]);
 
       name1 = TString(Form("JetPtNcon_%i",i));
       title1 = TString(Form("Jet p_{T} Ncon cent bin %i",i));
@@ -541,34 +572,67 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
       fOutput->Add(fHistJetPtNconBiasEm[i]);
     } // extra Correlations histos switch
   }
+
+  // variable binned pt for THnSparse's
+  //Double_t xlowjetPT[] = {-50,-45,-40,-35,-30,-25,-20,-18,-16,-14,-12,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,35,40,45,50,60,70,80,90,100,120,140,160,180,200,250,300,350,400};
+  //Double_t xlowtrPT[] = {0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,0.6,0.65,0.7,0.75,0.8,0.85,0.9,0.95,1,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0,2.25,2.50,2.75,3.0,3.25,3.5,3.75,4.0,4.25,4.50,4.75,5.0,5.5,6.0,6.5,7.0,7.5,8.0,8.5,9.0,9.5,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,22.0,24.0,26.0,28.0,30.0,35.0,40.0,45.0,50.0,60.0,70.0,80.0,90.0,100.0};
+  Double_t xlowjetPT[] = {15, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 45, 50, 55, 60, 65, 70, 75, 80, 100, 150, 200, 300};
+  Double_t xlowtrPT[] = {0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.6,0.7,0.8,0.9,1.0,1.2,1.4,1.6,1.8,2.0,2.2,2.4,2.6,2.8,3.0,3.2,3.4,3.6,3.8,4.0,4.2,4.4,4.6,4.8,5.0,5.5,6.0,6.5,7.0,7.5,8.0,9.0,10.0,12.0,14.0,16.0,18.0,20.0,25.0,30.0,40.0,50.0,75.0};
+
+  // tracks: 51, jets: 26
+  // number of bins you tell histogram should be (# in array - 1) because the last bin
+  // is the right-most edge of the histogram 
+  // i.e. this is for PT and there are 57 numbers (bins) thus we have 56 bins in our histo
+  Int_t nbinsjetPT = sizeof(xlowjetPT)/sizeof(Double_t) - 1;
+  Int_t nbinstrPT = sizeof(xlowtrPT)/sizeof(Double_t) - 1;
   
   // set up jet-hadron sparse
   UInt_t bitcoded = 0; // bit coded, see GetDimParams() below
   UInt_t cifras = 0;
   UInt_t bitcode = 0;  // bit coded, see GetDimParamsPID() below
-  bitcoded = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8 | 1<<9;
-  if(makeextraCORRhistos) fhnJH = NewTHnSparseF("fhnJH", bitcoded);
-  if(makeextraCORRhistos) fOutput->Add(fhnJH);
+  UInt_t bitcodeCorr = 0; // bit coded, see GetDimparamsCorr() below
+  bitcoded = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8; // | 1<<9;
+  //if(fDoEventMixing) {
+    fhnJH = NewTHnSparseF("fhnJH", bitcoded);
+  
+    if(dovarbinTHnSparse){
+      fhnJH->GetAxis(1)->Set(nbinsjetPT, xlowjetPT);
+      fhnJH->GetAxis(2)->Set(nbinstrPT, xlowtrPT);
+    }
+       
+    fOutput->Add(fhnJH);
+  //}
 
-/*
-  // for pp we need mult bins for event mixing. Create binning here, to also make a histogram from it
-  Int_t nCentralityBins  = 8;
-  Double_t centralityBins[9] = {0.0, 4., 9, 15, 25, 35, 55, 100.0,500.0};  
-  Double_t centralityBins[nCentralityBins+1];
-  for(Int_t ic=0; ic<nCentralityBins+1; ic++){
-    if(ic==nCentralityBins) centralityBins[ic]=500;
-    else centralityBins[ic]=10.0*ic; 
-  }
-*/
+  bitcodeCorr = 1<<0 | 1<<1 | 1<<2 | 1<<3; // | 1<<4 | 1<<5;
+  fhnCorr = NewTHnSparseFCorr("fhnCorr", bitcodeCorr);
+  if(dovarbinTHnSparse) fhnCorr->GetAxis(1)->Set(nbinsjetPT, xlowjetPT);
+  fOutput->Add(fhnCorr);  
 
-  // setup for Pb-Pb collisions
-  Int_t nCentralityBins  = 100;
-  Double_t centralityBins[nCentralityBins+1];
-  for(Int_t ic=0; ic<nCentralityBins; ic++){
-    centralityBins[ic]=1.0*ic;
+  /*
+    Double_t centralityBins[nCentralityBins+1];
+    for(Int_t ic=0; ic<nCentralityBins+1; ic++){
+      if(ic==nCentralityBins) centralityBins[ic]=500;
+      else centralityBins[ic]=10.0*ic; 
+    }
+  */
+
+  // set up centrality bins for mixed events
+  // for pp we need mult bins for event mixing. Create binning here, to also make a histogram from it
+  Int_t nCentralityBinspp = 8;
+  //Double_t centralityBinspp[nCentralityBinspp+1];
+  Double_t centralityBinspp[9] = {0.0, 4., 9, 15, 25, 35, 55, 100.0, 500.0};  
+
+  // Setup for Pb-Pb collisions
+  Int_t nCentralityBinsPbPb = 10; //100;
+  Double_t centralityBinsPbPb[nCentralityBinsPbPb+1];
+  for(Int_t ic=0; ic<nCentralityBinsPbPb; ic++){
+      centralityBinsPbPb[ic]=10.0*ic; //1.0*ic;
   }
 
-  fHistMult = new TH1F("fHistMult","multiplicity",nCentralityBins,centralityBins);
+  if(fBeam == 0) fHistMult = new TH1F("fHistMult","multiplicity",nCentralityBinspp,centralityBinspp);
+  if(fBeam == 1) fHistMult = new TH1F("fHistMult","multiplicity",nCentralityBinsPbPb,centralityBinsPbPb);
+  //if(AliAnalysisTaskEmcal::GetBeamType() == 0) fHistMult = new TH1F("fHistMult","multiplicity",nCentralityBinspp,centralityBinspp);
+  //if(AliAnalysisTaskEmcal::GetBeamType() == 1) fHistMult = new TH1F("fHistMult","multiplicity",nCentralityBinsPbPb,centralityBinsPbPb);
 //  fOutput->Add(fHistMult);
 
   // Event Mixing
@@ -577,25 +641,23 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
   Int_t nZvtxBins  = 5+1+5;
   Double_t vertexBins[] = { -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10};
   Double_t* zvtxbin = vertexBins;
-  fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBins, centralityBins, nZvtxBins, zvtxbin);
+  if(fBeam == 0) fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBinspp, centralityBinspp, nZvtxBins, zvtxbin);
+  if(fBeam == 1) fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBinsPbPb, centralityBinsPbPb, nZvtxBins, zvtxbin);
+//  if(GetBeamType() == 0) fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBinspp, centralityBinspp, nZvtxBins, zvtxbin);
+//  if(GetBeamType() == 1) fPoolMgr = new AliEventPoolManager(poolsize, trackDepth, nCentralityBinsPbPb, centralityBinsPbPb, nZvtxBins, zvtxbin);
 
   // set up event mixing sparse
   if(fDoEventMixing){
-    cifras = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<9;
-    fhnMixedEvents = NewTHnSparseF("fhnMixedEvents", cifras);
-    fhnMixedEvents->Sumw2();  
-    fOutput->Add(fhnMixedEvents);
-  } // end of do-eventmixing
+    cifras = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8; // | 1<<9;
+    fhnMixedEvents = NewTHnSparseF("fhnMixedEvents", cifras);  
 
-  // variable binned pt
-  Double_t xlowjetPT[] = {-50,-45,-40,-35,-30,-25,-20,-18,-16,-14,-12,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,35,40,45,50,60,70,80,90,100,120,140,160,180,200,250,300,350,400};
-  Double_t xlowtrPT[] = {0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,0.6,0.65,0.7,0.75,0.8,0.85,0.9,0.95,1,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0,2.25,2.50,2.75,3.0,3.25,3.5,3.75,4.0,4.25,4.50,4.75,5.0,5.5,6.0,6.5,7.0,7.5,8.0,8.5,9.0,9.5,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,22.0,24.0,26.0,28.0,30.0,35.0,40.0,45.0,50.0,60.0,70.0,80.0,90.0,100.0};
+    if(dovarbinTHnSparse){
+     fhnMixedEvents->GetAxis(1)->Set(nbinsjetPT, xlowjetPT);
+     fhnMixedEvents->GetAxis(2)->Set(nbinstrPT, xlowtrPT);
+    }
 
-  // number of bins you tell histogram should be (# in array - 1) because the last bin
-  // is the right-most edge of the histogram 
-  // i.e. this is for PT and there are 57 numbers (bins) thus we have 56 bins in our histo
-  Int_t nbinsjetPT = sizeof(xlowjetPT)/sizeof(Double_t) - 1;
-  Int_t nbinstrPT = sizeof(xlowtrPT)/sizeof(Double_t) - 1;
+    fOutput->Add(fhnMixedEvents);
+  } // end of do-eventmixing
 
   // set up PID sparse
   if(doPID){
@@ -617,21 +679,26 @@ void AliAnalysisTaskEmcalJetHadEPpid::UserCreateOutputObjects()
     // *****************************************************************************************
 
     // PID counter
-    fHistPID = new TH1F("fHistPID","PID Counter",12, -0.5, 11.5);
+    fHistPID = new TH1F("fHistPID","PID Counter", 15, 0.5, 15.5);
     SetfHistPIDcounterLabels(fHistPID);
     fOutput->Add(fHistPID);
 
-    bitcode = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8 | 1<<9 |
-              1<<10 | 1<<11 | 1<<14 | 1<<17 |  // | 1<<12 | 1<<13 | 1<<14 | 1<<15 | 1<<16 | 1<<17 | 1<<18 | 1<<19 |
-              1<<20 | 1<<21 | 1<<22;
-    fhnPID = NewTHnSparseFPID("fhnPID", bitcode);
+    if(allpidAXIS) {
+      bitcode = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8 | 1<<9 |
+              1<<10 | 1<<11 | 1<<12 | 1<<13 | 1<<14 | 1<<15 | 1<<16 | 1<<17 | 1<<18 | 1<<19 |
+              1<<20;
+      fhnPID = NewTHnSparseFPID("fhnPID", bitcode);
+    } else {
+         bitcode = 1<<0 | 1<<1 | 1<<2 | 1<<3 | 1<<4 | 1<<5 | 1<<6 | 1<<7 | 1<<8 | 1<<9 |
+              1<<10 | 1<<11 | 1<<12 | 1<<13;
+      fhnPID = NewTHnSparseFPID("fhnPID", bitcode);
+       }
 
     if(dovarbinTHnSparse){
-     fhnPID->GetAxis(1)->Set(nbinsjetPT, xlowjetPT);
-     fhnPID->GetAxis(2)->Set(nbinstrPT, xlowtrPT);
+     fhnPID->GetAxis(1)->Set(nbinstrPT, xlowtrPT);
+     fhnPID->GetAxis(8)->Set(nbinsjetPT, xlowjetPT);
     }
 
-    //fhnPID->Sumw2();
     fOutput->Add(fhnPID);
   } // end of do-PID
 
@@ -673,11 +740,40 @@ void AliAnalysisTaskEmcalJetHadEPpid::ExecOnce()
 Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
 { // Main loop called for each event
   // TEST TEST TEST TEST for OBJECTS!
-  if(!fLocalRho){
-    AliError(Form("Couldn't get fLocalRho object, try to get it from Event based on name\n"));
-    fLocalRho = GetLocalRhoFromEvent(fLocalRhoName);
-    if(!fLocalRho) return kTRUE;
-  }
+
+  fHistEventQA->Fill(1); // All Events that get entered
+
+  UInt_t trig = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();
+  if(trig == 0) fHistEventSelectionQA->Fill(1);
+  if(trig & AliVEvent::kAny) fHistEventSelectionQA->Fill(2);
+  if(trig & AliVEvent::kAnyINT) fHistEventSelectionQA->Fill(3);
+  if(trig & AliVEvent::kMB) fHistEventSelectionQA->Fill(4);
+  if(trig & AliVEvent::kINT7) fHistEventSelectionQA->Fill(5);
+  if(trig & AliVEvent::kEMC1) fHistEventSelectionQA->Fill(6);
+  if(trig & AliVEvent::kEMC7) fHistEventSelectionQA->Fill(7);
+  if(trig & AliVEvent::kEMC8) fHistEventSelectionQA->Fill(8);
+  if(trig & AliVEvent::kEMCEJE) fHistEventSelectionQA->Fill(9);
+  if(trig & AliVEvent::kEMCEGA) fHistEventSelectionQA->Fill(10);
+  if(trig & AliVEvent::kCentral) fHistEventSelectionQA->Fill(11);
+  if(trig & AliVEvent::kSemiCentral) fHistEventSelectionQA->Fill(12);
+  if(trig & AliVEvent::kINT8) fHistEventSelectionQA->Fill(13);
+
+  if(trig & (AliVEvent::kEMCEJE | AliVEvent::kMB)) fHistEventSelectionQA->Fill(14);
+  if(trig & (AliVEvent::kEMCEGA | AliVEvent::kMB)) fHistEventSelectionQA->Fill(15);
+  if(trig & (AliVEvent::kAnyINT | AliVEvent::kMB)) fHistEventSelectionQA->Fill(16);
+
+  if(trig & (AliVEvent::kEMCEJE & AliVEvent::kMB)) fHistEventSelectionQA->Fill(17);
+  if(trig & (AliVEvent::kEMCEGA & AliVEvent::kMB)) fHistEventSelectionQA->Fill(18);
+  if(trig & (AliVEvent::kAnyINT & AliVEvent::kMB)) fHistEventSelectionQA->Fill(19);
+
+  if(GetBeamType() == 1) {
+    if(!fLocalRho){
+      AliError(Form("Couldn't get fLocalRho object, try to get it from Event based on name\n"));
+      fLocalRho = GetLocalRhoFromEvent(fLocalRhoName);
+      if(!fLocalRho) return kTRUE;
+    }
+  } // check for LocalRho object if PbPb data
+
   if(!fTracks){
     AliError(Form("No fTracks object!!\n"));
     return kTRUE;
@@ -687,7 +783,13 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     return kTRUE;
   }
 
+  fHistEventQA->Fill(2); // events after object check
+
   // what kind of event do we have: AOD or ESD?
+  Bool_t useAOD; 
+  if (dynamic_cast<AliAODEvent*>(InputEvent())) useAOD = kTRUE;
+  else useAOD = kFALSE;
+
   // if we have ESD event, set up ESD object
   if(!useAOD){
     fESD = dynamic_cast<AliESDEvent*>(InputEvent());
@@ -706,15 +808,24 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     }
   }
 
+  fHistEventQA->Fill(3); // events after Aod/esd check
+
   // get centrality
   Int_t centbin = GetCentBin(fCent);
   if (makeQAhistos) fHistCentrality->Fill(fCent); // won't be filled in pp collision (Keep this in mind!)
 
+  // BEAM TYPE enumerator: kNA = -1, kpp = 0, kAA = 1, kpA = 2
   // for pp analyses we will just use the first centrality bin
-  if (centbin == -1) centbin = 0;
+  if(GetBeamType() == 0) if (centbin == -1) centbin = 0;
+  if(GetBeamType() == 1) if (centbin == -1) return kTRUE;
+
+  // if we are on PbPb data do cut on centrality > 90%, else by default DON'T
+  if (GetBeamType() == 1) {
+    // apply cut to event on Centrality > 90%
+    if(fCent>90) return kTRUE;
+  }
 
-  // apply cut to event on Centrality > 90%
-  if(fCent>90) return kTRUE;
+  fHistEventQA->Fill(4);  // events after centrality check
 
   // get vertex information
   Double_t fvertex[3]={0,0,0};
@@ -728,6 +839,8 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
   // apply zVtx cut
   if(fabs(zVtx)>10.0) return kTRUE;
 
+  fHistEventQA->Fill(5); // events after zvertex check
+
   // create pointer to list of input event
   TList *list = InputEvent()->GetList();
   if(!list) {
@@ -735,9 +848,12 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     return kTRUE;
   }
 
+  fHistEventQA->Fill(6); // events after list check
+
   // initialize TClonesArray pointers to jets and tracks
   TClonesArray *jets = 0;
   TClonesArray *tracks = 0; 
+  TClonesArray *tracksME = 0;
 
   // get Tracks object
   tracks = dynamic_cast<TClonesArray*>(list->FindObject(fTracks));
@@ -746,6 +862,13 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     return kTRUE;
   } // verify existence of tracks
 
+  // get ME Tracks object
+  tracksME = dynamic_cast<TClonesArray*>(list->FindObject(fTracksNameME));
+  if (!tracksME) {
+    AliError(Form("Pointer to tracks %s == 0", fTracksNameME.Data()));
+    return kTRUE;
+  } // verify existence of tracks
+
   // get Jets object
   jets = dynamic_cast<TClonesArray*>(list->FindObject(fJets));
   if(!jets){
@@ -753,29 +876,52 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     return kTRUE;
   } // verify existence of jets
 
+  fHistEventQA->Fill(7);  // events after track/jet pointer check
+
   // get number of jets and tracks
   const Int_t Njets = jets->GetEntries(); 
   const Int_t Ntracks = tracks->GetEntries();
   if(Ntracks<1)   return kTRUE;
   if(Njets<1)    return kTRUE;
 
+  fHistEventQA->Fill(8); // events after #track and jets < 1 check
+
   if (makeQAhistos) fHistMult->Fill(Ntracks);  // fill multiplicity distribution
 
   // initialize track parameters
   Int_t iTT=-1;
   Double_t ptmax=-10;
+  Int_t NtrackAcc = 0;
+
+  fVevent = dynamic_cast<AliVEvent*>(InputEvent());
+  if (!fVevent) {
+    printf("ERROR: fVEvent not available\n");
+    return kTRUE;
+  }
+
+  // fill event mixing QA
+  if(trig & AliVEvent::kEMCEGA) fHistCentZvertGA->Fill(fCent, zVtx);
+  if(trig & AliVEvent::kEMCEJE) fHistCentZvertJE->Fill(fCent, zVtx);
+  if(trig & AliVEvent::kMB) fHistCentZvertMB->Fill(fCent, zVtx);
+  if(trig & AliVEvent::kAny) fHistCentZvertAny->Fill(fCent, zVtx);
 
   // loop over tracks - to get hardest track (highest pt)
   for (Int_t iTracks = 0; iTracks < Ntracks; iTracks++){
-    AliVTrack* track = static_cast<AliVTrack*>(tracks->At(iTracks));
-    if (!track) {
-      AliError(Form("Couldn't get VTrack track %d\n", iTracks));        
+    AliVParticle* Vtrack = static_cast<AliVParticle*>(tracks->At(iTracks)); 
+    if (!Vtrack) {
+      printf("ERROR: Could not receive track %d\n", iTracks);
       continue;
-    } // verify existence of tracks
-
+    }
+    
+    AliVTrack *track = dynamic_cast<AliVTrack*>(Vtrack);
+    if(!track) continue;
+    
+    // track cuts
     if(TMath::Abs(track->Eta())>0.9) continue;
     if(track->Pt()<0.15) continue;
     //iCount++;
+    NtrackAcc++;
+
     if(track->Pt()>ptmax){
       ptmax=track->Pt();             // max pT track
       iTT=iTracks;                   // trigger tracks
@@ -783,15 +929,15 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
 
     if (makeQAhistos) fHistTrackPhi->Fill(track->Phi()); 
     if (makeQAhistos) fHistTrackPt[centbin]->Fill(track->Pt());
-    fHistTrackPtallcent->Fill(track->Pt());
+    if (makeQAhistos) fHistTrackPtallcent->Fill(track->Pt());
   } // end of loop over tracks
 
   // get rho from event and fill relative histo's
   fRho = GetRhoFromEvent(fRhoName);
   fRhoVal = fRho->GetVal();
-  fHistRhovsdEP[centbin]->Fill(fRhoVal,fEPV0); // Global Rho vs delta Event Plane angle
 
   if (makeQAhistos) {
+    fHistRhovsdEP[centbin]->Fill(fRhoVal,fEPV0); // Global Rho vs delta Event Plane angle
     fHistRhovsCent->Fill(fCent,fRhoVal);        // Global Rho vs Centrality
     fHistEP0[centbin]->Fill(fEPV0);
     fHistEP0A[centbin]->Fill(fEPV0A);
@@ -804,6 +950,7 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
   Double_t highestjetpt=0.0;
   Int_t passedTTcut=0;
   Int_t NjetAcc = 0;
+  Double_t leadhadronPT = 0;
 
   // loop over jets in an event - to find highest jet pT and apply some cuts
   for (Int_t ijet = 0; ijet < Njets; ijet++){
@@ -814,11 +961,14 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     // apply jet cuts
     if ((jet->Phi()<fPhimin)||(jet->Phi()>fPhimax)) continue;
     if ((jet->Eta()<fEtamin)||(jet->Eta()>fEtamax)) continue;
-    if (makeextraCORRhistos) fHistAreavsRawPt[centbin]->Fill(jet->Pt(),jet->Area());
+    if (makeQAhistos) fHistAreavsRawPt[centbin]->Fill(jet->Pt(),jet->Area());
     if(!AcceptMyJet(jet)) continue;
 
     NjetAcc++;                     // # of accepted jets
-  
+
+    // if FlavourJetAnalysis, get desired FlavTag and check against Jet
+    if(doFlavourJetAnalysis) { if(!AcceptFlavourJet(jet, fJetFlavTag)) continue;}
+
     // use this to get total # of jets passing cuts in events!!!!!!!!
     if (makeQAhistos) fHistJetPhi->Fill(jet->Phi()); // Jet Phi histogram (filled)
 
@@ -832,48 +982,60 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
   // accepted jets
   fHistNjetvsCent->Fill(fCent,NjetAcc);
   Int_t NJETAcc = 0;
+  fHistEventQA->Fill(9); // events after track/jet loop to get highest pt
 
   // loop over jets in event and make appropriate cuts
   for (Int_t ijet = 0; ijet < Njets; ++ijet) {
      AliEmcalJet *jet = static_cast<AliEmcalJet*>(fJets->At(ijet));
      if (!jet) continue;
 
+     if (!(trig & fTriggerEventType)) continue;
+
         // (should probably be higher..., but makes a cut on jet pT)
      if (jet->Pt()<0.1) continue;
      // do we accept jet? apply jet cuts
      if (!AcceptMyJet(jet)) continue;
 
+     // if FlavourJetAnalysis, get desired FlavTag and check against Jet
+     if(doFlavourJetAnalysis) { if(!AcceptFlavourJet(jet, fJetFlavTag)) continue;}
+
+     fHistEventQA->Fill(10); // accepted jets
+
      // check on lead jet
      Double_t leadjet=0;
      if (ijet==ijethi) leadjet=1;
 
+     // check on leading hadron pt
+     if (ijet==ijethi) leadhadronPT = GetLeadingHadronPt(jet);
+
      // initialize and calculate various parameters: pt, eta, phi, rho, etc...
      Double_t jetphi = jet->Phi();      // phi of jet
      NJETAcc++;   // # accepted jets
-     fLocalRhoVal = fLocalRho->GetLocalVal(jetphi, GetJetRadius(0)); //fmyJetRadius);   // get local rho value
      Double_t jeteta = jet->Eta();     // ETA of jet
-//     Double_t jetptraw = jet->Pt();    // raw pT of jet
-     Double_t jetPt, jetPtGlobal, jetPtLocal = -500;            // initialize corr jet pt
+     Double_t jetPt = -500; 
+     Double_t jetPtGlobal = -500; 
+     Double_t jetPtLocal = -500;            // initialize corr jet pt
+     if(GetBeamType() == 1) {
+       fLocalRhoVal = fLocalRho->GetLocalVal(jetphi, fJetRad); //GetJetRadius(0)); // get local rho value
+       jetPtLocal = jet->Pt()-jet->Area()*fLocalRhoVal; // corrected pT of jet using Rho modulated for V2 and V3
+     }
      jetPt = jet->Pt();
      jetPtGlobal = jet->Pt()-jet->Area()*fRhoVal;  // corrected pT of jet from rho value
-     jetPtLocal = jet->Pt()-jet->Area()*fLocalRhoVal; // corrected pT of jet using Rho modulated for V2 and V3
-     Float_t dEP = -500;                    // initialize angle between jet and event plane
-     //Int_t ieta = -500;             // initialize jet eta bin
-     //ieta = GetEtaBin(jeteta);         // bin of eta
+     Double_t dEP = -500;                    // initialize angle between jet and event plane
      dEP = RelativeEPJET(jetphi,fEPV0); // angle betweeen jet and event plane
 
      // make histo's
      if(makeQAhistos) fHistJetPtvsTrackPt[centbin]->Fill(jetPt,jet->MaxTrackPt());
      if(makeQAhistos) fHistRawJetPtvsTrackPt[centbin]->Fill(jetPt,jet->MaxTrackPt());
      if(makeQAhistos) fHistJetPtcorrGlRho[centbin]->Fill(jetPtGlobal);
-     fHistJetPtvsdEP[centbin]->Fill(jetPt, dEP);
-     fHistJetEtaPhiPt[centbin]->Fill(jetPt,jet->Eta(),jet->Phi());
-     fHistJetPtArea[centbin]->Fill(jetPt,jet->Area());
+     if(makeQAhistos) fHistJetPtvsdEP[centbin]->Fill(jetPt, dEP);
+     if(makeQAhistos) fHistJetEtaPhiPt[centbin]->Fill(jetPt,jet->Eta(),jet->Phi());
+     if(makeQAhistos) fHistJetPtArea[centbin]->Fill(jetPt,jet->Area());
+     if(makeQAhistos) fHistJetEtaPhi->Fill(jet->Eta(),jet->Phi());     // fill jet eta-phi distribution histo
      if(makeextraCORRhistos) fHistJetPtNcon[centbin]->Fill(jetPt,jet->GetNumberOfConstituents());
      if(makeextraCORRhistos) fHistJetPtNconCh[centbin]->Fill(jetPt,jet->GetNumberOfTracks());
      if(makeextraCORRhistos) fHistJetPtNconEm[centbin]->Fill(jetPt,jet->GetNumberOfClusters());
-     if(makeextraCORRhistos) fHistJetPt[centbin]->Fill(jet->Pt());  // fill #jets vs pT histo
-     fHistJetEtaPhi->Fill(jet->Eta(),jet->Phi());     // fill jet eta-phi distribution histo
+     if (makeoldJEThadhistos) fHistJetPt[centbin]->Fill(jet->Pt());  // fill #jets vs pT histo
      //fHistDeltaPtvsArea->Fill(jetPt,jet->Area());
 
      // make histo's with BIAS applied
@@ -890,7 +1052,7 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     //  if(makeextraCORRhistos)        fHistJetPt[centbin+1]->Fill(jet->Pt());
     //}
     if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)){
-      if(makeextraCORRhistos){ 
+      if (makeoldJEThadhistos){ 
         fHistJetPtBias[centbin]->Fill(jet->Pt());
         //if(leadjet && centbin==0) fHistJetPtBias[centbin+1]->Fill(jet->Pt());
       }
@@ -904,62 +1066,79 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     } // end of check on iTT > 0
 
     if(passedTTcut) {  
-      if(makeextraCORRhistos) fHistJetPtTT[centbin]->Fill(jet->Pt());
+      if (makeoldJEThadhistos) fHistJetPtTT[centbin]->Fill(jet->Pt());
     }
 
     // cut on HIGHEST jet pt in event (15 GeV default)
-    if (highestjetpt>fJetPtcut) {
+    //if (highestjetpt>fJetPtcut) {
+    if (jet->Pt() > fJetPtcut) {
+      fHistEventQA->Fill(11); // jets meeting pt threshold
+
+      // does our max track or cluster pass the bias?
+      if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)){
+        // set up and fill Jet-Hadron Correction THnSparse
+        Double_t CorrEntries[4] = {fCent, jet->Pt(), dEP, zVtx};
+        fhnCorr->Fill(CorrEntries);    // fill Sparse Histo with Correction entries
+
+        if(GetBeamType() == 1) fHistLocalRhoJetpt->Fill(jetPtLocal);
+      }
+
       // loop over all track for an event containing a jet with a pT>fJetPtCut  (15)GeV
       for (Int_t iTracks = 0; iTracks < Ntracks; ++iTracks) {
-        AliVTrack* track = static_cast<AliVTrack*>(tracks->At(iTracks));
+        AliVParticle* Vtrackass = static_cast<AliVParticle*>(tracks->At(iTracks)); 
+        if (!Vtrackass) {
+          printf("ERROR: Could not receive track %d\n", iTracks);
+          continue;
+        }
+    
+        AliVTrack *track = dynamic_cast<AliVTrack*>(Vtrackass);
         if (!track) {
           AliError(Form("Couldn't get AliVtrack %d\n", iTracks));
           continue;
         } 
 
        // apply track cuts
-        if(TMath::Abs(track->Eta())>fTrkEta) 
-          continue;
-        //fHistTrackPt->Fill(track->Pt());  // fill track pT histogram
-        if (track->Pt()<0.15)             // make sure track pT > 0.15 GeV
-          continue;
+        if(TMath::Abs(track->Eta())>fTrkEta) continue;
+        if (track->Pt()<0.15) continue;
+
+        fHistEventQA->Fill(12); // accepted tracks in events from trigger jets
 
         // calculate and get some track parameters
+               Double_t trCharge = -99;
+        trCharge = track->Charge();
         Double_t tracketa=track->Eta();   // eta of track
         Double_t deta=tracketa-jeteta;    // dETA between track and jet
-               Int_t ieta = -1;
-        if (makeextraCORRhistos) {
-                 ieta=GetEtaBin(deta);       // bin of eta
+        //Double_t dR=sqrt(deta*deta+dphijh*dphijh);     // difference of R between jet and hadron track               
+
+        Int_t ieta = -1;       // initialize deta bin
+        Int_t iptjet = -1;     // initialize jet pT bin
+        if (makeoldJEThadhistos)  {
+                 ieta=GetEtaBin(deta);             // bin of eta
              if(ieta<0) continue;              // double check we don't have a negative array index
+          iptjet=GetpTjetBin(jet->Pt());    // bin of jet pt
+             if(iptjet<0) continue;                      // double check we don't have a negative array index
                }
 
         // dPHI between jet and hadron
         Double_t dphijh = RelativePhi(jet->Phi(), track->Phi()); // angle between jet and hadron
 
-        // jet pt bins
-        Int_t iptjet = -1;                  // initialize jet pT bin
-//        iptjet=GetpTjetBin(jetPt);        // bin of jet pT
-        iptjet=GetpTjetBin(jet->Pt());    // bin of jet pt
-           if(iptjet<0) continue;                        // double check we don't have a negative array index
-        Double_t dR=sqrt(deta*deta+dphijh*dphijh);                   // difference of R between jet and hadron track
-
         // fill some jet-hadron histo's
-        if(makeextraCORRhistos) fHistJetH[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());  // fill jet-hadron dPHI--track pT distribution
-        fHistJetHEtaPhi->Fill(deta,dphijh);                          // fill jet-hadron  eta--phi distribution
+        if (makeoldJEThadhistos) fHistJetH[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());  // fill jet-hadron dPHI--track pT distribution
+        if(makeQAhistos) fHistJetHEtaPhi->Fill(deta,dphijh);                          // fill jet-hadron  eta--phi distribution
            fHistJetHaddPHI->Fill(dphijh);
         if(passedTTcut){
-          if(makeextraCORRhistos) fHistJetHTT[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());
+          if (makeoldJEThadhistos) fHistJetHTT[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());
         }
 
         // does our max track or cluster pass the bias?
         if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)){
           // set up and fill Jet-Hadron THnSparse
-          Double_t triggerEntries[9] = {fCent,jetPtLocal,track->Pt(),dR,deta,dphijh,0,leadjet,zVtx};
-          if(makeextraCORRhistos) fhnJH->Fill(triggerEntries);    // fill Sparse Histo with trigger entries
-          
+          Double_t triggerEntries[9] = {fCent, jet->Pt(), track->Pt(), deta, dphijh, dEP, zVtx, trCharge, leadjet};
+          fhnJH->Fill(triggerEntries);    // fill Sparse Histo with trigger entries
+
           // fill histo's
-          fHistSEphieta->Fill(dphijh, deta); // single event distribution
-          if (makeextraCORRhistos) fHistJetHBias[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());
+          if(makeQAhistos) fHistSEphieta->Fill(dphijh, deta); // single event distribution
+          if (makeoldJEThadhistos) fHistJetHBias[centbin][iptjet][ieta]->Fill(dphijh,track->Pt());
 
           if (makeBIAShistos) {
             fHistJetHaddPhiBias->Fill(dphijh);
@@ -978,216 +1157,216 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
                  } // BIAS histos switch
         } // end of check maxtrackpt>ftrackbias or maxclusterpt>fclustbias
 
-// **************************************************************************************************************
-// *********************************** PID **********************************************************************
-// **************************************************************************************************************
-    if(doPIDtrackBIAS){
-       if(ptmax < fTrkBias) continue;    // force PID to happen when max track pt > 5.0 GeV
-    }
-
-    // some variables for PID
-    Double_t eta, pt, dEdx, ITSsig, TOFsig, charge = -99.;
-
-    // nSigma of particles in TPC, TOF, and ITS
-    Double_t nSigmaPion_TPC, nSigmaProton_TPC, nSigmaKaon_TPC = -99.;
-    Double_t nSigmaPion_TOF, nSigmaProton_TOF, nSigmaKaon_TOF = -99.;
-    Double_t nSigmaPion_ITS, nSigmaProton_ITS, nSigmaKaon_ITS = -99.;
-
-    if(doPID){
-      // get parameters of track
-      charge = track->Charge();    // charge of track
-      eta    = track->Eta();       // ETA of track
-      pt     = track->Pt();        // pT of track
-
-      // extra attempt 
-      AliVEvent *vevent=InputEvent();
-      if (!vevent||!fPIDResponse) return kTRUE; // just return, maybe put at beginning
+        // **************************************************************************************************************
+        // *********************************** PID **********************************************************************
+        // **************************************************************************************************************
+        if(doPIDtrackBIAS){
+         //if(ptmax < fTrkBias) continue;    // force PID to happen when max track pt > 5.0 GeV
+          if(leadhadronPT < fTrkBias) continue; // force PID to happen when lead hadron pt > 5.0 GeV
+        }
 
-      // get PID parameters, first check if AOD/ESD
-         if (!useAOD) {
-        AliESDtrack *trackESD = fESD->GetTrack(iTracks);
-  
-        // get detector signals
-        dEdx = trackESD->GetTPCsignal();
-        ITSsig = trackESD->GetITSsignal();
-        TOFsig = trackESD->GetTOFsignal();
-
-        // TPC nSigma's
-        nSigmaPion_TPC = fPIDResponse->NumberOfSigmasTPC(trackESD,AliPID::kPion);
-        nSigmaKaon_TPC = fPIDResponse->NumberOfSigmasTPC(trackESD,AliPID::kKaon);
-        nSigmaProton_TPC = fPIDResponse->NumberOfSigmasTPC(trackESD,AliPID::kProton);
-
-        // TOF nSigma's
-        nSigmaPion_TOF = fPIDResponse->NumberOfSigmasTOF(trackESD,AliPID::kPion);
-        nSigmaKaon_TOF = fPIDResponse->NumberOfSigmasTOF(trackESD,AliPID::kKaon);
-        nSigmaProton_TOF = fPIDResponse->NumberOfSigmasTOF(trackESD,AliPID::kProton);
-
-        // ITS nSigma's
-        nSigmaPion_ITS = fPIDResponse->NumberOfSigmasITS(trackESD,AliPID::kPion);
-        nSigmaKaon_ITS = fPIDResponse->NumberOfSigmasITS(trackESD,AliPID::kKaon);
-        nSigmaProton_ITS = fPIDResponse->NumberOfSigmasITS(trackESD,AliPID::kProton);
-         } // end of ESD pid
-
-      if (useAOD) {
-           AliAODTrack *trackAOD = fAOD->GetTrack(iTracks);
-        // get detector signals
-        dEdx = trackAOD->GetTPCsignal();
-        ITSsig = trackAOD->GetITSsignal();
-        TOFsig = trackAOD->GetTOFsignal();
-
-        // TPC nSigma's
-        nSigmaPion_TPC = fPIDResponse->NumberOfSigmasTPC(trackAOD,AliPID::kPion);
-        nSigmaKaon_TPC = fPIDResponse->NumberOfSigmasTPC(trackAOD,AliPID::kKaon);
-        nSigmaProton_TPC = fPIDResponse->NumberOfSigmasTPC(trackAOD,AliPID::kProton);
-
-        // TOF nSigma's
-        nSigmaPion_TOF = fPIDResponse->NumberOfSigmasTOF(trackAOD,AliPID::kPion);
-        nSigmaKaon_TOF = fPIDResponse->NumberOfSigmasTOF(trackAOD,AliPID::kKaon);
-        nSigmaProton_TOF = fPIDResponse->NumberOfSigmasTOF(trackAOD,AliPID::kProton);
-
-        // ITS nSigma's
-        nSigmaPion_ITS = fPIDResponse->NumberOfSigmasITS(trackAOD,AliPID::kPion);
-        nSigmaKaon_ITS = fPIDResponse->NumberOfSigmasITS(trackAOD,AliPID::kKaon);
-        nSigmaProton_ITS = fPIDResponse->NumberOfSigmasITS(trackAOD,AliPID::kProton);
-         } // end of AOD pid
-
-      // fill detector signal histograms
-      if (makeQAhistos) fHistTPCdEdX->Fill(pt, dEdx);
-      if (makeQAhistos) fHistITSsignal->Fill(pt, ITSsig);
-//    if (makeQAhistos) fHistTOFsignal->Fill(pt, TOFsig);
-
-      // Tests to PID pions, kaons, and protons,          (default is undentified tracks)
-      //Double_t nPIDtpc, nPIDits, nPIDtof = 0;
-      Double_t nPID = -99;
-
-      // check track has pT < 0.900 GeV  - use TPC pid
-      if (pt<0.900 && dEdx>0) {
-           nPIDtpc = 4;
-
-        // PION check - TPC
-        if (TMath::Abs(nSigmaPion_TPC)<2 && TMath::Abs(nSigmaKaon_TPC)>2 && TMath::Abs(nSigmaProton_TPC)>2 ){
-          isPItpc = kTRUE;
-          nPIDtpc = 1;
-          nPID=0.5;
-        }else isPItpc = kFALSE; 
-
-        // KAON check - TPC
-        if (TMath::Abs(nSigmaKaon_TPC)<2 && TMath::Abs(nSigmaPion_TPC)>3 && TMath::Abs(nSigmaProton_TPC)>2 ){
-          isKtpc = kTRUE;
-          nPIDtpc = 2;
-          nPID=1.5;
-        }else isKtpc = kFALSE;
-
-        // PROTON check - TPC
-        if (TMath::Abs(nSigmaProton_TPC)<2 && TMath::Abs(nSigmaPion_TPC)>3 && TMath::Abs(nSigmaKaon_TPC)>2 ){
-          isPtpc = kTRUE;
-          nPIDtpc = 3;
-          nPID=2.5;
-        }else isPtpc = kFALSE;
-      }  // cut on track pT for TPC
-
-      // check track has pT < 0.500 GeV - use ITS pid
-      if (pt<0.500 && ITSsig>0) {
-        nPIDits = 4;
-
-        // PION check - ITS
-        if (TMath::Abs(nSigmaPion_ITS)<2 && TMath::Abs(nSigmaKaon_ITS)>2 && TMath::Abs(nSigmaProton_ITS)>2 ){
-          isPIits = kTRUE;
-          nPIDits = 1; 
-             nPID=4.5;
-        }else isPIits = kFALSE;
-
-        // KAON check - ITS
-        if (TMath::Abs(nSigmaKaon_ITS)<2 && TMath::Abs(nSigmaPion_ITS)>3 && TMath::Abs(nSigmaProton_ITS)>2 ){
-          isKits = kTRUE;
-          nPIDits = 2;
-          nPID=5.5;
-        }else isKits = kFALSE;
-
-        // PROTON check - ITS
-        if (TMath::Abs(nSigmaProton_ITS)<2 && TMath::Abs(nSigmaPion_ITS)>3 && TMath::Abs(nSigmaKaon_ITS)>2 ){
-          isPits = kTRUE;
-          nPIDits = 3;
-             nPID=6.5;
-        }else isPits = kFALSE;
-      }  // cut on track pT for ITS
-
-      // check track has 0.900 GeV < pT < 2.500 GeV - use TOF pid
-      if (pt>0.900 && pt<2.500 && TOFsig>0) {
-           nPIDtof = 4;
-
-        // PION check - TOF
-        if (TMath::Abs(nSigmaPion_TOF)<2 && TMath::Abs(nSigmaKaon_TOF)>2 && TMath::Abs(nSigmaProton_TOF)>2 ){
-          isPItof = kTRUE;
-          nPIDtof = 1;
-          nPID=8.5;
-        }else isPItof = kFALSE;
-
-        // KAON check - TOF
-        if (TMath::Abs(nSigmaKaon_TOF)<2 && TMath::Abs(nSigmaPion_TOF)>3 && TMath::Abs(nSigmaProton_TOF)>2 ){
-          isKtof = kTRUE;
-          nPIDtof = 2;
-          nPID=9.5;
-        }else isKtof = kFALSE;
-
-        // PROTON check - TOF
-        if (TMath::Abs(nSigmaProton_TOF)<2 && TMath::Abs(nSigmaPion_TOF)>3 && TMath::Abs(nSigmaKaon_TOF)>2 ){
-          isPtof = kTRUE;
-          nPIDtof = 3;
-          nPID=10.5;
-        }else isPtof = kFALSE;
-      }  // cut on track pT for TOF
-
-      if (nPIDtpc == 4) nPID = -0.5;
-         if (nPIDits == 4) nPID = 3.5;
-      if (nPIDtof == 4) nPID = 7.5;
-         fHistPID->Fill(nPID);
+        // some variables for PID
+        Double_t pt = -999; 
+        Double_t dEdx = -999;
+        Double_t ITSsig = -999;
+        Double_t TOFsig = -999;
+        Double_t charge = -999;
+
+        // nSigma of particles in TPC, TOF, and ITS
+        Double_t nSigmaPion_TPC, nSigmaProton_TPC, nSigmaKaon_TPC;
+        Double_t nSigmaPion_TOF, nSigmaProton_TOF, nSigmaKaon_TOF;
+        Double_t nSigmaPion_ITS, nSigmaProton_ITS, nSigmaKaon_ITS;
+
+        if(doPID){
+          // get parameters of track
+          charge = track->Charge();    // charge of track
+          pt     = track->Pt();        // pT of track
+
+          // extra attempt 
+          AliVEvent *vevent=InputEvent();
+          if (!vevent||!fPIDResponse) return kTRUE; // just return, maybe put at beginning
+
+          fHistEventQA->Fill(13); // check for AliVEvent and fPIDresponse objects
+
+///////////////////////////////////////
+
+          // get detector signals
+          dEdx = track->GetTPCsignal();
+          ITSsig = track->GetITSsignal();
+          TOFsig = track->GetTOFsignal();
+
+          // TPC nSigma's
+          nSigmaPion_TPC = fPIDResponse->NumberOfSigmasTPC(track,AliPID::kPion);
+          nSigmaKaon_TPC = fPIDResponse->NumberOfSigmasTPC(track,AliPID::kKaon);
+          nSigmaProton_TPC = fPIDResponse->NumberOfSigmasTPC(track,AliPID::kProton);
+
+          // TOF nSigma's
+          nSigmaPion_TOF = fPIDResponse->NumberOfSigmasTOF(track,AliPID::kPion);
+          nSigmaKaon_TOF = fPIDResponse->NumberOfSigmasTOF(track,AliPID::kKaon);
+          nSigmaProton_TOF = fPIDResponse->NumberOfSigmasTOF(track,AliPID::kProton);
+
+          // ITS nSigma's
+          nSigmaPion_ITS = fPIDResponse->NumberOfSigmasITS(track,AliPID::kPion);
+          nSigmaKaon_ITS = fPIDResponse->NumberOfSigmasITS(track,AliPID::kKaon);
+          nSigmaProton_ITS = fPIDResponse->NumberOfSigmasITS(track,AliPID::kProton);
+
+          // fill detector signal histograms
+          if (makeQAhistos) fHistTPCdEdX->Fill(pt, dEdx);
+          if (makeQAhistos) fHistITSsignal->Fill(pt, ITSsig);
+          //if (makeQAhistos) fHistTOFsignal->Fill(pt, TOFsig);
+
+          // Tests to PID pions, kaons, and protons,          (default is undentified tracks)
+          Double_t nPIDtpc = 0;
+          Double_t nPIDits = 0; 
+          Double_t nPIDtof = 0;
+          Double_t nPID = -99;
+
+          // check track has pT < 0.900 GeV  - use TPC pid
+          if (pt<0.900 && dEdx>0) {
+               nPIDtpc = 4;
+            nPID = 1;
+
+            // PION check - TPC
+            if (TMath::Abs(nSigmaPion_TPC)<2 && TMath::Abs(nSigmaKaon_TPC)>2 && TMath::Abs(nSigmaProton_TPC)>2 ){
+              isPItpc = kTRUE;
+              nPIDtpc = 1;
+              nPID=2;
+            }else isPItpc = kFALSE; 
+
+            // KAON check - TPC
+            if (TMath::Abs(nSigmaKaon_TPC)<2 && TMath::Abs(nSigmaPion_TPC)>3 && TMath::Abs(nSigmaProton_TPC)>2 ){
+              isKtpc = kTRUE;
+              nPIDtpc = 2;
+              nPID=3;
+            }else isKtpc = kFALSE;
+
+            // PROTON check - TPC
+            if (TMath::Abs(nSigmaProton_TPC)<2 && TMath::Abs(nSigmaPion_TPC)>3 && TMath::Abs(nSigmaKaon_TPC)>2 ){
+              isPtpc = kTRUE;
+              nPIDtpc = 3;
+              nPID=4;
+            }else isPtpc = kFALSE;
+          }  // cut on track pT for TPC
+
+          // check track has pT < 0.500 GeV - use ITS pid
+          if (pt<0.500 && ITSsig>0) {
+            nPIDits = 4;
+            nPID = 5;
+
+            // PION check - ITS
+            if (TMath::Abs(nSigmaPion_ITS)<2 && TMath::Abs(nSigmaKaon_ITS)>2 && TMath::Abs(nSigmaProton_ITS)>2 ){
+              isPIits = kTRUE;
+              nPIDits = 1; 
+                 nPID=6;
+            }else isPIits = kFALSE;
+
+            // KAON check - ITS
+            if (TMath::Abs(nSigmaKaon_ITS)<2 && TMath::Abs(nSigmaPion_ITS)>3 && TMath::Abs(nSigmaProton_ITS)>2 ){
+              isKits = kTRUE;
+              nPIDits = 2;
+              nPID=7;
+            }else isKits = kFALSE;
+
+            // PROTON check - ITS
+            if (TMath::Abs(nSigmaProton_ITS)<2 && TMath::Abs(nSigmaPion_ITS)>3 && TMath::Abs(nSigmaKaon_ITS)>2 ){
+              isPits = kTRUE;
+              nPIDits = 3;
+                 nPID=8;
+            }else isPits = kFALSE;
+          }  // cut on track pT for ITS
+
+          // check track has 0.900 GeV < pT < 2.500 GeV - use TOF pid
+          if (pt>0.900 && pt<2.500 && TOFsig>0) {
+               nPIDtof = 4;
+            nPID = 9;
+
+            // PION check - TOF
+            if (TMath::Abs(nSigmaPion_TOF)<2 && TMath::Abs(nSigmaKaon_TOF)>2 && TMath::Abs(nSigmaProton_TOF)>2 ){
+              isPItof = kTRUE;
+              nPIDtof = 1;
+              nPID=10;
+            }else isPItof = kFALSE;
+
+            // KAON check - TOF
+            if (TMath::Abs(nSigmaKaon_TOF)<2 && TMath::Abs(nSigmaPion_TOF)>3 && TMath::Abs(nSigmaProton_TOF)>2 ){
+              isKtof = kTRUE;
+              nPIDtof = 2;
+              nPID=11;
+            }else isKtof = kFALSE;
+
+            // PROTON check - TOF
+            if (TMath::Abs(nSigmaProton_TOF)<2 && TMath::Abs(nSigmaPion_TOF)>3 && TMath::Abs(nSigmaKaon_TOF)>2 ){
+              isPtof = kTRUE;
+              nPIDtof = 3;
+              nPID=12;
+            }else isPtof = kFALSE;
+          }  // cut on track pT for TOF
+
+          if (nPID == -99) nPID = 14;
+             fHistPID->Fill(nPID);
 
           // PID sparse getting filled 
-          Double_t nontrig_tracks_Entries[23] = {fCent,jetPtLocal,pt,charge,eta,deta,dphijh,leadjet,zVtx,//EovP,fClsE,
-               dEP, jetPt,
-                                      nSigmaPion_TPC, nSigmaProton_TPC, nSigmaKaon_TPC,  //nSig in TPC
-                                      nSigmaPion_ITS, nSigmaProton_ITS, nSigmaKaon_ITS,  //nSig in ITS
-                                      nSigmaPion_TOF, nSigmaProton_TOF, nSigmaKaon_TOF,  //nSig in TOF
-                                     nPIDtpc, nPIDits, nPIDtof                          //PID label for each detector
+          if (allpidAXIS) { // FILL ALL axis
+                       Double_t pid_EntriesALL[21] = {fCent,pt,charge,deta,dphijh,leadjet,zVtx,dEP,jetPt,
+                                      nSigmaPion_TPC, nSigmaPion_TOF, // pion nSig values in TPC/TOF
+                                                                 nPIDtpc, nPIDits, nPIDtof,       // PID label for each detector
+                                                                         nSigmaProton_TPC, nSigmaKaon_TPC,  // nSig in TPC
+                                      nSigmaPion_ITS, nSigmaProton_ITS, nSigmaKaon_ITS,  // nSig in ITS
+                                      nSigmaProton_TOF, nSigmaKaon_TOF,  // nSig in TOF
+                                      }; //array for PID sparse     
+                   fhnPID->Fill(pid_EntriesALL);
+                 } else {
+            // PID sparse getting filled 
+            Double_t pid_Entries[14] = {fCent,pt,charge,deta,dphijh,leadjet,zVtx,dEP,jetPt,
+                                      nSigmaPion_TPC, nSigmaPion_TOF, // pion nSig values in TPC/TOF
+                                                                 nPIDtpc, nPIDits, nPIDtof       // PID label for each detector
                                       }; //array for PID sparse                           
-          fhnPID->Fill(nontrig_tracks_Entries);   // fill Sparse histo of PID tracks 
-        } // end of doPID check
+            fhnPID->Fill(pid_Entries);   // fill Sparse histo of PID tracks 
+                 } // minimal pid sparse filling
+
+               } // end of doPID check
 
            // get track pt bin
         Int_t itrackpt = -500;              // initialize track pT bin
         itrackpt = GetpTtrackBin(track->Pt());
 
            // all tracks: jet hadron correlations in hadron pt bins
-        fHistJetHadbindPhi[itrackpt]->Fill(dphijh);
+        if(makeextraCORRhistos) fHistJetHadbindPhi[itrackpt]->Fill(dphijh);
 
         // in plane and out of plane jet-hadron histo's
         if( dEP>0 && dEP<=(TMath::Pi()/6) ){
-           // we are IN plane
-           fHistJetHaddPhiINcent[centbin]->Fill(dphijh);
-           fHistJetHaddPhiIN->Fill(dphijh);
-           fHistJetHadbindPhiIN[itrackpt]->Fill(dphijh);
-           //fHistJetHaddPhiPtcentbinIN[itrackpt][centbin]->Fill(dphijh);
+          // we are IN plane
+          if(makeextraCORRhistos) fHistJetHaddPhiINcent[centbin]->Fill(dphijh);
+          fHistJetHaddPhiIN->Fill(dphijh);
+          if(makeextraCORRhistos) fHistJetHadbindPhiIN[itrackpt]->Fill(dphijh);
+          //fHistJetHaddPhiPtcentbinIN[itrackpt][centbin]->Fill(dphijh);
         }else if( dEP>(TMath::Pi()/3) && dEP<=(TMath::Pi()/2) ){
-           // we are OUT of PLANE
-           fHistJetHaddPhiOUTcent[centbin]->Fill(dphijh);
-           fHistJetHaddPhiOUT->Fill(dphijh);
-           fHistJetHadbindPhiOUT[itrackpt]->Fill(dphijh);
-           //fHistJetHaddPhiPtcentbinOUT[itrackpt][centbin]->Fill(dphijh);
+          // we are OUT of PLANE
+          if(makeextraCORRhistos) fHistJetHaddPhiOUTcent[centbin]->Fill(dphijh);
+          fHistJetHaddPhiOUT->Fill(dphijh);
+          if(makeextraCORRhistos) fHistJetHadbindPhiOUT[itrackpt]->Fill(dphijh);
+          //fHistJetHaddPhiPtcentbinOUT[itrackpt][centbin]->Fill(dphijh);
         }else if( dEP>(TMath::Pi()/6) && dEP<=(TMath::Pi()/3) ){ 
-           // we are in the middle of plane
-           fHistJetHaddPhiMIDcent[centbin]->Fill(dphijh);
-           fHistJetHaddPhiMID->Fill(dphijh);
-           fHistJetHadbindPhiMID[itrackpt]->Fill(dphijh);
+          // we are in the middle of plane
+          if(makeextraCORRhistos) fHistJetHaddPhiMIDcent[centbin]->Fill(dphijh);
+          fHistJetHaddPhiMID->Fill(dphijh);
+          if(makeextraCORRhistos) fHistJetHadbindPhiMID[itrackpt]->Fill(dphijh);
         }
       } // loop over tracks found in event with highest JET pT > 10.0 GeV (change)
     } // jet pt cut
   } // jet loop
 
+  fHistEventQA->Fill(14); // events right before event mixing
+
 // ***************************************************************************************************************
 // ******************************** Event MIXING *****************************************************************
-  TObjArray* tracksClone = CloneAndReduceTrackList(tracks); // TEST
+// ***************************************************************************************************************
+
+  // initialize object array of cloned picotracks
+  TObjArray* tracksClone = 0x0;
+  
+  // PbPb collisions - create cloned picotracks
+  //if(GetBeamType() == 1) tracksClone = CloneAndReduceTrackList(tracks); // TEST
 
   //Prepare to do event mixing
   if(fDoEventMixing>0){
@@ -1210,29 +1389,108 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
     //    of 1./nMix can be applied.
 
     // mix jets from triggered events with tracks from MB events
-    // get the trigger bit
-    // need to change trigger bits between different runs
-//T    UInt_t trigger = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();
-//T    if (trigger==0)  return kTRUE; // return
-
-    //Double_t Ntrks=(Double_t)Ntracks*1.0;
-    //cout<<"Test.. Ntrks: "<<fPoolMgr->GetEventPool(Ntrks);
+    // get the trigger bit, need to change trigger bits between different runs
+    UInt_t trigger = ((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();
+    // if event was not selected (triggered) for any reseason (should never happen) then return
+    if (trigger==0)  return kTRUE;
+
+    // initialize event pools
+    AliEventPool* pool = 0x0;
+    AliEventPool* poolpp = 0x0;
+    Double_t Ntrks = -999;
+
+    // pp collisions - get event pool
+    if(GetBeamType() == 0) {
+      Ntrks=(Double_t)Ntracks*1.0;
+      //cout<<"Test.. Ntrks: "<<fPoolMgr->GetEventPool(Ntrks);
+      poolpp = fPoolMgr->GetEventPool(Ntrks, zVtx); // for pp
+    }
 
-    AliEventPool* pool = fPoolMgr->GetEventPool(fCent, zVtx); // for PbPb? fcent
-    //AliEventPool* pool = fPoolMgr->GetEventPool(Ntrks, zVtx); // for pp
+    // PbPb collisions - get event pool 
+    if(GetBeamType() == 1) pool = fPoolMgr->GetEventPool(fCent, zVtx); // for PbPb? fcent
 
-    if (!pool){
-      AliFatal(Form("No pool found for centrality = %f, zVtx = %f", fCent, zVtx));
-      //AliFatal(Form("No pool found for multiplicity = %f, zVtx = %f", Ntrks, zVtx));
+    // if we don't have a pool, return
+    if (!pool && !poolpp){
+      if(GetBeamType() == 1) AliFatal(Form("No pool found for centrality = %f, zVtx = %f", fCent, zVtx));
+      if(GetBeamType() == 0) AliFatal(Form("No pool found for multiplicity = %f, zVtx = %f", Ntrks, zVtx));
       return kTRUE;
     }
 
+    fHistEventQA->Fill(15); // mixed events cases that have pool
+
+    // initialize background tracks array
+    TObjArray* bgTracks;
+
+    // next line might not apply for PbPb collisions
+    // use only jets from EMCal-triggered events (for lhc11a use AliVEvent::kEMC1)
+    //check for a trigger jet
+    // fmixingtrack/10 ??
+  if(GetBeamType() == 1) if(trigger & fTriggerEventType) { //kEMCEJE)) {     
+    if (pool->IsReady() || pool->NTracksInPool() > fNMIXtracks || pool->GetCurrentNEvents() >= fNMIXevents) {
+
+      // loop over jets (passing cuts?)
+      for (Int_t ijet = 0; ijet < Njets; ijet++) {
+        Double_t leadjet=0;
+        if (ijet==ijethi) leadjet=1;
+
+        // get jet object
+        AliEmcalJet *jet = static_cast<AliEmcalJet*>(jets->At(ijet));
+           if (!jet) continue;
+
+               // (should probably be higher..., but makes a cut on jet pT)
+       if (jet->Pt()<0.1) continue;
+       if (!AcceptMyJet(jet)) continue;
+
+        fHistEventQA->Fill(16); // event mixing jets
+               
+        // set cut to do event mixing only if we have a jet meeting our pt threshold (bias applied below)
+        if (jet->Pt()<fJetPtcut) continue;
+
+        // get number of current events in pool
+        Int_t nMix = pool->GetCurrentNEvents();  // how many particles in pool to mix
+
+          // Fill for biased jet triggers only
+        if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)) {  // && jet->Pt() > fJetPtcut) {
+          // Fill mixed-event histos here  
+          for (Int_t jMix=0; jMix<nMix; jMix++) {
+                       fHistEventQA->Fill(17); // event mixing nMix                 
+
+                   // get jMix'th event
+                       bgTracks = pool->GetEvent(jMix);
+            const Int_t Nbgtrks = bgTracks->GetEntries();
+            for(Int_t ibg=0; ibg<Nbgtrks; ibg++) {
+              AliPicoTrack *part = static_cast<AliPicoTrack*>(bgTracks->At(ibg));
+              if(!part) continue;
+              if(TMath::Abs(part->Eta())>0.9) continue;
+              if(part->Pt()<0.15) continue;
+
+              Double_t DEta = part->Eta()-jet->Eta();                // difference in eta
+              Double_t DPhi = RelativePhi(jet->Phi(),part->Phi());   // difference in phi
+              Double_t dEP = RelativeEPJET(jet->Phi(),fEPV0);       // difference between jet and EP
+                     Double_t mixcharge = part->Charge();
+              //Double_t DR=TMath::Sqrt(DPhi*DPhi+DEta*DEta);      // difference in R
+                           
+              // create / fill mixed event sparse
+              Double_t triggerEntries[10] = {fCent,jet->Pt(),part->Pt(),DEta,DPhi,dEP,zVtx, mixcharge, leadjet}; //array for ME sparse
+              fhnMixedEvents->Fill(triggerEntries,1./nMix);   // fill Sparse histo of mixed events
+
+              fHistEventQA->Fill(18); // event mixing - nbgtracks
+              if(makeextraCORRhistos) fHistMEphieta->Fill(DPhi,DEta, 1./nMix);
+            } // end of background track loop
+          } // end of filling mixed-event histo's
+        } // end of check for biased jet triggers
+      } // end of jet loop
+    } // end of check for pool being ready
+  } // end EMC triggered loop
+
+//=============================================================================================================
+
     // use only jets from EMCal-triggered events (for lhc11a use AliVEvent::kEMC1)
 ///    if (trigger & AliVEvent::kEMC1) {
-//T    if (trigger & AliVEvent::kEMCEJE) {  // TEST
-      //check for a trigger jet
-      // fmixingtrack/10 ??
-      if (pool->IsReady() || pool->NTracksInPool() > fMixingTracks / 100 /*100*/ || pool->GetCurrentNEvents() >= 5) {
+    // pp collisions
+    if(GetBeamType() == 0) if(trigger & fTriggerEventType) { //kEMC1)) {     
+      if (poolpp->IsReady() || poolpp->NTracksInPool() > fNMIXtracks || poolpp->GetCurrentNEvents() >= fNMIXevents) {
+
         // loop over jets (passing cuts?)
         for (Int_t ijet = 0; ijet < Njets; ijet++) {
           Double_t leadjet=0;
@@ -1246,58 +1504,90 @@ Bool_t AliAnalysisTaskEmcalJetHadEPpid::Run()
          if (jet->Pt()<0.1) continue;
          if (!AcceptMyJet(jet)) continue;
 
-          Int_t nMix = pool->GetCurrentNEvents();  // how many particles in pool to mix
+          fHistEventQA->Fill(16); // event mixing jets
+
+          // set cut to do event mixing only if we have a jet meeting our pt threshold (bias applied below)
+                 if (jet->Pt()<fJetPtcut) continue;
+
+          // get number of current events in pool 
+          Int_t nMix = poolpp->GetCurrentNEvents();  // how many particles in pool to mix
 
           // Fill for biased jet triggers only
-          if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)) {
+          if ((jet->MaxTrackPt()>fTrkBias) || (jet->MaxClusterPt()>fClusBias)) {  // && jet->Pt() > fJetPtcut) {
             // Fill mixed-event histos here  
             for (Int_t jMix=0; jMix<nMix; jMix++) {
-                TObjArray* bgTracks = pool->GetEvent(jMix);
-                const Int_t Nbgtrks = bgTracks->GetEntries();
-                for(Int_t ibg=0; ibg<Nbgtrks; ibg++) {
-                  AliPicoTrack *part = static_cast<AliPicoTrack*>(bgTracks->At(ibg));
-                  if(!part) continue;
-                  if(TMath::Abs(part->Eta())>0.9) continue;
-                  if(part->Pt()<0.15) continue;
-
-                  Double_t DEta = part->Eta()-jet->Eta();                // difference in eta
-                  Double_t DPhi = RelativePhi(jet->Phi(),part->Phi());   // difference in phi
-                  Float_t dEP = RelativeEPJET(jet->Phi(),fEPV0);            // difference between jet and EP
-                         Double_t mixcharge = part->Charge();
-
-                  //Double_t DR=TMath::Sqrt(DPhi*DPhi+DEta*DEta);      // difference in R
-//T                  if(DPhi<-0.5*TMath::Pi()) DPhi+=2.*TMath::Pi();
-//T                  if(DPhi>3./2.*TMath::Pi()) DPhi-=2.*TMath::Pi();
-                           
-                  Double_t triggerEntries[10] = {fCent,jet->Pt(),part->Pt(),DEta,DPhi,dEP,zVtx, mixcharge,0,leadjet}; //array for ME sparse
-                  fhnMixedEvents->Fill(triggerEntries,1./nMix);   // fill Sparse histo of mixed events
-                  fHistMEphieta->Fill(DPhi,DEta, 1./nMix);
-
-                } // end of background track loop
-             } // end of filling mixed-event histo's
+                         fHistEventQA->Fill(17); // event mixing nMix                 
+
+                     // get jMix'th event
+                         bgTracks = poolpp->GetEvent(jMix);
+              const Int_t Nbgtrks = bgTracks->GetEntries();
+              for(Int_t ibg=0; ibg<Nbgtrks; ibg++) {
+                AliPicoTrack *part = static_cast<AliPicoTrack*>(bgTracks->At(ibg));
+                if(!part) continue;
+                if(TMath::Abs(part->Eta())>0.9) continue;
+                if(part->Pt()<0.15) continue;
+
+                Double_t DEta = part->Eta()-jet->Eta();                // difference in eta
+                Double_t DPhi = RelativePhi(jet->Phi(),part->Phi());   // difference in phi
+                Double_t dEP = RelativeEPJET(jet->Phi(),fEPV0);             // difference between jet and EP
+                Double_t mixcharge = part->Charge();
+                //Double_t DR=TMath::Sqrt(DPhi*DPhi+DEta*DEta);      // difference in R
+
+                // create / fill mixed event sparse
+                Double_t triggerEntries[10] = {fCent,jet->Pt(),part->Pt(),DEta,DPhi,dEP,zVtx, mixcharge, leadjet}; //array for ME sparse
+                fhnMixedEvents->Fill(triggerEntries,1./nMix);   // fill Sparse histo of mixed events
+
+                fHistEventQA->Fill(18); // event mixing - nbgtracks
+                if(makeextraCORRhistos) fHistMEphieta->Fill(DPhi,DEta, 1./nMix);
+              } // end of background track loop
+            } // end of filling mixed-event histo's
           } // end of check for biased jet triggers
         } // end of jet loop
-      } // end of check for triggered jet
-//    } //end EMC triggered loop
+      } // end of check for pool being ready
+    } //end EMC triggered loop
 
+    // pp collisions
     // use only tracks from MB events (for lhc11a use AliVEvent::kMB)
 ///    if (trigger & AliVEvent::kMB) {
 //T    if (trigger & AliVEvent::kAnyINT){ // test
-      // create a list of reduced objects. This speeds up processing and reduces memory consumption for the event pool
-//T      TObjArray* tracksClone = CloneAndReduceTrackList(tracks);
+    if(GetBeamType() == 0) {
+
+      // use only tracks from MB events (for lhc11a use AliVEvent::kMB)
+      if(trigger & fMixingEventType) { //kMB) {
+
+        // create a list of reduced objects. This speeds up processing and reduces memory consumption for the event pool
+        tracksClone = CloneAndReduceTrackList(tracks);
+
+        // update pool if jet in event or not
+        poolpp->UpdatePool(tracksClone);
+
+      } // check on track from MB events
+    }
 
-      // update pool if jet in event or not
-      pool->UpdatePool(tracksClone);
-///    } // check on track from MB events
+    // PbPb collisions
+    if(GetBeamType() == 1) {
+      
+      // use only tracks from MB events
+      if(trigger & fMixingEventType) { //kMB) {
+
+        // create a list of reduced objects. This speeds up processing and reduces memory consumption for the event pool
+        tracksClone = CloneAndReduceTrackList(tracks);
+
+        // update pool if jet in event or not
+        pool->UpdatePool(tracksClone);
+
+      } // MB events
+    } // PbPb collisions
   } // end of event mixing
 
   // print some stats on the event
   event++;
-  
+  fHistEventQA->Fill(19);  // events making it to end  
+
   if (doComments) {
     cout<<"Event #: "<<event<<"     Jet Radius: "<<fJetRad<<"     Constituent Pt Cut: "<<fConstituentCut<<endl;
-    cout<<"# of jets: "<<Njets<<"      Highest jet pt: "<<highestjetpt<<endl;
-    cout<<"# tracks: "<<Ntracks<<"      Highest track pt: "<<ptmax<<endl;
+    cout<<"# of jets: "<<Njets<<"      NjetAcc: "<<NjetAcc<<"      Highest jet pt: "<<highestjetpt<<"     leading hadron pt: "<<leadhadronPT<<endl;
+    cout<<"# tracks: "<<Ntracks<<"      NtrackAcc: "<<NtrackAcc<<"      Highest track pt: "<<ptmax<<endl;
     cout<<" =============================================== "<<endl;
   }
 
@@ -1319,7 +1609,7 @@ Int_t AliAnalysisTaskEmcalJetHadEPpid::GetCentBin(Double_t cent) const
 }
 
 //________________________________________________________________________
-Float_t AliAnalysisTaskEmcalJetHadEPpid::RelativePhi(Double_t mphi,Double_t vphi) const
+Double_t AliAnalysisTaskEmcalJetHadEPpid::RelativePhi(Double_t mphi,Double_t vphi) const
 { // function to calculate relative PHI
   double dphi = mphi-vphi;
 
@@ -1334,10 +1624,8 @@ Float_t AliAnalysisTaskEmcalJetHadEPpid::RelativePhi(Double_t mphi,Double_t vphi
   return dphi; // dphi in [-0.5Pi, 1.5Pi]                                                                                   
 }
 
-
-
 //_________________________________________________________________________
-Float_t AliAnalysisTaskEmcalJetHadEPpid:: RelativeEPJET(Double_t jetAng, Double_t EPAng) const
+Double_t AliAnalysisTaskEmcalJetHadEPpid:: RelativeEPJET(Double_t jetAng, Double_t EPAng) const
 { // function to calculate angle between jet and EP in the 1st quadrant (0,Pi/2)
   Double_t dphi = (EPAng - jetAng);
   
@@ -1410,7 +1698,6 @@ Int_t AliAnalysisTaskEmcalJetHadEPpid::GetpTtrackBin(Double_t pt) const
   return ptbin;
 } // end of get-jet-pt-bin
 
-
 //___________________________________________________________________________
 Int_t AliAnalysisTaskEmcalJetHadEPpid::GetzVertexBin(Double_t zVtx) const
 {
@@ -1481,38 +1768,38 @@ void AliAnalysisTaskEmcalJetHadEPpid::GetDimParams(Int_t iEntry, TString &label,
       break;
 
    case 1:
-      label = "Corrected Jet p_{T}";
-      nbins = 256;
-      xmin = -50.;
-      xmax = 206.;
+      label = "Jet p_{T}";
+      nbins = 50; // 216
+      xmin = 0.;
+      xmax = 250.; // 216
       break;
 
    case 2:
       label = "Track p_{T}";
-      nbins = 100;
+      nbins = 80; //300; // 750 pid
       xmin = 0.;
-      xmax = 100.;
+      xmax = 20.; //75.;
       break;
 
     case 3:
       label = "Relative Eta";
-      nbins = 64;
+      nbins = 48;
       xmin = -1.6;
       xmax = 1.6;
       break;
 
    case 4: 
       label = "Relative Phi";
-      nbins = 144;
+      nbins = 72;
       xmin = -0.5*pi;
       xmax = 1.5*pi;
       break;
 
   case 5:
       label = "Relative angle of Jet and Reaction Plane";
-      nbins = 144;
-      xmin = -0.5*pi;
-      xmax = 1.5*pi;
+      nbins = 12; // 72
+      xmin = 0;
+      xmax = 0.5*pi;
       break;
 
   case 6:
@@ -1524,57 +1811,43 @@ void AliAnalysisTaskEmcalJetHadEPpid::GetDimParams(Int_t iEntry, TString &label,
 
   case 7:
       label = "track charge";
-      nbins =3;
+      nbins = 3;
       xmin = -1.5;
       xmax = 1.5;
       break;
 
-  case 8: // need to update
-      label = "leading track";
-      nbins = 10;
-      xmin = 0;
-      xmax = 50;
-      break;
-
-  case 9:  // need to update
+  case 8:
       label = "leading jet";
       nbins = 3;
       xmin = -0.5;
       xmax = 2.5;
       break;
+
+  case 9: // need to update
+      label = "leading track";
+      nbins = 10;
+      xmin = 0;
+      xmax = 50;
+      break; 
+
    } // end of switch
 } // end of getting dim-params
 
 //_________________________________________________
 // From CF event mixing code PhiCorrelations
-TObjArray* AliAnalysisTaskEmcalJetHadEPpid::CloneAndReduceTrackList(TObjArray* tracks)
+TObjArray* AliAnalysisTaskEmcalJetHadEPpid::CloneAndReduceTrackList(TObjArray* tracksME)
 {
   // clones a track list by using AliPicoTrack which uses much less memory (used for event mixing)
   TObjArray* tracksClone = new TObjArray;
   tracksClone->SetOwner(kTRUE);
 
-  /*
-  Int_t nTrax = fESD->GetNumberOfTracks();
-  //cout << "nTrax " << nTrax <<endl;
-  
-  for (Int_t i = 0; i < nTrax; ++i) 
-    {
-      AliESDtrack* esdtrack = fESD->GetTrack(i);
-      if (!esdtrack) 
-        {
-          AliError(Form("Couldn't get ESD track %d\n", i));
-          continue;
-        }
+// ===============================
 
-      AliESDtrack *particle = GetAcceptTrack(esdtrack);
-      if(!particle) continue;
-  
-      cout << "RM Hybrid track : " << i << "  " << particle->Pt() << endl;
-  */
+//      cout << "RM Hybrid track : " << i << "  " << particle->Pt() << endl;  
 
   //cout << "nEntries " << tracks->GetEntriesFast() <<endl;
-  for (Int_t i=0; i<tracks->GetEntriesFast(); i++) {
-    AliVParticle* particle = (AliVParticle*) tracks->At(i);
+  for (Int_t i=0; i<tracksME->GetEntriesFast(); i++) {         // AOD/general case
+    AliVParticle* particle = (AliVParticle*) tracksME->At(i);  // AOD/general case
     if(TMath::Abs(particle->Eta())>fTrkEta) continue;
     if(particle->Pt()<0.15)continue;
 
@@ -1660,157 +1933,143 @@ void AliAnalysisTaskEmcalJetHadEPpid::GetDimParamsPID(Int_t iEntry, TString &lab
       break;
 
    case 1:
-      label = "Corrected Jet p_{T}";
-      nbins = 250; 
-      xmin = -50.;
-      xmax = 200.;
-      break;
-
-   case 2:
       label = "Track p_{T}";
-      nbins = 750; //500
+      nbins = 80; //300; // 750 
       xmin = 0.;
-      xmax = 75.; //50
+      xmax = 20.; //75.; 
       break;
 
-   case 3:
+   case 2:
       label = "Charge of Track";
       nbins = 3;
       xmin = -1.5;
       xmax = 1.5;
       break;
 
-   case 4:
-      label = "Track Eta";
-      nbins = 64;
-      xmin = -1.2;
-      xmax = 1.2;
-      break;
-
-   case 5:
+   case 3:
       label = "Relative Eta of Track and Jet";
-      nbins = 64;
+      nbins = 48;
       xmin = -1.6;
       xmax = 1.6;
       break;
 
-   case 6:
+   case 4:
       label = "Relative Phi of Track and Jet";
-      nbins = 64;
+      nbins = 72;
       xmin = -0.5*pi;
       xmax = 1.5*pi;
       break;
 
-   case 7:
+   case 5:
       label = "leading jet";
       nbins = 3;
       xmin = -.5;
       xmax = 2.5;
       break;
 
-   case 8:
+   case 6:
       label = "Z-vertex";
       nbins = 10;
       xmin = -10.;
       xmax = 10.;
       break;
 
-   case 9
+   case 7
       label = "Relative angle: Jet and Reaction Plane";
-      nbins = 64;
+      nbins = 12; // 48
       xmin = 0.;
       xmax = 0.5*pi;
       break;
 
-   case 10: // don't need
-      label = "Jet Pt";
-      nbins = 100; //250;
+   case 8: 
+      label = "Jet p_{T}";
+      nbins = 50; // 216 
       xmin = 0.;
-      xmax = 100.; //250.;
+      xmax = 250.; // 216
       break;
 
-   case 11:
+   case 9:
       label = "N-Sigma of pions in TPC";
       nbins = 200;
-      xmin = -10.0; //5.;
-      xmax = 10.0; //5.;
+      xmin = -10.0;
+      xmax = 10.0; 
+      break;
+
+   case 10:
+      label = "N-Sigma of pions in TOF";
+      nbins = 200;
+      xmin = -10.;
+      xmax = 10.; 
+      break;
+
+   case 11:
+      label = "TPC PID determination";
+      nbins = 5;
+      xmin = 0.;
+      xmax = 5.;
       break;
 
    case 12:
-      label = "N-Sigma of protons in TPC";
-      nbins = 100;
-      xmin = -5.;
+      label = "ITS PID determination";
+      nbins = 5;
+      xmin = 0.;
       xmax = 5.;
       break;
 
    case 13:
-      label = "N-Sigma of kaons in TPC";
-      nbins = 100;
-      xmin = -5.;
+      label = "TOF PID determination";
+      nbins = 5;
+      xmin = 0.;
       xmax = 5.;
       break;
 
    case 14:
-      label = "N-Sigma of pions in ITS";
+      label = "N-Sigma of protons in TPC";
       nbins = 200;
-      xmin = -10.0; //-5.;
-      xmax = 10.0; //5.;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    case 15:
-      label = "N-Sigma of protons in ITS";
-      nbins = 100;
-      xmin = -5.;
-      xmax = 5.;
+      label = "N-Sigma of kaons in TPC";
+      nbins = 200;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    case 16:
-      label = "N-Sigma of kaons in ITS";
-      nbins = 100;
-      xmin = -5.;
-      xmax = 5.;
+      label = "N-Sigma of pions in ITS";
+      nbins = 200;
+      xmin = -10.0;
+      xmax = 10.0; 
       break;
 
    case 17:
-      label = "N-Sigma of pions in TOF";
+      label = "N-Sigma of protons in ITS";
       nbins = 200;
-      xmin = -10.; //-5.;
-      xmax = 10.; //5.;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    case 18:
-      label = "N-Sigma of protons in TOF";
-      nbins = 100;
-      xmin = -5.;
-      xmax = 5.;
+      label = "N-Sigma of kaons in ITS";
+      nbins = 200;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    case 19:
-      label = "N-Sigma of kaons in TOF";
-      nbins = 100;
-      xmin = -5.;
-      xmax = 5.;
+      label = "N-Sigma of protons in TOF";
+      nbins = 200;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    case 20:
-      label = "TPC PID determination";
-      nbins = 4;
-      xmin = 0.;
-      xmax = 4.;
-      break;
-
-   case 21:
-      label = "ITS PID determination";
-      nbins = 4;
-      xmin = 0.;
-      xmax = 4.;
-      break;
-
-   case 22:
-      label = "TOF PID determination";
-      nbins = 4;
-      xmin = 0.;
-      xmax = 4.;
+      label = "N-Sigma of kaons in TOF";
+      nbins = 200;
+      xmin = -10.;
+      xmax = 10.;
       break;
 
    } // end of switch
@@ -1832,10 +2091,6 @@ Int_t AliAnalysisTaskEmcalJetHadEPpid::AcceptMyJet(AliEmcalJet *jet) {
   if (jet->Area()==0) return 0;
   //exclude jets with extremely high pt tracks which are likely misreconstructed
   if(jet->MaxTrackPt()>100) return 0;
-  //prevents 0 area jets from sneaking by when area cut == 0
-  if (jet->Area()==0) return 0;
-  //exclude jets with extremely high pt tracks which are likely misreconstructed
-  if(jet->MaxTrackPt()>100) return 0;
 
   //passed all above cuts
   return 1;
@@ -1845,17 +2100,210 @@ Int_t AliAnalysisTaskEmcalJetHadEPpid::AcceptMyJet(AliEmcalJet *jet) {
 void AliAnalysisTaskEmcalJetHadEPpid::SetfHistPIDcounterLabels(TH1* h) const
 {
     // fill the analysis summary histrogram, saves all relevant analysis settigns
-    h->GetXaxis()->SetBinLabel(1, "TPC: Unidentified"); // -0.5
-    h->GetXaxis()->SetBinLabel(2, "TPC: Pion"); // 0.5
-    h->GetXaxis()->SetBinLabel(3, "TPC: Kaon"); // 1.5
-    h->GetXaxis()->SetBinLabel(4, "TPC: Proton"); // 2.5
-    h->GetXaxis()->SetBinLabel(5, "ITS: Unidentified"); // 3.5
-    h->GetXaxis()->SetBinLabel(6, "ITS: Pion"); // 4.5
-    h->GetXaxis()->SetBinLabel(7, "ITS: Kaon"); // 5.5
-    h->GetXaxis()->SetBinLabel(8, "ITS: Proton"); // 6.5
-    h->GetXaxis()->SetBinLabel(9, "TOF: Unidentified"); // 7.5
-    h->GetXaxis()->SetBinLabel(10, "TOF: Pion"); // 8.5 
-    h->GetXaxis()->SetBinLabel(11, "TOF: Kaon"); // 9.5
-    h->GetXaxis()->SetBinLabel(12, "TOF: Proton"); // 10.5
+    h->GetXaxis()->SetBinLabel(1, "TPC: Unidentified");
+    h->GetXaxis()->SetBinLabel(2, "TPC: Pion");
+    h->GetXaxis()->SetBinLabel(3, "TPC: Kaon");
+    h->GetXaxis()->SetBinLabel(4, "TPC: Proton");
+    h->GetXaxis()->SetBinLabel(5, "ITS: Unidentified");
+    h->GetXaxis()->SetBinLabel(6, "ITS: Pion");
+    h->GetXaxis()->SetBinLabel(7, "ITS: Kaon");
+    h->GetXaxis()->SetBinLabel(8, "ITS: Proton");
+    h->GetXaxis()->SetBinLabel(9, "TOF: Unidentified");
+    h->GetXaxis()->SetBinLabel(10, "TOF: Pion"); 
+    h->GetXaxis()->SetBinLabel(11, "TOF: Kaon");
+    h->GetXaxis()->SetBinLabel(12, "TOF: Proton");
+    h->GetXaxis()->SetBinLabel(14, "Unidentified tracks");
+
+    // set x-axis labels vertically
+    h->LabelsOption("v");
+}
+
+//void AliAnalysisTaskEmcalJetHadEPpid::FillAnalysisSummaryHistogram() const
+void AliAnalysisTaskEmcalJetHadEPpid::SetfHistQAcounterLabels(TH1* h) const
+{
+    // label bins of the analysis event summary
+    h->GetXaxis()->SetBinLabel(1, "All events started"); 
+    h->GetXaxis()->SetBinLabel(2, "object check"); 
+    h->GetXaxis()->SetBinLabel(3, "aod/esd check"); 
+    h->GetXaxis()->SetBinLabel(4, "centrality check"); 
+    h->GetXaxis()->SetBinLabel(5, "zvertex check"); 
+    h->GetXaxis()->SetBinLabel(6, "list check"); 
+    h->GetXaxis()->SetBinLabel(7, "track/jet pointer check"); 
+    h->GetXaxis()->SetBinLabel(8, "tracks & jets < than 1 check"); 
+    h->GetXaxis()->SetBinLabel(9, "after track/jet loop to get highest pt"); 
+    h->GetXaxis()->SetBinLabel(10, "accepted jets"); 
+    h->GetXaxis()->SetBinLabel(11, "jets meeting pt threshold"); 
+    h->GetXaxis()->SetBinLabel(12, "accepted tracks in events w/ trigger jet"); 
+    h->GetXaxis()->SetBinLabel(13, "after AliVEvent & fPIDResponse"); 
+    h->GetXaxis()->SetBinLabel(14, "events before event mixing"); 
+    h->GetXaxis()->SetBinLabel(15, "mixed events w/ pool"); 
+    h->GetXaxis()->SetBinLabel(16, "event mixing: jets"); 
+    h->GetXaxis()->SetBinLabel(17, "event mixing: nMix"); 
+    h->GetXaxis()->SetBinLabel(18, "event mixing: nbackground tracks"); 
+    h->GetXaxis()->SetBinLabel(19, "event mixing: THE END"); 
+
+    // set x-axis labels vertically
+    h->LabelsOption("v");
+}
+
+void AliAnalysisTaskEmcalJetHadEPpid::SetfHistEvtSelQALabels(TH1* h) const
+{  
+    // label bins of the analysis trigger selection summary
+    h->GetXaxis()->SetBinLabel(1, "no trigger");
+    h->GetXaxis()->SetBinLabel(2, "kAny");
+    h->GetXaxis()->SetBinLabel(3, "kAnyINT");
+    h->GetXaxis()->SetBinLabel(4, "kMB");
+    h->GetXaxis()->SetBinLabel(5, "kINT7");
+    h->GetXaxis()->SetBinLabel(6, "kEMC1");
+    h->GetXaxis()->SetBinLabel(7, "kEMC7");
+    h->GetXaxis()->SetBinLabel(8, "kEMC8");
+    h->GetXaxis()->SetBinLabel(9, "kEMCEJE");
+    h->GetXaxis()->SetBinLabel(10, "kEMCEGA");
+    h->GetXaxis()->SetBinLabel(11, "kCentral");
+    h->GetXaxis()->SetBinLabel(12, "kSemiCentral");
+    h->GetXaxis()->SetBinLabel(13, "kINT8");
+    h->GetXaxis()->SetBinLabel(14, "kEMCEJE or kMB");
+    h->GetXaxis()->SetBinLabel(15, "kEMCEGA or kMB");
+    h->GetXaxis()->SetBinLabel(16, "kAnyINT or kMB");
+    h->GetXaxis()->SetBinLabel(17, "kEMCEJE & kMB");
+    h->GetXaxis()->SetBinLabel(18, "kEMCEGA & kMB");
+    h->GetXaxis()->SetBinLabel(19, "kAnyINT & kMB");
+
+
+    // set x-axis labels vertically
+    h->LabelsOption("v");
+    //h->LabelsDeflate("X");
+}
+
+//______________________________________________________________________
+THnSparse* AliAnalysisTaskEmcalJetHadEPpid::NewTHnSparseFCorr(const char* name, UInt_t entries) {
+  // generate new THnSparseD, axes are defined in GetDimParamsD()
+  Int_t count = 0;
+  UInt_t tmp = entries;
+  while(tmp!=0){
+    count++;
+    tmp = tmp &~ -tmp;  // clear lowest bit
+  }
+
+  TString hnTitle(name);
+  const Int_t dim = count;
+  Int_t nbins[dim];
+  Double_t xmin[dim];
+  Double_t xmax[dim];
+
+  Int_t i=0;
+  Int_t c=0;
+  while(c<dim && i<32){
+    if(entries&(1<<i)){
+
+      TString label("");
+      GetDimParamsCorr(i, label, nbins[c], xmin[c], xmax[c]);
+      hnTitle += Form(";%s",label.Data());
+      c++;
+    }
+
+    i++;
+  }
+  hnTitle += ";";
+
+  return new THnSparseF(name, hnTitle.Data(), dim, nbins, xmin, xmax);
+} // end of NewTHnSparseF
+
+//______________________________________________________________________________________________
+void AliAnalysisTaskEmcalJetHadEPpid::GetDimParamsCorr(Int_t iEntry, TString &label, Int_t &nbins, Double_t &xmin, Double_t &xmax)
+{
+   //stores label and binning of axis for THnSparse
+   const Double_t pi = TMath::Pi();
+
+   switch(iEntry){
+
+    case 0:
+      label = "V0 centrality (%)";
+      nbins = 10;
+      xmin = 0.;
+      xmax = 100.;
+      break;
+
+   case 1:
+      label = "Jet p_{T}";
+      nbins = 50; // 216
+      xmin = 0.;
+      xmax = 250.; // 216
+      break;
 
+   case 2:
+      label = "Relative angle: Jet and Reaction Plane";
+      nbins = 12; // 48
+      xmin = 0.;
+      xmax = 0.5*pi;
+      break;
+
+   case 3:
+         label = "Z-vertex";
+      nbins = 10;
+      xmin = -10.;
+      xmax = 10.;
+         break;
+
+   case 4:
+         label = "Jet p_{T} corrected with Local Rho";
+      nbins = 50; // 250
+      xmin = -50.;
+      xmax = 200.;
+         break;
+
+   case 5:
+         label = "Jet p_{T} corrected with Global Rho";
+      nbins = 50; // 250
+      xmin = -50.;
+      xmax = 200.;
+         break;
+
+   }// end of switch
+} // end of Correction (ME) sparse
+
+//________________________________________________________________________
+//Int_t AliAnalysisTaskEmcalJetHadEPpid::AcceptFlavourJet(AliEmcalJet* fljet, Int_t NUM, Int_t NUM2, Int_t NUM3) {
+Int_t AliAnalysisTaskEmcalJetHadEPpid::AcceptFlavourJet(AliEmcalJet* fljet, Int_t NUM) {
+  // Get jet if accepted for given flavour tag
+  // If jet not accepted return 0
+  if(!fljet) {
+    AliError(Form("%s:Jet not found",GetName()));
+    return 0;
+  }
+
+  Int_t flavNUM = -99;//, flavNUM2 = -99, flavNUM3 = -99; FIXME commented out to avoid compiler warning
+  flavNUM = NUM;
+  //flavNUM2 = NUM2;
+  //flavNUM3 = NUM3;
+
+/*
+  // from the AliEmcalJet class, the tagging enumerator
+  enum EFlavourTag{
+       kDStar = 1<<0, kD0 = 1<<1, 
+          kSig1 = 1<<2, kSig2 = 1<<3, 
+          kBckgrd1 = 1<<4, kBckgrd2 = 1<<5, kBckgrd3 = 1<<6
+  }; 
+  // bit 0 = no tag, bit 1 = Dstar, bit 2 = D0 and so forth...
+*/   
+
+  // get flavour of jet (if any)
+  Int_t flav = -999;
+  flav = fljet->GetFlavour();
+
+  // cases (for now..)
+  // 3 = electron rich, 5 = hadron (bkgrd) rich
+  // if flav < 1, its not tagged, so return kFALSE (0)
+  if(flav < 1) return 0;
+
+  // if flav is not equal to what we want then return kFALSE (0)
+  //if(flav != flavNUM && flav != flavNUM2 && flav != flavNUM3) return 0;
+  if(flav != flavNUM) return 0;  
+
+  // we have the flavour we want, so return kTRUE (1)
+  //if(flav == flavNUM || flav == flavNUM2 || flav == flavNUM3) return 1;
+  if(flav == flavNUM) return 1;
+
+  // we by default have a flavour tagged jet
+  return 1;
 }