More getters and minor fixes (Marta)

diff --git a/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx b/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
index aaebecc948d3c1a0fcafb0535d797339dbaca0a4..cc237595e88fa0e32f0069b335ee609cccc006f3 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
+++ b/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
@@ -598,7 +598,11 @@ Bool_t AliAnalysisTaskEmcalDev::RetrieveEventObjects()
       }
       else {
        Double_t centWidth = (fMaxCent-fMinCent)/(Double_t)fNcentBins;
-       fCentBin = TMath::Nint(fCent/centWidth);
+       fCentBin = TMath::FloorNint(fCent/centWidth);
+       if(fCentBin>=fNcentBins) {
+         AliWarning(Form("%s: fCentBin too large: cent = %f fCentBin = %d. Assuming 99", GetName(),fCent,fCentBin));
+         fCentBin = fNcentBins-1;
+       }
        if(fCentBin>=fNcentBins) {
          AliWarning(Form("%s: fCentBin too large: cent = %f fCentBin = %d. Assuming 99", GetName(),fCent,fCentBin));
          fCentBin = fNcentBins-1;

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
index 754170270958163ae4c7665ac24e5b01332ba267..7c59b1e1e9c605a1534cead13c89ff2c95aa374b 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.cxx
@@ -474,6 +474,22 @@ TClonesArray* AliAnalysisTaskEmcalJetDev::GetJetArray(Int_t i) const {
 
 }
 
+//________________________________________________________________________
+AliEmcalJet* AliAnalysisTaskEmcalJetDev::GetJetFromArray(Int_t j, Int_t c) const {
+  // Get jet j if accepted from  container c
+  // If jet not accepted return 0
+
+  AliJetContainer *cont = GetJetContainer(c);
+  if(!cont) {
+    AliError(Form("%s:Container %d not found",GetName(),c));
+    return 0;
+  }
+  AliEmcalJet *jet = cont->GetJet(j);
+
+  return jet;
+  
+}
+
 //________________________________________________________________________
 AliEmcalJet* AliAnalysisTaskEmcalJetDev::GetAcceptJetFromArray(Int_t j, Int_t c) const {
   // Get jet j if accepted from  container c

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
index 26b61a5e8d6cf5cdb14518d9cad807c548e57e8a..b04eaea61e1f69778c9c640b17978704c6f9a7b7 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskEmcalJetDev.h
@@ -44,6 +44,7 @@ class AliAnalysisTaskEmcalJetDev : public AliAnalysisTaskEmcalDev {
 
   AliJetContainer            *GetJetContainer(Int_t i)                const;
   TClonesArray               *GetJetArray(Int_t i)                    const;
+  AliEmcalJet                *GetJetFromArray(Int_t j, Int_t c)       const;
   AliEmcalJet                *GetAcceptJetFromArray(Int_t j, Int_t c) const;
   Int_t                       GetNJets(Int_t i)                       const;
   Double_t                    GetRhoVal(Int_t i)                      const;

diff --git a/PWGJE/EMCALJetTasks/AliJetContainer.h b/PWGJE/EMCALJetTasks/AliJetContainer.h
index f0232f54595bec617f051b996b69e5cef0ff8b3b..a7bafb6750dfc8343e0ce9bba5dd934d2ac723d8 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetContainer.h
+++ b/PWGJE/EMCALJetTasks/AliJetContainer.h
@@ -33,7 +33,7 @@ class AliJetContainer : public AliEmcalContainer {
   enum JetAcceptanceType {
     kTPC       = 0,     // TPC acceptance
     kEMCAL     = 1,     // EMCal acceptance
-    kUser      = 2,     // User defined acceptance
+    kUser      = 2      // User defined acceptance
   };
 
 
@@ -83,6 +83,10 @@ class AliJetContainer : public AliEmcalContainer {
   const TString&              GetRhoName()                          const    {return fRhoName;}
   Double_t                    GetJetPtCorr(Int_t i)                 const;
   Float_t                     GetJetRadius()                        const    {return fJetRadius;}
+  Float_t                     GetJetEtaMin()                        const    {return fJetMinEta;}
+  Float_t                     GetJetEtaMax()                        const    {return fJetMaxEta;}
+  Float_t                     GetJetPhiMin()                        const    {return fJetMinPhi;}
+  Float_t                     GetJetPhiMax()                        const    {return fJetMaxPhi;}
 
  protected:
   JetAcceptanceType           fJetAcceptanceType;    //  acceptance type