setter to assume pion mass for clusters

diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
index 84d77ed726f29587e9b3dc2195e4229a5143c746..afc5f8afaad70a30db66145b112b9082426e66e7 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
@@ -68,6 +68,7 @@ AliEmcalJetTask::AliEmcalJetTask() :
   fIsEmcPart(0),
   fLegacyMode(kFALSE),
   fCodeDebug(kFALSE),
+  fPionMassClusters(kFALSE),
   fDoGenericSubtractionJetMass(kFALSE),
   fDoGenericSubtractionGR(kFALSE),
   fDoGenericSubtractionExtraJetShapes(kFALSE),
@@ -128,6 +129,7 @@ AliEmcalJetTask::AliEmcalJetTask(const char *name) :
   fIsEmcPart(0),
   fLegacyMode(kFALSE),
   fCodeDebug(kFALSE),
+  fPionMassClusters(kFALSE),
   fDoGenericSubtractionJetMass(kFALSE),
   fDoGenericSubtractionGR(kFALSE),
   fDoGenericSubtractionExtraJetShapes(kFALSE),
@@ -391,7 +393,10 @@ void AliEmcalJetTask::FindJets()
        continue;
       // offset of 100 to skip ghost particles uid = -1
       AliDebug(2,Form("Cluster %d accepted (label = %d)", iClus, c->GetLabel()));
-      fjw.AddInputVector(cPx, cPy, cPz, TMath::Sqrt(cPx*cPx+cPy*cPy+cPz*cPz), -iClus - 100);
+      Double_t e = TMath::Sqrt(cPx*cPx+cPy*cPy+cPz*cPz);
+      if(fPionMassClusters) e = TMath::Sqrt(cPx*cPx+cPy*cPy+cPz*cPz + 0.13957*0.13957); //MV: dirty, need better solution
+      fjw.AddInputVector(cPx, cPy, cPz, e, -iClus - 100);
+      //      fjw.AddInputVector(cPx, cPy, cPz, TMath::Sqrt(cPx*cPx+cPy*cPy+cPz*cPz), -iClus - 100);
     }
   }
 

diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.h b/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
index de1aa40a14ea3f76ce86da0ef4bb0edd46ed22d4..c1fd2a6a03a33bd35504489405ed34ca61db439d 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
+++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.h
@@ -91,6 +91,7 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
 
   void                   SetCodeDebug(Bool_t val)               { fCodeDebug    = val          ; }
   void                   SetForceIsMcPart(Bool_t b)             { fIsMcPart     = b            ; }
+  void                   SetPionMassForClusters(Bool_t b)       { fPionMassClusters = b        ; }
 
   void                   SetRhoName(const char *n)              { fRhoName      = n            ; }
   void                   SetRhomName(const char *n)             { fRhomName     = n            ; }
@@ -171,6 +172,7 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
   Bool_t                 fIsEmcPart;              //!=true if emcal particles are given as input (for clusters)
   Bool_t                 fLegacyMode;             //! if true, enable FJ 2.x behavior
   Bool_t                 fCodeDebug;              // use nontested code changes 
+  Bool_t                 fPionMassClusters;       //!assume pion mass for clusters
 
   Bool_t                 fDoGenericSubtractionJetMass;        // calculate generic subtraction
   Bool_t                 fDoGenericSubtractionGR;             // calculate generic subtraction for angular structure function GR
@@ -198,6 +200,6 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
   AliEmcalJetTask(const AliEmcalJetTask&);            // not implemented
   AliEmcalJetTask &operator=(const AliEmcalJetTask&); // not implemented
 
-  ClassDef(AliEmcalJetTask, 15) // Jet producing task
+  ClassDef(AliEmcalJetTask, 16) // Jet producing task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.cxx
index 161790a163e7c48df0c5cb76a22574693a608f04..85fec7cd2fa4d816915e6d595a11f03b5a8a4b5d 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.cxx
@@ -23,6 +23,7 @@ AliAnalysisTaskRhoMass::AliAnalysisTaskRhoMass() :
   AliAnalysisTaskRhoMassBase("AliAnalysisTaskRhoMass"),
   fNExclLeadJets(0),
   fJetRhoMassType(kMd),
+  fPionMassClusters(kFALSE),
   fHistMdAreavsCent(0)
 {
   // Constructor.
@@ -33,6 +34,7 @@ AliAnalysisTaskRhoMass::AliAnalysisTaskRhoMass(const char *name, Bool_t histo) :
   AliAnalysisTaskRhoMassBase(name, histo),
   fNExclLeadJets(0),
   fJetRhoMassType(kMd),
+  fPionMassClusters(kFALSE),
   fHistMdAreavsCent(0)
 {
   // Constructor.
@@ -214,8 +216,9 @@ Double_t AliAnalysisTaskRhoMass::GetMd(AliEmcalJet *jet) {
       if(!vp) continue;
       TLorentzVector nPart;
       vp->GetMomentum(nPart, fVertex);
-      
-      if(fJetRhoMassType==kMd) sum += TMath::Sqrt(nPart.M()*nPart.M() + nPart.Pt()*nPart.Pt()) - nPart.Pt();
+      Double_t m = 0.;
+      if(fPionMassClusters) m = 0.13957;
+      if(fJetRhoMassType==kMd) sum += TMath::Sqrt(m*m + nPart.Pt()*nPart.Pt()) - nPart.Pt();
       else if(fJetRhoMassType==kMdP) sum += TMath::Sqrt(nPart.M()*nPart.M() + nPart.P()*nPart.P()) - nPart.P();
       else if(fJetRhoMassType==kMd4) {
        px+=nPart.Px();

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.h
index 8db4a1336932aa71db669b1edd89ae642126142d..7be61eba676c08948e1ea6c1114751fb69db57ef 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskRhoMass.h
@@ -22,6 +22,7 @@ class AliAnalysisTaskRhoMass : public AliAnalysisTaskRhoMassBase {
 
   void             SetExcludeLeadJets(UInt_t n)     { fNExclLeadJets  = n   ; }
   void             SetRhoMassType(JetRhoMassType t) { fJetRhoMassType = t   ; }
+  void             SetPionMassForClusters(Bool_t b) { fPionMassClusters = b ; }
 
  protected:
   Bool_t           Run();
@@ -32,12 +33,13 @@ class AliAnalysisTaskRhoMass : public AliAnalysisTaskRhoMassBase {
 
   UInt_t           fNExclLeadJets;                 // number of leading jets to be excluded from the median calculation
   JetRhoMassType   fJetRhoMassType;                // method for rho_m calculation
+  Bool_t           fPionMassClusters;              //!assume pion mass for clusters
 
   TH2F            *fHistMdAreavsCent;              //! Md/Area vs cent for all kt clusters
 
   AliAnalysisTaskRhoMass(const AliAnalysisTaskRhoMass&);             // not implemented
   AliAnalysisTaskRhoMass& operator=(const AliAnalysisTaskRhoMass&);  // not implemented
   
-  ClassDef(AliAnalysisTaskRhoMass, 1); // Rho_m task
+  ClassDef(AliAnalysisTaskRhoMass, 2); // Rho_m task
 };
 #endif