store distance to leading Pb-Pb jet

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
index bae29fe2e5f82cbfc2652550e4703742da1d4c32..313ec1b845e32bf329107ee3b349aede34cc0dd7 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.cxx
@@ -41,6 +41,7 @@ AliAnalysisTaskJetShapeConst::AliAnalysisTaskJetShapeConst() :
   AliAnalysisTaskEmcalJet("AliAnalysisTaskJetShapeConst", kTRUE),
   fContainerBase(0),
   fContainerSub(1),
+  fContainerNoEmb(2),
   fMinFractionShared(0),
   fSingleTrackEmb(kFALSE),
   fCreateTree(kFALSE),
@@ -95,6 +96,7 @@ AliAnalysisTaskJetShapeConst::AliAnalysisTaskJetShapeConst(const char *name) :
   AliAnalysisTaskEmcalJet(name, kTRUE),  
   fContainerBase(0),
   fContainerSub(1),
+  fContainerNoEmb(2),
   fMinFractionShared(0),
   fSingleTrackEmb(kFALSE),
   fCreateTree(kFALSE),
@@ -168,15 +170,19 @@ void AliAnalysisTaskJetShapeConst::UserCreateOutputObjects()
   const Double_t minM = -20.;
   const Double_t maxM = 80.;
 
-  const Int_t nBinsMT  = 50;
-  const Double_t minMT = 0.;
-  const Double_t maxMT = 50.;
+  // const Int_t nBinsMT  = 50;
+  // const Double_t minMT = 0.;
+  // const Double_t maxMT = 50.;
+
+  const Int_t nBinsDRToLJ  = 20; //distance to leading jet in Pb-Pb only event
+  const Double_t minDRToLJ = 0.;
+  const Double_t maxDRToLJ = 1.;
 
   //Binning for THnSparse
   const Int_t nBinsSparse0 = 5;
-  const Int_t nBins0[nBinsSparse0] = {nBinsM,nBinsM,nBinsPt,nBinsPt,nBinsMT};
-  const Double_t xmin0[nBinsSparse0]  = { minM, minM, minPt, minPt, minMT};
-  const Double_t xmax0[nBinsSparse0]  = { maxM, maxM, maxPt, maxPt, maxMT};
+  const Int_t nBins0[nBinsSparse0] = {nBinsM,nBinsM,nBinsPt,nBinsPt,nBinsDRToLJ};
+  const Double_t xmin0[nBinsSparse0]  = { minM, minM, minPt, minPt, minDRToLJ};
+  const Double_t xmax0[nBinsSparse0]  = { maxM, maxM, maxPt, maxPt, maxDRToLJ};
 
   TString histName = "";
   TString histTitle = "";
@@ -268,20 +274,26 @@ Bool_t AliAnalysisTaskJetShapeConst::FillHistograms()
 
   AliEmcalJet* jet1  = NULL; //AA jet
   AliEmcalJet *jet2  = NULL; //Embedded Pythia jet
-  AliEmcalJet *jet1T = NULL; //tagged AA jet
+  //  AliEmcalJet *jet1T = NULL; //tagged AA jet
   //  AliEmcalJet *jet2T = NULL; //tagged Pythia jet
   AliEmcalJet *jetS = NULL;  //subtracted jet
   AliJetContainer *jetCont = GetJetContainer(fContainerBase);
   AliJetContainer *jetContS = GetJetContainer(fContainerSub);
+
+  //Get leading jet in Pb-Pb event without embedded objects
+  AliJetContainer *jetContNoEmb = GetJetContainer(fContainerNoEmb);
+  AliEmcalJet *jetL = NULL;
+  if(jetContNoEmb) jetL = jetContNoEmb->GetLeadingJet("rho");
+
   AliDebug(11,Form("NJets  Incl: %d  Csub: %d",jetCont->GetNJets(),jetContS->GetNJets()));
   if(jetCont) {
     jetCont->ResetCurrentID();
     while((jet1 = jetCont->GetNextAcceptJet())) {
       jet2  = NULL;
-      jet1T = NULL;
+      //      jet1T = NULL;
       //   jet2T = NULL;
       jetS  = NULL;
-      if(jet1->GetTagStatus()>0) jet1T = jet1->GetTaggedJet();
+      //      if(jet1->GetTagStatus()>0) jet1T = jet1->GetTaggedJet();
  
       //Get constituent subtacted version of jet
       Int_t ifound = 0;
@@ -334,9 +346,11 @@ Bool_t AliAnalysisTaskJetShapeConst::FillHistograms()
          fh2MTruePtTrue[fCentBin]->Fill(jet2->M(),jet2->Pt());
          fh2PtTrueDeltaM[fCentBin]->Fill(jet2->Pt(),jetS->M()-jet2->M());
          if(jet2->M()>0.) fh2PtTrueDeltaMRel[fCentBin]->Fill(jet2->Pt(),(jetS->M()-jet2->M())/jet2->M());
-         Double_t mJet1Tagged = -1.;
-         if(jet1T) mJet1Tagged = jet1T->M();
-         Double_t var[5] = {jetS->M(),jet2->M(),jet1->Pt()-jetCont->GetRhoVal()*jet1->Area(),jet2->Pt(),mJet1Tagged};
+         //      Double_t mJet1Tagged = -1.;
+         //      if(jet1T) mJet1Tagged = jet1T->M();
+         Double_t drToLJ = 0.;
+         if(jetL) drToLJ = jet1->DeltaR(jetL);
+         Double_t var[5] = {jetS->M(),jet2->M(),jet1->Pt()-jetCont->GetRhoVal()*jet1->Area(),jet2->Pt(),drToLJ};
          fhnMassResponse[fCentBin]->Fill(var);
        }
       }

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.h
index 4891bb0b6704ffc1c682526e142fc21b1fd0a58c..4ccad622313f6eaa6814e2079cd24cd384794638 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeConst.h
@@ -16,10 +16,10 @@ class AliAnalysisManager;
 class AliVParticle;
 class AliJetContainer;
 
-namespace fastjet {
-  class PseudoJet;
-  class GenericSubtractor;
-}
+/* namespace fastjet { */
+/*   class PseudoJet; */
+/*   class GenericSubtractor; */
+/* } */
 
 #include "AliAnalysisTaskEmcalJet.h"
 
@@ -38,6 +38,7 @@ class AliAnalysisTaskJetShapeConst : public AliAnalysisTaskEmcalJet {
 
   void SetJetContainerBase(Int_t c)                             { fContainerBase     = c   ; }
   void SetJetContainerSub(Int_t c)                              { fContainerSub      = c   ; }
+  void SetJetContainerNoEmb(Int_t c)                            { fContainerNoEmb    = c   ; }
   void SetMinFractionShared(Double_t f)                         { fMinFractionShared = f   ; }
   void SetSingleTrackEmbedding(Bool_t b)                        { fSingleTrackEmb    = b   ; }
 
@@ -50,6 +51,7 @@ class AliAnalysisTaskJetShapeConst : public AliAnalysisTaskEmcalJet {
 
   Int_t                               fContainerBase;              // jets to be analyzed
   Int_t                               fContainerSub;               // subtracted jets to be analyzed
+  Int_t                               fContainerNoEmb;             // subtracted jets from Pb-Pb only events
   Double_t                            fMinFractionShared;          // only fill histos for jets if shared fraction larger than X
   Bool_t                              fSingleTrackEmb;             // single track embedding
   Bool_t                              fCreateTree;                 // create output tree
@@ -79,7 +81,7 @@ class AliAnalysisTaskJetShapeConst : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskJetShapeConst(const AliAnalysisTaskJetShapeConst&);            // not implemented
   AliAnalysisTaskJetShapeConst &operator=(const AliAnalysisTaskJetShapeConst&); // not implemented
 
-  ClassDef(AliAnalysisTaskJetShapeConst, 1)
+  ClassDef(AliAnalysisTaskJetShapeConst, 2)
 };
 #endif
 

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
index aa9b0969f2ccf24e30cd9a38cd1f95548e0df88d..32e3e199064066d0aba56063599d50533718e0b6 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.cxx
@@ -40,6 +40,7 @@ ClassImp(AliAnalysisTaskJetShapeDeriv)
 AliAnalysisTaskJetShapeDeriv::AliAnalysisTaskJetShapeDeriv() : 
   AliAnalysisTaskEmcalJet("AliAnalysisTaskJetShapeDeriv", kTRUE),
   fContainerBase(0),
+  fContainerNoEmb(1),
   fMinFractionShared(0),
   fSingleTrackEmb(kFALSE),
   fCreateTree(kFALSE),
@@ -120,6 +121,7 @@ AliAnalysisTaskJetShapeDeriv::AliAnalysisTaskJetShapeDeriv() :
 AliAnalysisTaskJetShapeDeriv::AliAnalysisTaskJetShapeDeriv(const char *name) : 
   AliAnalysisTaskEmcalJet(name, kTRUE),  
   fContainerBase(0),
+  fContainerNoEmb(1),
   fMinFractionShared(0),
   fSingleTrackEmb(kFALSE),
   fCreateTree(kFALSE),
@@ -220,9 +222,13 @@ void AliAnalysisTaskJetShapeDeriv::UserCreateOutputObjects()
   const Double_t minM = -20.;
   const Double_t maxM = 80.;
 
-  const Int_t nBinsMT  = 50;
-  const Double_t minMT = 0.;
-  const Double_t maxMT = 50.;
+  // const Int_t nBinsMT  = 50;
+  // const Double_t minMT = 0.;
+  // const Double_t maxMT = 50.;
+
+  const Int_t nBinsDRToLJ  = 20; //distance to leading jet in Pb-Pb only event
+  const Double_t minDRToLJ = 0.;
+  const Double_t maxDRToLJ = 1.;
 
   const Int_t nBinsV1  = 60;
   const Double_t minV1 = -60.;
@@ -234,9 +240,9 @@ void AliAnalysisTaskJetShapeDeriv::UserCreateOutputObjects()
 
   //Binning for THnSparse
   const Int_t nBinsSparse0 = 5;
-  const Int_t nBins0[nBinsSparse0] = {nBinsM,nBinsM,nBinsPt,nBinsPt,nBinsMT};
-  const Double_t xmin0[nBinsSparse0]  = { minM, minM, minPt, minPt, minMT};
-  const Double_t xmax0[nBinsSparse0]  = { maxM, maxM, maxPt, maxPt, maxMT};
+  const Int_t nBins0[nBinsSparse0] = {nBinsM,nBinsM,nBinsPt,nBinsPt,nBinsDRToLJ};
+  const Double_t xmin0[nBinsSparse0]  = { minM, minM, minPt, minPt, minDRToLJ};
+  const Double_t xmax0[nBinsSparse0]  = { maxM, maxM, maxPt, maxPt, maxDRToLJ};
 
   TString histName = "";
   TString histTitle = "";
@@ -367,18 +373,24 @@ Bool_t AliAnalysisTaskJetShapeDeriv::FillHistograms()
 
   AliEmcalJet* jet1  = NULL; //AA jet
   AliEmcalJet *jet2  = NULL; //Embedded Pythia jet
-  AliEmcalJet *jet1T = NULL; //tagged AA jet
+  //  AliEmcalJet *jet1T = NULL; //tagged AA jet
   //  AliEmcalJet *jet2T = NULL; //tagged Pythia jet
   AliJetContainer *jetCont = GetJetContainer(fContainerBase);
   fRho  = (Float_t)jetCont->GetRhoVal();
   fRhoM = (Float_t)jetCont->GetRhoMassVal();
+
+  //Get leading jet in Pb-Pb event without embedded objects
+  AliJetContainer *jetContNoEmb = GetJetContainer(fContainerNoEmb);
+  AliEmcalJet *jetL = NULL;
+  if(jetContNoEmb) jetL = jetContNoEmb->GetLeadingJet("rho");
+
   if(jetCont) {
     jetCont->ResetCurrentID();
     while((jet1 = jetCont->GetNextAcceptJet())) {
       jet2 = NULL;
-      jet1T = NULL;
+      //      jet1T = NULL;
       //   jet2T = NULL;
-      if(jet1->GetTagStatus()>0) jet1T = jet1->GetTaggedJet();
+      //      if(jet1->GetTagStatus()>0) jet1T = jet1->GetTaggedJet();
       //Fill histograms for all AA jets
       fh2MSubPtRawAll[fCentBin]->Fill(jet1->GetSecondOrderSubtracted(),jet1->Pt()-jetCont->GetRhoVal()*jet1->Area());
       fh2PtRawSubFacV1[fCentBin]->Fill(jet1->Pt(),-1.*(fRho+fRhoM)*jet1->GetFirstDerivative());
@@ -421,9 +433,11 @@ Bool_t AliAnalysisTaskJetShapeDeriv::FillHistograms()
          fh2MTruePtTrue[fCentBin]->Fill(jet2->M(),jet2->Pt());
          fh2PtTrueDeltaM[fCentBin]->Fill(jet2->Pt(),jet1->GetSecondOrderSubtracted()-jet2->M());
          if(jet2->M()>0.) fh2PtTrueDeltaMRel[fCentBin]->Fill(jet2->Pt(),(jet1->GetSecondOrderSubtracted()-jet2->M())/jet2->M());
-         Double_t mJet1Tagged = -1.;
-         if(jet1T) mJet1Tagged = jet1T->M();
-         Double_t var[5] = {jet1->GetSecondOrderSubtracted(),jet2->M(),jet1->Pt()-jetCont->GetRhoVal()*jet1->Area(),jet2->Pt(),mJet1Tagged};
+         // Double_t mJet1Tagged = -1.;
+         // if(jet1T) mJet1Tagged = jet1T->M();
+         Double_t drToLJ = 0.;
+         if(jetL) drToLJ = jet1->DeltaR(jetL);
+         Double_t var[5] = {jet1->GetSecondOrderSubtracted(),jet2->M(),jet1->Pt()-jetCont->GetRhoVal()*jet1->Area(),jet2->Pt(),drToLJ};
          fhnMassResponse[fCentBin]->Fill(var);
        }
       }

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.h
index 0933e681579ed6bf35db32273a5972bd88de45d0..497cfdb8043dbdc6f27c8cca270e4221412d1b1a 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskJetShapeDeriv.h
@@ -16,10 +16,10 @@ class AliAnalysisManager;
 class AliVParticle;
 class AliJetContainer;
 
-namespace fastjet {
-  class PseudoJet;
-  class GenericSubtractor;
-}
+/* namespace fastjet { */
+/*   class PseudoJet; */
+/*   class GenericSubtractor; */
+/* } */
 
 #include "AliAnalysisTaskEmcalJet.h"
 
@@ -37,6 +37,7 @@ class AliAnalysisTaskJetShapeDeriv : public AliAnalysisTaskEmcalJet {
   void SetCreateTree(Bool_t b)                                  { fCreateTree        = b   ; }
 
   void SetJetContainerBase(Int_t c)                             { fContainerBase     = c   ; }
+  void SetJetContainerNoEmb(Int_t c)                            { fContainerNoEmb    = c   ; }
   void SetMinFractionShared(Double_t f)                         { fMinFractionShared = f   ; }
   void SetSingleTrackEmbedding(Bool_t b)                        { fSingleTrackEmb    = b   ; }
 
@@ -48,6 +49,7 @@ class AliAnalysisTaskJetShapeDeriv : public AliAnalysisTaskEmcalJet {
   AliVParticle*                       GetEmbeddedConstituent(AliEmcalJet *jet);
 
   Int_t                               fContainerBase;              // jets to be analyzed
+  Int_t                               fContainerNoEmb;             // subtracted jets from Pb-Pb only events
   Double_t                            fMinFractionShared;          // only fill histos for jets if shared fraction larger than X
   Bool_t                              fSingleTrackEmb;             // single track embedding
   Bool_t                              fCreateTree;                 // create output tree
@@ -89,7 +91,7 @@ class AliAnalysisTaskJetShapeDeriv : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskJetShapeDeriv(const AliAnalysisTaskJetShapeDeriv&);            // not implemented
   AliAnalysisTaskJetShapeDeriv &operator=(const AliAnalysisTaskJetShapeDeriv&); // not implemented
 
-  ClassDef(AliAnalysisTaskJetShapeDeriv, 1)
+  ClassDef(AliAnalysisTaskJetShapeDeriv, 2)
 };
 #endif
 

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
index 973aa4837971fd14c538cfc41c578a4d524bf6d6..d17c38cc223e58cc727c5dbde211de50d3abe6d6 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeConst.C
@@ -1,5 +1,6 @@
 AliAnalysisTaskJetShapeConst *AddTaskJetShapeConst(const char * njetsBase,
                                                   const char * njetsSub,
+                                                  const char * njetsNoEmb,
                                                   const Double_t R,
                                                   const char * nrhoBase,
                                                   const char * nrhoMass,
@@ -63,6 +64,16 @@ AliAnalysisTaskJetShapeConst *AddTaskJetShapeConst(const char * njetsBase,
     jetContSub->SetJetPtCut(-1e6);
   }
 
+  AliJetContainer *jetContNoEmb = task->AddJetContainer(njetsNoEmb,strType,R);
+  if(jetContNoEmb) {
+    jetContNoEmb->SetRhoName(nrhoBase);
+    jetContNoEmb->SetRhoMassName(nrhoMass);
+    jetContNoEmb->ConnectParticleContainer(trackCont);
+    jetContNoEmb->ConnectClusterContainer(clusterCont);
+    jetContNoEmb->SetPercAreaCut(0.6);
+    jetContNoEmb->SetJetPtCut(-1e6);
+  }
+
   task->SetCaloTriggerPatchInfoName(kEmcalTriggers.Data());
   task->SetCentralityEstimator(CentEst);
   task->SelectCollisionCandidates(pSel);

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
index 37fcc761321bb8a9ef61c25a207acd5db85a3d93..10567b5bc87bc7d4dd4da2a43bf58d1a2e18167f 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetShapeDeriv.C
@@ -1,4 +1,5 @@
 AliAnalysisTaskJetShapeDeriv *AddTaskJetShapeDeriv(const char * njetsBase,
+                                                  const char * njetsNoEmb,
                                                   const Double_t R,
                                                   const char * nrhoBase,
                                                   const char * nrhoMass,
@@ -53,6 +54,16 @@ AliAnalysisTaskJetShapeDeriv *AddTaskJetShapeDeriv(const char * njetsBase,
     jetContBase->SetPercAreaCut(0.6);
   }
 
+  AliJetContainer *jetContNoEmb = task->AddJetContainer(njetsNoEmb,strType,R);
+  if(jetContNoEmb) {
+    jetContNoEmb->SetRhoName(nrhoBase);
+    jetContNoEmb->SetRhoMassName(nrhoMass);
+    jetContNoEmb->ConnectParticleContainer(trackCont);
+    jetContNoEmb->ConnectClusterContainer(clusterCont);
+    jetContNoEmb->SetPercAreaCut(0.6);
+    jetContNoEmb->SetJetPtCut(-1e6);
+  }
+
   task->SetCaloTriggerPatchInfoName(kEmcalTriggers.Data());
   task->SetCentralityEstimator(CentEst);
   task->SelectCollisionCandidates(pSel);