updates from Salvatore

diff --git a/PWGGA/EMCALJetTasks/AliJetModelBaseTask.cxx b/PWGGA/EMCALJetTasks/AliJetModelBaseTask.cxx
index bc84c85b6bdd4efbd48e6156b94e01524cfe6012..97e4f519810b9c5a47e94f24bcc3cdbf350fcdea 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliJetModelBaseTask.cxx
+++ b/PWGGA/EMCALJetTasks/AliJetModelBaseTask.cxx
@@ -7,7 +7,7 @@
 #include "AliJetModelBaseTask.h"
 
 #include <TClonesArray.h>
-#include <TF1.h>
+#include <TH1.h>
 #include <TLorentzVector.h>
 #include <TRandom3.h>
 

diff --git a/PWGGA/EMCALJetTasks/AliJetModelBaseTask.h b/PWGGA/EMCALJetTasks/AliJetModelBaseTask.h
index f55377c8125b3649099678ee8a99177995ee5e99..c2316e1af772eb72f4e0a50a766320c7d729fd10 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliJetModelBaseTask.h
+++ b/PWGGA/EMCALJetTasks/AliJetModelBaseTask.h
@@ -7,7 +7,9 @@ class TClonesArray;
 class AliEMCALGeometry;
 class AliVCluster;
 class AliPicoTrack;
-class TF1;
+
+#include <TH1F.h>
+#include <TF1.h>
 
 #include "AliAnalysisTaskSE.h"
 
@@ -28,7 +30,9 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   void                   SetNTracks(Int_t n)                   { fNTracks      = n;    }
   void                   SetPhiRange(Float_t min, Float_t max) { fPhiMin       = min;  fPhiMax = max; }
   void                   SetPtRange(Float_t min, Float_t max)  { fPtMin        = min;  fPtMax  = max;  }
-  void                   SetPtSpectrum(TF1 *f)                 { fPtSpectrum   = f;    }
+  void                   SetPtSpectrum(TH1 *f)                 { fPtSpectrum   = f;    }
+  void                   SetPtSpectrum(TF1 *f)                 { fPtSpectrum   = new TH1F("ptSpectrum","ptSpectrum",250,f->GetXmin(),f->GetXmax()); 
+                                                                 fPtSpectrum->Add(f); }
   void                   SetSuffix(const char *s)              { fSuffix       = s;    }
   void                   SetTracksName(const char *n)          { fTracksName   = n;    }
 
@@ -61,7 +65,7 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   Int_t                  fNClusters;              // how many clusters are being processed
   Int_t                  fNTracks;                // how many tracks are being processed
   Bool_t                 fMarkMC;                 // whether or not mark new tracks/cluster as MC
-  TF1                   *fPtSpectrum;             // pt spectrum parametrization to extract random pt values
+  TH1                   *fPtSpectrum;             // pt spectrum parametrization to extract random pt values
   Bool_t                 fIsInit;                 //=true if initialized
   AliEMCALGeometry      *fGeom;                   //!pointer to EMCal geometry
   TClonesArray          *fClusters;               //!cluster collection
@@ -73,6 +77,6 @@ class AliJetModelBaseTask : public AliAnalysisTaskSE {
   AliJetModelBaseTask(const AliJetModelBaseTask&);            // not implemented
   AliJetModelBaseTask &operator=(const AliJetModelBaseTask&); // not implemented
 
-  ClassDef(AliJetModelBaseTask, 3) // Jet modelling task
+  ClassDef(AliJetModelBaseTask, 4) // Jet modelling task
 };
 #endif

diff --git a/PWGGA/EMCALJetTasks/AliJetResponseMaker.cxx b/PWGGA/EMCALJetTasks/AliJetResponseMaker.cxx
index 34625d855d9bc43611b26085ce7fe777e2f34954..9fb3d824dad75a256cf133f58c7c76a43ef07faf 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliJetResponseMaker.cxx
+++ b/PWGGA/EMCALJetTasks/AliJetResponseMaker.cxx
@@ -48,6 +48,8 @@ AliJetResponseMaker::AliJetResponseMaker() :
   fHistEvents(0),
   fHistMCJetPhiEta(0),
   fHistMCJetsPt(0),
+  fHistMCJetPhiEtaFiducial(0),
+  fHistMCJetsPtFiducial(0),
   fHistMCJetsNEFvsPt(0),
   fHistMCJetsZvsPt(0),
   fHistJetPhiEta(0),
@@ -90,6 +92,8 @@ AliJetResponseMaker::AliJetResponseMaker(const char *name) :
   fHistEvents(0),
   fHistMCJetPhiEta(0),
   fHistMCJetsPt(0),
+  fHistMCJetPhiEtaFiducial(0),
+  fHistMCJetsPtFiducial(0),
   fHistMCJetsNEFvsPt(0),
   fHistMCJetsZvsPt(0),
   fHistJetPhiEta(0),
@@ -253,6 +257,8 @@ Bool_t AliJetResponseMaker::AcceptJet(AliEmcalJet *jet, Bool_t /*bias*/, Bool_t
     return kFALSE;
   if (jet->Area() <= fJetAreaCut)
     return kFALSE;
+
+  return kTRUE;
 }
 
 //________________________________________________________________________

diff --git a/PWGGA/EMCALJetTasks/AliJetResponseMaker.h b/PWGGA/EMCALJetTasks/AliJetResponseMaker.h
index 6a3edc506a02f7ff1fb9a439e240ab384497c054..cd015fa02d29120188fe5249ab98abef9ca7afe6 100644 (file)
--- a/PWGGA/EMCALJetTasks/AliJetResponseMaker.h
+++ b/PWGGA/EMCALJetTasks/AliJetResponseMaker.h
@@ -80,6 +80,6 @@ class AliJetResponseMaker : public AliAnalysisTaskEmcalJet {
   AliJetResponseMaker(const AliJetResponseMaker&);            // not implemented
   AliJetResponseMaker &operator=(const AliJetResponseMaker&); // not implemented
 
-  ClassDef(AliJetResponseMaker, 4) // Jet response matrix producing task
+  ClassDef(AliJetResponseMaker, 5) // Jet response matrix producing task
 };
 #endif