A few more fixes, mainly dealing with the track analysis component

diff --git a/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
index d654ace332b8b2d089a9eec1c7c8ac34d407c33d..d862ed3bdef159402099139e234b9eb037ad2c75 100644 (file)
--- a/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliAnalysisTaskPtEMCalTriggerV1.cxx
@@ -81,6 +81,7 @@ void AliAnalysisTaskPtEMCalTriggerV1::UserCreateOutputObjects() {
    * Initialise all analysis components
    */
   AliAnalysisTaskEmcal::UserCreateOutputObjects();
+  SetCaloTriggerPatchInfoName("EmcalTriggers");
 
   AliEMCalTriggerBinningFactory binmaker;
   binmaker.Create(fBinning);

diff --git a/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
index 7059b9ddae8ed7fbd71cd14dfbc92c7eb0314185..274c9d08ae5d01eed90ee5399a1c34ac21b0f632 100644 (file)
--- a/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalPtTaskTrackSelectionESD.cxx
@@ -161,7 +161,15 @@ bool AliEMCalPtTaskTrackSelectionESD::IsTrackAccepted(AliVTrack* const trk) {
    * @return: true if selected, false otherwise
    */
   AliESDtrack *esdt = dynamic_cast<AliESDtrack *>(trk);
-  if(!esdt) return kFALSE;
+  if(!esdt){
+    AliPicoTrack *picoTrack = dynamic_cast<AliPicoTrack *>(trk);
+    if(picoTrack)
+      esdt = dynamic_cast<AliESDtrack*>(picoTrack->GetTrack());
+    else{
+      AliError("Neither Pico nor ESD track\n");
+      return kFALSE;
+    }
+  }
   return fTrackCuts->AcceptTrack(esdt);
 }
 

diff --git a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
index f27271bc8015cf9c5a3a4bcbb4910d7633e75571..3c676ca18fc3dfd0f5a9f8a5780a6bc446c46460 100644 (file)
--- a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerClusterAnalysisComponent.cxx
@@ -25,6 +25,7 @@
 #include <TClonesArray.h>
 #include <TLorentzVector.h>
 
+#include "AliLog.h"
 #include "AliVCluster.h"
 #include "AliVEvent.h"
 
@@ -70,8 +71,8 @@ void AliEMCalTriggerClusterAnalysisComponent::CreateHistos() {
 
   // Create trigger definitions
   std::map<std::string, std::string> triggerCombinations;
-  const char *triggernames[12] = {"MinBias", "EMCJHigh", "EMCJLow", "EMCGHigh",
-      "EMCGLow", "NoEMCal", "EMCHighBoth", "EMCHighGammaOnly", "EMCHighJetOnly",
+  const char *triggernames[11] = {"MinBias", "EMCJHigh", "EMCJLow", "EMCGHigh",
+      "EMCGLow", "EMCHighBoth", "EMCHighGammaOnly", "EMCHighJetOnly",
       "EMCLowBoth", "EMCLowGammaOnly", "EMCLowJetOnly"};
   // Define names and titles for different triggers in the histogram container
   triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[0], "min. bias events"));
@@ -79,13 +80,12 @@ void AliEMCalTriggerClusterAnalysisComponent::CreateHistos() {
   triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[2], "jet-triggered events (low threshold)"));
   triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[3], "gamma-triggered events (high threshold)"));
   triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[4], "gamma-triggered events (low threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[5], "non-EMCal-triggered events"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[6], "jet and gamma triggered events (high threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[7], "exclusively gamma-triggered events (high threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[8], "exclusively jet-triggered events (high threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[9], "jet and gamma triggered events (low threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[10], "exclusively gamma-triggered events (low threshold)"));
-  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[11], "exclusively-triggered events (low threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[5], "jet and gamma triggered events (high threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[6], "exclusively gamma-triggered events (high threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[7], "exclusively jet-triggered events (high threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[8], "jet and gamma triggered events (low threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[9], "exclusively gamma-triggered events (low threshold)"));
+  triggerCombinations.insert(std::pair<std::string,std::string>(triggernames[10], "exclusively-triggered events (low threshold)"));
 
   // Create axis definitions
   const AliEMCalTriggerBinningDimension *ptbinning = fBinning->GetBinning("pt"),
@@ -124,6 +124,8 @@ void AliEMCalTriggerClusterAnalysisComponent::Process(const AliEMCalTriggerEvent
    */
 
   // First loop over uncalibrated clusters
+  AliDebug(1, Form("Number of calibrated clusters: %d", data->GetClusterContainer()->GetEntries()));
+
   AliVCluster *clust(NULL);
   AliVEvent *recEv = data->GetRecEvent();
   std::vector<std::string> triggerNames;
@@ -137,12 +139,14 @@ void AliEMCalTriggerClusterAnalysisComponent::Process(const AliEMCalTriggerEvent
   }
 
   // Loop also over calibrated clusters
+  if(!data->GetClusterContainer())
+    printf("Cluster container not found \n");
   TIter clusterIter(data->GetClusterContainer());
   while((clust = dynamic_cast<AliVCluster *>(clusterIter()))){
     if(!clust->IsEMCAL()) continue;
     if(!fEnergyRange.IsInRange(clust->E())) continue;
     for(std::vector<std::string>::iterator name = triggerNames.begin(); name != triggerNames.end(); ++name)
-      FillHistogram(Form("hClusterUncalibHist%s", name->c_str()), clust, recEv, fTriggerDecision->IsMinBias());
+      FillHistogram(Form("hClusterCalibHist%s", name->c_str()), clust, recEv, fTriggerDecision->IsMinBias());
   }
 }
 

diff --git a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
index d82d425c06d92de8612c60c053f87d345f30e02b..13f8ba5dd55479cbe4447d825b86a73ff5d3ca75 100644 (file)
--- a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerKineCuts.cxx
@@ -39,7 +39,7 @@ bool AliEMCalTriggerKineCuts::IsSelected(const AliVParticle* const track) const
    */
   if(!fPtCut.IsInRange(TMath::Abs(track->Pt()))) return false;
   if(!fEtaCut.IsInRange(track->Eta())) return false;
-  if(!fPhiCut.IsInRange(track->Eta())) return false;
+  if(!fPhiCut.IsInRange(track->Phi())) return false;
   return true;
 }
 

diff --git a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
index 37e39c5bfa46574b4e65b6ee18c933b0ff61c945..71ffe250fb2fe6d2a0235d87dde97a7337e35daf 100644 (file)
--- a/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
+++ b/PWGJE/EMCALJetTasks/Tracks/AliEMCalTriggerRecTrackAnalysisComponent.cxx
@@ -27,6 +27,7 @@
 #include <TMath.h>
 #include <TString.h>
 
+#include "AliLog.h"
 #include "AliMCEvent.h"
 #include "AliVCluster.h"
 #include "AliVEvent.h"
@@ -140,6 +141,7 @@ void AliEMCalTriggerRecTrackAnalysisComponent::Process(const AliEMCalTriggerEven
    *
    * @param data: the event data
    */
+  AliDebug(1, Form("Number of matched tracks: %d", data->GetMatchedTrackContainer()->GetEntries()));
 
   std::vector<std::string> triggernames;
   this->GetMachingTriggerNames(triggernames, fUsePatches);
@@ -152,8 +154,8 @@ void AliEMCalTriggerRecTrackAnalysisComponent::Process(const AliEMCalTriggerEven
     assocMC = NULL;
     if(fKineCuts && !fKineCuts->IsSelected(track)) continue;
     if(fTrackSelection && !fTrackSelection->IsTrackAccepted(track)) continue;
-    if(fRequestMCtrue && data->GetMCEvent() && !(assocMC = IsMCTrueTrack(track, data->GetMCEvent()))) continue;
 
+    if(fRequestMCtrue && data->GetMCEvent() && !(assocMC = IsMCTrueTrack(track, data->GetMCEvent()))) continue;
     // Try to match the cluster
     Bool_t hasCluster = kFALSE;
     AliVCluster *clust(NULL);