Use std output and MC trigger

diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
index f1fa1176624674265a068a08348bf4139d558240..60e2c8e451a055aefc5b843052bdce011f19cf4f 100644 (file)
--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
+++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
@@ -61,7 +61,6 @@ fPDGmother(),
 fNProngs(),
 fPDGdaughters(),
 fBranchName(),
-fmyOutput(0),
 fCuts(0),
 fMinMass(),
 fMaxMass(),  
@@ -90,7 +89,6 @@ fPDGmother(),
 fNProngs(),
 fPDGdaughters(),
 fBranchName(),
-fmyOutput(0),
 fCuts(0),
 fMinMass(),
 fMaxMass(),  
@@ -163,7 +161,6 @@ AliAnalysisTaskFlavourJetCorrelations::~AliAnalysisTaskFlavourJetCorrelations()
    
    Info("~AliAnalysisTaskFlavourJetCorrelations","Calling Destructor");  
    
-   delete fmyOutput;
    delete fCuts;
    
 }
@@ -205,12 +202,11 @@ void AliAnalysisTaskFlavourJetCorrelations::Init(){
 void AliAnalysisTaskFlavourJetCorrelations::UserCreateOutputObjects() { 
    // output 
    Info("UserCreateOutputObjects","CreateOutputObjects of task %s\n", GetName());
-   fmyOutput = new TList();
-   fmyOutput->SetOwner();
-   fmyOutput->SetName("pippo");
+   AliAnalysisTaskEmcal::UserCreateOutputObjects();
    // define histograms
+   // the TList fOutput is already defined in  AliAnalysisTaskEmcal::UserCreateOutputObjects()
    DefineHistoForAnalysis();
-   PostData(1,fmyOutput);
+   PostData(1,fOutput);
    
    return;
 }
@@ -219,11 +215,8 @@ void AliAnalysisTaskFlavourJetCorrelations::UserCreateOutputObjects() {
 
 Bool_t AliAnalysisTaskFlavourJetCorrelations::Run()
 {
-   // user exec
-   if (!fInitialized){
-      AliAnalysisTaskEmcalJet::ExecOnce();
-   }
-   
+   // user exec from AliAnalysisTaskEmcal is used
+    
    // Load the event
    AliAODEvent* aodEvent = dynamic_cast<AliAODEvent*>(fInputEvent);
    
@@ -284,23 +277,23 @@ Bool_t AliAnalysisTaskFlavourJetCorrelations::Run()
    //Printf("ncandidates found %d",fCandidateArray->GetEntriesFast());
    
    //Histograms
-   TH1I* hstat=(TH1I*)fmyOutput->FindObject("hstat");
-   TH1F* hPtJetTrks=(TH1F*)fmyOutput->FindObject("hPtJetTrks");
-   TH1F* hPhiJetTrks=(TH1F*)fmyOutput->FindObject("hPhiJetTrks");
-   TH1F* hEtaJetTrks=(TH1F*)fmyOutput->FindObject("hEtaJetTrks");
-   TH1F* hEjetTrks=(TH1F*)fmyOutput->FindObject("hEjetTrks");
-   TH1F* hPtJet=(TH1F*)fmyOutput->FindObject("hPtJet");
-   TH1F* hPhiJet=(TH1F*)fmyOutput->FindObject("hPhiJet");
-   TH1F* hEtaJet=(TH1F*)fmyOutput->FindObject("hEtaJet");
-   TH1F* hEjet=(TH1F*)fmyOutput->FindObject("hEjet");
-   TH1F* hNtrArr=(TH1F*)fmyOutput->FindObject("hNtrArr");
-   TH1F* hNJetPerEv=(TH1F*)fmyOutput->FindObject("hNJetPerEv");
-   TH1F* hdeltaRJetTracks=(TH1F*)fmyOutput->FindObject("hdeltaRJetTracks");
-   TH1F* hNDPerEvNoJet=(TH1F*)fmyOutput->FindObject("hNDPerEvNoJet");
-   TH1F* hptDPerEvNoJet=(TH1F*)fmyOutput->FindObject("hptDPerEvNoJet");
-   TH1F* hNJetPerEvNoD=(TH1F*)fmyOutput->FindObject("hNJetPerEvNoD");
-   TH1F* hPtJetPerEvNoD=(TH1F*)fmyOutput->FindObject("hPtJetPerEvNoD");
-   THnSparseF* hnspDstandalone=(THnSparseF*)fmyOutput->FindObject("hsDstandalone");
+   TH1I* hstat=(TH1I*)fOutput->FindObject("hstat");
+   TH1F* hPtJetTrks=(TH1F*)fOutput->FindObject("hPtJetTrks");
+   TH1F* hPhiJetTrks=(TH1F*)fOutput->FindObject("hPhiJetTrks");
+   TH1F* hEtaJetTrks=(TH1F*)fOutput->FindObject("hEtaJetTrks");
+   TH1F* hEjetTrks=(TH1F*)fOutput->FindObject("hEjetTrks");
+   TH1F* hPtJet=(TH1F*)fOutput->FindObject("hPtJet");
+   TH1F* hPhiJet=(TH1F*)fOutput->FindObject("hPhiJet");
+   TH1F* hEtaJet=(TH1F*)fOutput->FindObject("hEtaJet");
+   TH1F* hEjet=(TH1F*)fOutput->FindObject("hEjet");
+   TH1F* hNtrArr=(TH1F*)fOutput->FindObject("hNtrArr");
+   TH1F* hNJetPerEv=(TH1F*)fOutput->FindObject("hNJetPerEv");
+   TH1F* hdeltaRJetTracks=(TH1F*)fOutput->FindObject("hdeltaRJetTracks");
+   TH1F* hNDPerEvNoJet=(TH1F*)fOutput->FindObject("hNDPerEvNoJet");
+   TH1F* hptDPerEvNoJet=(TH1F*)fOutput->FindObject("hptDPerEvNoJet");
+   TH1F* hNJetPerEvNoD=(TH1F*)fOutput->FindObject("hNJetPerEvNoD");
+   TH1F* hPtJetPerEvNoD=(TH1F*)fOutput->FindObject("hPtJetPerEvNoD");
+   THnSparseF* hnspDstandalone=(THnSparseF*)fOutput->FindObject("hsDstandalone");
        
    hstat->Fill(0);
    
@@ -356,7 +349,6 @@ Bool_t AliAnalysisTaskFlavourJetCorrelations::Run()
       Double_t candsparse[4]={charm->Eta(), charm->Phi(), charm->Pt(), 0};
       
       if(fCandidateType==kDstartoKpipi) {
-        Printf("IsA %s", (dstar->IsA())->GetName());
         if(fUseReco){
            Double_t deltamass= dstar->DeltaInvMass();
            candsparse[3]=deltamass;
@@ -498,7 +490,7 @@ Bool_t AliAnalysisTaskFlavourJetCorrelations::Run()
    
    hNJetPerEv->Fill(cntjet);
    if(candidates==0) hNJetPerEvNoD->Fill(cntjet);
-   PostData(1,fmyOutput);
+   PostData(1,fOutput);
    return kTRUE;
 }
 
@@ -513,9 +505,9 @@ void AliAnalysisTaskFlavourJetCorrelations::Terminate(Option_t*)
    Info("Terminate"," terminate");
    AliAnalysisTaskSE::Terminate();
    
-   fmyOutput = dynamic_cast<TList*> (GetOutputData(1));
-   if (!fmyOutput) {     
-      printf("ERROR: fmyOutput not available\n");
+   fOutput = dynamic_cast<TList*> (GetOutputData(1));
+   if (!fOutput) {     
+      printf("ERROR: fOutput not available\n");
       return;
    }
 }
@@ -602,7 +594,7 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
    hstat->GetXaxis()->SetBinLabel(7,"N cand sel & !jet");
    hstat->GetXaxis()->SetBinLabel(8,"N jets & !D");
    hstat->SetNdivisions(1);
-   fmyOutput->Add(hstat);
+   fOutput->Add(hstat);
    
    const Int_t nbinsmass=200;
    const Int_t nbinsptjet=500;
@@ -625,7 +617,7 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
       hDiffSideBand->GetXaxis()->SetTitle("M(kpipi)-M(Kpi) GeV");
       hDiffSideBand->GetYaxis()->SetTitle("p_{t}^{D} (GeV/c)");
       hDiffSideBand->Sumw2();
-      fmyOutput->Add(hDiffSideBand); 
+      fOutput->Add(hDiffSideBand); 
       
       
       TH1F* hPtPion = new TH1F("hPtPion","Primary pions candidates pt ",500,0,10);
@@ -633,17 +625,17 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
       hPtPion->GetXaxis()->SetTitle("GeV/c");
       hPtPion->GetYaxis()->SetTitle("Entries");
       hPtPion->Sumw2();
-      fmyOutput->Add(hPtPion);
+      fOutput->Add(hPtPion);
       
    }
    // D related histograms
    TH1F *hNDPerEvNoJet=new TH1F("hNDPerEvNoJet","Number of candidates per event with no jets; N candidate/ev with no jet", 20, 0., 20.);
    hNDPerEvNoJet->Sumw2();
-   fmyOutput->Add(hNDPerEvNoJet);
+   fOutput->Add(hNDPerEvNoJet);
    
    TH1F *hptDPerEvNoJet=new TH1F("hptDPerEvNoJet","pt distribution of candidates per events with no jets; p_{t}^{D} (GeV/c)",nbinsptD, ptDlims[0],ptDlims[1]);
    hptDPerEvNoJet->Sumw2();
-   fmyOutput->Add(hptDPerEvNoJet);
+   fOutput->Add(hptDPerEvNoJet);
    
    const Int_t    nAxisD=4;
    const Int_t    nbinsSparseD[nAxisD]={nbinseta,nbinsphi,nbinsptD,nbinsmass};
@@ -652,7 +644,7 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
    THnSparseF *hsDstandalone=new THnSparseF("hsDstandalone","#phi, #eta, p_{T}^{D}, and mass", nAxisD, nbinsSparseD, minSparseD, maxSparseD);
    hsDstandalone->Sumw2();
    
-   fmyOutput->Add(hsDstandalone);
+   fOutput->Add(hsDstandalone);
    
    // jet related fistograms
    
@@ -695,25 +687,25 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
    TH1F *hPtJetPerEvNoD=new TH1F("hPtJetPerEvNoD","pt distribution of jets per event with no D; p_{T}^{jet} (GeV/c)",nbinsptjet,ptjetlims[0],ptjetlims[1]);
    hPtJetPerEvNoD->Sumw2();
     
-   fmyOutput->Add(hEjetTrks);
-   fmyOutput->Add(hPhiJetTrks);
-   fmyOutput->Add(hEtaJetTrks);
-   fmyOutput->Add(hPtJetTrks);
-   fmyOutput->Add(hEjet);
-   fmyOutput->Add(hPhiJet);
-   fmyOutput->Add(hEtaJet);
-   fmyOutput->Add(hPtJet);
-   fmyOutput->Add(hPtJetWithD);
-   fmyOutput->Add(hPtJetWithDsb);
-   fmyOutput->Add(hdeltaRJetTracks);
-   fmyOutput->Add(hNtrArr);
-   fmyOutput->Add(hNJetPerEv);
-   fmyOutput->Add(hNJetPerEvNoD);
-   fmyOutput->Add(hPtJetPerEvNoD);
+   fOutput->Add(hEjetTrks);
+   fOutput->Add(hPhiJetTrks);
+   fOutput->Add(hEtaJetTrks);
+   fOutput->Add(hPtJetTrks);
+   fOutput->Add(hEjet);
+   fOutput->Add(hPhiJet);
+   fOutput->Add(hEtaJet);
+   fOutput->Add(hPtJet);
+   fOutput->Add(hPtJetWithD);
+   fOutput->Add(hPtJetWithDsb);
+   fOutput->Add(hdeltaRJetTracks);
+   fOutput->Add(hNtrArr);
+   fOutput->Add(hNJetPerEv);
+   fOutput->Add(hNJetPerEvNoD);
+   fOutput->Add(hPtJetPerEvNoD);
    
    TH1F* hDeltaRD=new TH1F("hDeltaRD","#Delta R distribution of D candidates selected;#Delta R",200, 0.,10.);
    hDeltaRD->Sumw2();
-   fmyOutput->Add(hDeltaRD);
+   fOutput->Add(hDeltaRD);
    
    //background (side bands for the Dstar and like sign for D0)
    fJetRadius=GetJetContainer(0)->GetJetRadius();
@@ -723,14 +715,14 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
    hInvMassptD->GetYaxis()->SetTitle("p_{t}^{D} (GeV/c)");
    hInvMassptD->Sumw2();
    
-   fmyOutput->Add(hInvMassptD);
+   fOutput->Add(hInvMassptD);
    
    if(fUseMCInfo){
       TH2F* hInvMassptDbg = new TH2F("hInvMassptDbg",Form("Background D (Delta R < %.1f) invariant mass distribution p_{T}^{j} > threshold",fJetRadius),nbinsmass,fMinMass,fMaxMass,nbinsptD,ptDlims[0],ptDlims[1]);
       hInvMassptDbg->GetXaxis()->SetTitle(Form("%s (GeV)",(fCandidateType==kDstartoKpipi) ? "M(Kpipi)" : "M(Kpi)"));
       hInvMassptDbg->GetYaxis()->SetTitle("p_{t}^{D} (GeV/c)");
       hInvMassptDbg->Sumw2();
-      fmyOutput->Add(hInvMassptDbg);
+      fOutput->Add(hInvMassptDbg);
       
    }
    Double_t pi=TMath::Pi(), philims2[2];
@@ -743,9 +735,9 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
    THnSparseF *hsDphiz=new THnSparseF("hsDphiz","Z and #Delta#phi vs p_{T}^{jet}, p_{T}^{D}, mass. For SB or not and within the jet cone or not", nAxis, nbinsSparse, minSparse, maxSparse);
    hsDphiz->Sumw2();
    
-   fmyOutput->Add(hsDphiz);
+   fOutput->Add(hsDphiz);
 
-   PostData(1, fmyOutput);
+   PostData(1, fOutput);
    
    return kTRUE; 
 }
@@ -762,7 +754,7 @@ void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsRecoJetCorr(AliVPartic
    if(deltaphi>(3*(TMath::Pi()))/2) deltaphi = deltaphi-2*(TMath::Pi());
    Double_t z=Z(candidate,jet);
    
-   TH1F* hDeltaRD=(TH1F*)fmyOutput->FindObject("hDeltaRD");
+   TH1F* hDeltaRD=(TH1F*)fOutput->FindObject("hDeltaRD");
    hDeltaRD->Fill(deltaR); 
    if(fUseReco){
       if(fCandidateType==kD0toKpi) {
@@ -795,8 +787,8 @@ void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsD0JetCorr(AliAODRecoDe
    masses[0]=candidate->InvMass(fNProngs,(UInt_t*)pdgdaughtersD0); //D0
    masses[1]=candidate->InvMass(fNProngs,(UInt_t*)pdgdaughtersD0bar); //D0bar
    
-   TH3F* hPtJetWithD=(TH3F*)fmyOutput->FindObject("hPtJetWithD");
-   THnSparseF* hsDphiz=(THnSparseF*)fmyOutput->FindObject("hsDphiz");
+   TH3F* hPtJetWithD=(TH3F*)fOutput->FindObject("hPtJetWithD");
+   THnSparseF* hsDphiz=(THnSparseF*)fOutput->FindObject("hsDphiz");
    Double_t point[7]={z,dPhi,ptj,ptD,masses[0],0, deltaR<fJetRadius ? 1 : 0};
    Printf("Candidate in FillHistogramsD0JetCorr IsA %s", (candidate->IsA())->GetName());   
    Int_t isselected=fCuts->IsSelected(candidate,AliRDHFCuts::kAll,aodEvent);
@@ -827,11 +819,11 @@ void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsDstarJetCorr(AliAODRec
    //Double_t massD0= dstar->InvMassD0();
    
    
-   TH1F* hPtPion=(TH1F*)fmyOutput->FindObject("hPtPion");
+   TH1F* hPtPion=(TH1F*)fOutput->FindObject("hPtPion");
    hPtPion->Fill(softpi->Pt());
    
-   TH3F* hPtJetWithD=(TH3F*)fmyOutput->FindObject("hPtJetWithD");
-   THnSparseF* hsDphiz=(THnSparseF*)fmyOutput->FindObject("hsDphiz");
+   TH3F* hPtJetWithD=(TH3F*)fOutput->FindObject("hPtJetWithD");
+   THnSparseF* hsDphiz=(THnSparseF*)fOutput->FindObject("hsDphiz");
    Int_t isSB=0;//IsDzeroSideBand(dstar);
    
    Double_t point[7]={z,dPhi,ptj,ptD,deltamass,isSB, deltaR<fJetRadius ? 1 : 0};
@@ -848,8 +840,8 @@ void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsDstarJetCorr(AliAODRec
 void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsMCGenDJetCorr(Double_t dPhi,Double_t z,Double_t ptD,Double_t ptjet,Double_t deltaR){
    
    Double_t pdgmass=0;
-   TH3F* hPtJetWithD=(TH3F*)fmyOutput->FindObject("hPtJetWithD");
-   THnSparseF* hsDphiz=(THnSparseF*)fmyOutput->FindObject("hsDphiz");
+   TH3F* hPtJetWithD=(TH3F*)fOutput->FindObject("hPtJetWithD");
+   THnSparseF* hsDphiz=(THnSparseF*)fOutput->FindObject("hsDphiz");
    Double_t point[7]={z,dPhi,ptjet,ptD,pdgmass,0, deltaR<fJetRadius ? 1 : 0};
 
    if(fCandidateType==kD0toKpi) pdgmass=TDatabasePDG::Instance()->GetParticle(421)->Mass();
@@ -867,7 +859,7 @@ void AliAnalysisTaskFlavourJetCorrelations::FillHistogramsMCGenDJetCorr(Double_t
 void AliAnalysisTaskFlavourJetCorrelations::FillMassHistograms(Double_t mass,Double_t ptD, Double_t deltaR){
    
    if(deltaR<fJetRadius) {
-      TH2F* hInvMassptD=(TH2F*)fmyOutput->FindObject("hInvMassptD");
+      TH2F* hInvMassptD=(TH2F*)fOutput->FindObject("hInvMassptD");
       hInvMassptD->Fill(mass,ptD);
    }
 }
@@ -891,9 +883,9 @@ void AliAnalysisTaskFlavourJetCorrelations::SideBandBackground(AliAODRecoCascade
    //  D* side band background method. Two side bands, in M(Kpi) are taken at ~6 sigmas 
    // (expected detector resolution) on the left and right frm the D0 mass. Each band
    //  has a width of ~5 sigmas. Two band needed  for opening angle considerations   
-   TH2F* hDiffSideBand=(TH2F*)fmyOutput->FindObject("hDiffSideBand");
-   TH3F* hPtJetWithDsb=(TH3F*)fmyOutput->FindObject("hPtJetWithDsb");
-   THnSparseF* hsDphiz=(THnSparseF*)fmyOutput->FindObject("hsDphiz");
+   TH2F* hDiffSideBand=(TH2F*)fOutput->FindObject("hDiffSideBand");
+   TH3F* hPtJetWithDsb=(TH3F*)fOutput->FindObject("hPtJetWithDsb");
+   THnSparseF* hsDphiz=(THnSparseF*)fOutput->FindObject("hsDphiz");
    
    Double_t deltaM=candDstar->DeltaInvMass(); 
    //Printf("Inv mass = %f between %f and %f or %f and %f?",invM, sixSigmal,fourSigmal,fourSigmar,sixSigmar);
@@ -933,8 +925,8 @@ void AliAnalysisTaskFlavourJetCorrelations::MCBackground(AliAODRecoDecayHF *cand
    Double_t ptjet=jet->Pt();
    Double_t deltaR=DeltaR(candbg,jet);
    
-   TH2F* hInvMassptDbg=(TH2F*)fmyOutput->FindObject("hInvMassptDbg");
-   TH3F* hPtJetWithDsb=(TH3F*)fmyOutput->FindObject("hPtJetWithDsb");
+   TH2F* hInvMassptDbg=(TH2F*)fOutput->FindObject("hInvMassptDbg");
+   TH3F* hPtJetWithDsb=(TH3F*)fOutput->FindObject("hPtJetWithDsb");
    
    
    if(fCandidateType==kDstartoKpipi){

diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
index d05ab1a954b47112c0a763deaa0676db51b6f815..4623961973ea8b7d92044aa255a0578dbdee0a28 100644 (file)
--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
+++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
@@ -110,7 +110,6 @@ class AliAnalysisTaskFlavourJetCorrelations : public AliAnalysisTaskEmcalJet
   Int_t  fPDGdaughters[4];       // PDG codes of daughters
   Float_t fSigmaD0[30];          //
   TString fBranchName;           // AOD branch name
-  TList *fmyOutput;                //! user output
   AliRDHFCuts *fCuts;            // Cuts 
 
   Double_t fMinMass;             // mass lower limit histogram
@@ -123,7 +122,7 @@ class AliAnalysisTaskFlavourJetCorrelations : public AliAnalysisTaskEmcalJet
   TClonesArray *fCandidateArray;   //! contains candidates selected by AliRDHFCuts
   TClonesArray *fSideBandArray;    //! contains candidates selected by AliRDHFCuts::IsSelected(kTracks), to be used for side bands (DStar case only!!)
 
-  ClassDef(AliAnalysisTaskFlavourJetCorrelations,2); // class for charm-jet CorrelationsExch
+  ClassDef(AliAnalysisTaskFlavourJetCorrelations,3); // class for charm-jet CorrelationsExch
 };
 
 #endif

diff --git a/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C b/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
index fda7a5f3b1223a42665622448f5e747c253c6e7b..01238e119e1fe55011eb571f1c9dccdf298aeb5c 100644 (file)
--- a/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
+++ b/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
@@ -10,7 +10,9 @@ void *AddTaskDFilterAndCorrelations(
   Float_t R = 0.4,
   Float_t jptcut = 10.,
   const char *cutType = "TPC",
-  Double_t percjetareacut = 1.)
+  Double_t percjetareacut = 1.,
+  AliAnalysisTaskEmcal::TriggerType trType=AliAnalysisTaskEmcal::kND
+)
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -57,9 +59,6 @@ void *AddTaskDFilterAndCorrelations(
   taskFilter->SetMC(theMCon); //D meson settings
   taskFilter->SetUseReco(reco);
   taskFilter->SetName("AliAnalysisTaskSEDmesonsFilterCJ");
-//  taskFilter->SetCaloTriggerPatchInfoName("EmcalTriggers");
-//  taskFilter->SetTriggerTypeSel(AliAnalysisTaskEmcal::kJ1);
-  
   mgr->AddTask(taskFilter);
   
     // create the task
@@ -74,9 +73,11 @@ void *AddTaskDFilterAndCorrelations(
   taskCorr->SetJetAcceptanceType(cutType);
   taskCorr->SetJetPtCut(jptcut);
   taskCorr->SetPercAreaCut(percjetareacut);
-  taskCorr->SetCaloTriggerPatchInfoName("EmcalTriggers");
-  taskCorr->SetTriggerTypeSel(AliAnalysisTaskEmcal::kJ1);
-
+  taskCorr->SetMakeGeneralHistograms(kTRUE);
+  if(theMCon && trType!=AliAnalysisTaskEmcal::kND){
+     taskCorr->SetCaloTriggerPatchInfoName("EmcalTriggers");
+     taskCorr->SetTriggerTypeSel(trType);
+  }
   mgr->AddTask(taskCorr);
 
   if(theMCon) {