- Reduce number of bins in order to decrease memory consumption

- Apply cut on the z-position of the vertex in the code

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
index 3f6a6763b225ada03d7500d3338b58a0fb17c8e0..dca3827c7c2440fc52218aed4760f670c3023e77 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
@@ -94,6 +94,7 @@ namespace EMCalTriggerPtAnalysis {
     fEtaRange.SetLimits(-0.8, 0.8);
     fPtRange.SetLimits(0.15, 100.);
     fEnergyRange.SetLimits(0., 1000.);
+    fVertexRange.SetLimits(-10., 10.);
     SetMakeGeneralHistograms(kTRUE);
   }
 
@@ -296,6 +297,7 @@ namespace EMCalTriggerPtAnalysis {
     const AliVVertex *vtxTracks = fInputEvent->GetPrimaryVertex(),
         *vtxSPD = GetSPDVertex();
     if(!(vtxTracks && vtxSPD)) return false;
+    if(!fVertexRange.IsInRange(vtxTracks->GetZ())) return false;
     if(vtxTracks->GetNContributors() < 1 || vtxSPD->GetNContributors() < 1) return false;
 
     double triggers[5]; memset(triggers, 0, sizeof(double) * 5);
@@ -484,12 +486,12 @@ namespace EMCalTriggerPtAnalysis {
     definitions.insert(std::pair<double,double>(15., 0.5));
     definitions.insert(std::pair<double,double>(25., 1.));
     definitions.insert(std::pair<double,double>(40., 2.5));
-    definitions.insert(std::pair<double,double>(60., 5.));
-    definitions.insert(std::pair<double,double>(100., 5.));
+    definitions.insert(std::pair<double,double>(50., 5.));
+    definitions.insert(std::pair<double,double>(100., 10.));
     double currentval = 0;
     for(std::map<double,double>::iterator id = definitions.begin(); id != definitions.end(); ++id){
       double limit = id->first, binwidth = id->second;
-      while(currentval <= limit){
+      while(currentval < limit){
         currentval += binwidth;
         mybinning.push_back(currentval);
       }
@@ -508,10 +510,10 @@ namespace EMCalTriggerPtAnalysis {
      * @param binning: Array where to store the results.
      */
     std::vector<double> mybinning;
-    double currentval = -40;
+    double currentval = -10;
     mybinning.push_back(currentval);
-    while(currentval <= 40.){
-      currentval += 1.;
+    while(currentval <= 10.){
+      currentval += 5.;
       mybinning.push_back(currentval);
     }
     binning.Set(mybinning.size());

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
index 0a705eebcd96359e80f06f95810d5c4d928ed697..5a619a5461e777c1a21e5624bd1e1e4e10fd5e5d 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
@@ -39,6 +39,7 @@ public:
   void AddCutsForAOD(AliESDtrackCuts *trackCuts, UInt_t filterBits);
   void SetEtaRange(double etamin, double etamax) { fEtaRange.SetLimits(etamin, etamax); }
   void SetPtRange(double ptmin, double ptmax) { fPtRange.SetLimits(ptmin, ptmax); }
+  void SetVertexRange(double vmin, double vmax) { fVertexRange.SetLimits(vmin, vmax); }
   void SetClusterEnergyRange(double emin, double emax) { fEnergyRange.SetLimits(emin,emax); }
   void SetSwapEta() { fSwapEta = kTRUE; }
   void UseTriggersFromTriggerMaker() { fUseTriggersFromTriggerMaker = kTRUE; }
@@ -60,12 +61,13 @@ private:
   const AliVVertex *GetSPDVertex() const;
 
   AliEMCalHistoContainer        *fHistos;               //! Histogram container for the task
-  TList                                                  *fListTrackCuts;                // List of track cuts
+  TList                                                            *fListTrackCuts;                // List of track cuts
 
   // Cuts
-  AliCutValueRange<double>      fEtaRange;              // Eta Selection Range
-  AliCutValueRange<double>       fPtRange;                               // Pt Selection Range
-  AliCutValueRange<double>    fEnergyRange;     // Cluster energy selection range
+  AliCutValueRange<double>      fEtaRange;        // Eta Selection Range
+  AliCutValueRange<double>         fPtRange;                             // Pt Selection Range
+  AliCutValueRange<double>      fEnergyRange;     // Cluster energy selection range
+  AliCutValueRange<double>      fVertexRange;     // Vertex cut
   Bool_t                                                 fSwapEta;                               // Allow swapping of the eta sign in asymmetric collision systems
   Bool_t                                                 fUseTriggersFromTriggerMaker; // Use trigger classes from trigger maker