changes from Salvatore

diff --git a/PWGGA/EMCALJetTasks/AliEmcalJetTask.cxx b/PWGGA/EMCALJetTasks/AliEmcalJetTask.cxx
index f3f5ddb942a941fadcbecfb7c7e85c8c88739197..e6a362f6e61b041d079767109186c1657dc6a562 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliEmcalJetTask.cxx
+++ b/PWGGA/EMCALJetTasks/AliEmcalJetTask.cxx
@@ -152,9 +152,9 @@ void AliEmcalJetTask::FindJets()
       AliVParticle *t = static_cast<AliVParticle*>(fTracks->At(iTracks));
       if (!t)
         continue;
-      if (fType == 1 && t->Charge() == 0)
+      if (fIsMcPart && fType == 1 && t->Charge() == 0)
        continue;
-      if (fType == 2 && t->Charge() != 0)
+      if (fIsMcPart && fType == 2 && t->Charge() != 0)
        continue;
       if (t->Pt() < fMinJetTrackPt) 
         continue;

diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
index 6bac8c3e05dd7941a523af92c2b21c880f92160e..c635b8921d9a2e4a7555f23e467545fc95c84cf3 100644 (file)
--- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
+++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
@@ -282,7 +282,7 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
 
     histname = "fHistJetsPtArea_";
     histname += i;
-    fHistJetsPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt, 100, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
+    fHistJetsPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins, fMinBinPt, fMaxBinPt, 40, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
     fHistJetsPtArea[i]->GetXaxis()->SetTitle("p_{T}^{raw} [GeV/c]");
     fHistJetsPtArea[i]->GetYaxis()->SetTitle("area");
     fOutput->Add(fHistJetsPtArea[i]);
@@ -383,7 +383,7 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
 
     histname = "fHistJetsCorrPtArea_";
     histname += i;
-    fHistJetsCorrPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2, -fMaxBinPt, fMaxBinPt, 100, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
+    fHistJetsCorrPtArea[i] = new TH2F(histname.Data(), histname.Data(), fNbins * 2, -fMaxBinPt, fMaxBinPt, 40, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
     fHistJetsCorrPtArea[i]->GetXaxis()->SetTitle("p_{T}^{corr} [GeV/c]");
     fHistJetsCorrPtArea[i]->GetYaxis()->SetTitle("area");
     fOutput->Add(fHistJetsCorrPtArea[i]);
@@ -468,7 +468,7 @@ void AliAnalysisTaskSAJF::UserCreateOutputObjects()
 
       histname = "fHistEmbJetsArea_";
       histname += i;
-      fHistEmbJetsArea[i] = new TH1F(histname.Data(), histname.Data(), 100, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
+      fHistEmbJetsArea[i] = new TH1F(histname.Data(), histname.Data(), 40, 0, fJetRadius * fJetRadius * TMath::Pi() * 3);
       fHistEmbJetsArea[i]->GetXaxis()->SetTitle("area");
       fHistEmbJetsArea[i]->GetYaxis()->SetTitle("counts");
       fOutput->Add(fHistEmbJetsArea[i]);

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEMCALTender.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALTender.C
index 2849dc052d1b3a2679feedbdf46a6cc54b12ccf0..8b79da5116f16880d001669d8167fa793554066f 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEMCALTender.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEMCALTender.C
@@ -26,11 +26,6 @@ AliAnalysisTaskSE *AddTaskEMCALTender()
     AliTender* alitender = new  AliTender("AliTender");
     alitender->AddSupply(EMCALSupply);
     ana = alitender;
-
-    AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tender_event", 
-                                                              AliESDEvent::Class(), 
-                                                              AliAnalysisManager::kExchangeContainer, 
-                                                              "default_tender");
   }
   else if (evhand->InheritsFrom("AliAODInputHandler")) {
     EMCALSupply = ConfigEmcalTenderSupply(kFALSE);
@@ -38,11 +33,6 @@ AliAnalysisTaskSE *AddTaskEMCALTender()
     AliEmcalTenderTask* emcaltender = new  AliEmcalTenderTask("AliEmcalTenderTask");
     emcaltender->SetEMCALTenderSupply(EMCALSupply);
     ana = emcaltender;
-
-    AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("tender_event", 
-                                                              AliAODEvent::Class(), 
-                                                              AliAnalysisManager::kExchangeContainer, 
-                                                              "default_tender");
   }
   else {
     ::Error("AddTaskEMCALTender", "Input event handler not recognized, AOD/ESD expected. Returning...");
@@ -56,6 +46,11 @@ AliAnalysisTaskSE *AddTaskEMCALTender()
   //==============================================================================
 
   mgr->ConnectInput  (ana, 0, mgr->GetCommonInputContainer());
+
+  AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("emcal_tender_event", 
+                                                           AliAODEvent::Class(), 
+                                                           AliAnalysisManager::kExchangeContainer, 
+                                                           "default_tender");
   mgr->ConnectOutput (ana, 1, coutput1 );
    
   return ana;