from Salvatore

diff --git a/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C b/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
index 3a0f7658444976336714f26b6fae63c0a7ba5d06..031833de558c8c3bd801a730d3cd237fc0ef3618 100644 (file)
--- a/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
+++ b/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
@@ -66,8 +66,8 @@ AliEmcalPicoTrackMaker* AddTaskEmcalPicoTrackMaker(
     eTask->SetAODfilterBits(arg1.Atoi(),arg2.Atoi());
     delete arr;
   } else {
-    if (runPeriod.IsNull())
-      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.");
+    if (!runPeriod.IsNull())
+      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.", runPeriod.Data());
   }
   eTask->SetESDtrackCuts(cuts);
 

diff --git a/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx b/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
index 44aee5bb380472e3df4aacf3a8c5728e380d09ac..ea1fb2d5b186a83784025c9eedaefa2f28f7e83f 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetResponseMaker.cxx
@@ -37,6 +37,8 @@ AliJetResponseMaker::AliJetResponseMaker() :
   fCalo2Name(""),
   fJets2Name(""),
   fRho2Name(""),
+  fJet2Radius(0.4),
+  fJet2AreaCut(-1),
   fPtBiasJet2Track(0),
   fPtBiasJet2Clus(0),
   fAreCollections1MC(kFALSE),  
@@ -53,6 +55,7 @@ AliJetResponseMaker::AliJetResponseMaker() :
   fIsPythia(kTRUE),
   fMCLabelShift(0),
   fUseCellsToMatch(kFALSE),
+  fMinJetMCPt(1),
   fPythiaHeader(0),
   fPtHardBin(0),
   fNTrials(0),
@@ -144,6 +147,8 @@ AliJetResponseMaker::AliJetResponseMaker(const char *name) :
   fCalo2Name(""),
   fJets2Name("MCJets"),
   fRho2Name(""),
+  fJet2Radius(0.4),
+  fJet2AreaCut(-1),
   fPtBiasJet2Track(0),
   fPtBiasJet2Clus(0),
   fAreCollections1MC(kFALSE),  
@@ -160,6 +165,7 @@ AliJetResponseMaker::AliJetResponseMaker(const char *name) :
   fIsPythia(kTRUE),
   fMCLabelShift(0),
   fUseCellsToMatch(kFALSE),
+  fMinJetMCPt(1),
   fPythiaHeader(0),
   fPtHardBin(0),
   fNTrials(0),
@@ -925,6 +931,14 @@ void AliJetResponseMaker::ExecOnce()
     }
   }
 
+  if (fPercAreaCut >= 0) {
+    if (fJet2AreaCut >= 0)
+      AliInfo(Form("%s: jet 2 area cut will be calculated as a percentage of the average area, given value will be overwritten", GetName()));
+    fJet2AreaCut = fPercAreaCut * fJet2Radius * fJet2Radius * TMath::Pi();
+  }
+  if (fJet2AreaCut < 0)
+    fJet2AreaCut = 0;
+
   if (fJet2MinEta == -999)
     fJet2MinEta = fJetMinEta - fJetRadius;
   if (fJet2MaxEta == -999)
@@ -1025,9 +1039,12 @@ Bool_t AliJetResponseMaker::DoJetMatching()
       continue;
 
     if (jet1->ClosestJet() && jet1->ClosestJet()->ClosestJet() == jet1 && 
-        jet1->ClosestJetDistance() < fMatchingPar1 && jet1->ClosestJet()->ClosestJetDistance() < fMatchingPar2) {    // Matched jet found
+       jet1->ClosestJetDistance() < fMatchingPar1 && jet1->ClosestJet()->ClosestJetDistance() < fMatchingPar2) {    // Matched jet found
       jet1->SetMatchedToClosest(fMatching);
       jet1->ClosestJet()->SetMatchedToClosest(fMatching);
+      AliDebug(2,Form("Found matching: jet1 pt = %f, eta = %f, phi = %f, jet2 pt = %f, eta = %f, phi = %f", 
+                     jet1->Pt(), jet1->Eta(), jet1->Phi(), 
+                     jet1->MatchedJet()->Pt(), jet1->MatchedJet()->Eta(), jet1->MatchedJet()->Phi()));
     }
   }
 
@@ -1087,7 +1104,7 @@ void AliJetResponseMaker::DoJetLoop(Bool_t order)
     if (!AcceptJet(jet1))
       continue;
 
-    if (jet1->MCPt() < 1)
+    if (jet1->MCPt() < fMinJetMCPt)
       continue;
 
     if (order) {
@@ -1107,7 +1124,6 @@ void AliJetResponseMaker::DoJetLoop(Bool_t order)
        AliError(Form("Could not receive jet %d", j));
        continue;
       }
-      
       if (!AcceptJet(jet2))
        continue;
 

diff --git a/PWGJE/EMCALJetTasks/AliJetResponseMaker.h b/PWGJE/EMCALJetTasks/AliJetResponseMaker.h
index 14ee340dee223b0365e25204064d669a6743aa89..2f83d030f50973798a428c028fd5f0cde98dd9ba 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetResponseMaker.h
+++ b/PWGJE/EMCALJetTasks/AliJetResponseMaker.h
@@ -34,6 +34,8 @@ class AliJetResponseMaker : public AliAnalysisTaskEmcalJet {
   void                        SetClus2Name(const char *n)                                     { fCalo2Name         = n         ; }
   void                        SetJet2EtaLimits(Float_t min=-999, Float_t max=-999)            { fJet2MinEta = min, fJet2MaxEta = max ; }
   void                        SetJet2PhiLimits(Float_t min=-999, Float_t max=-999)            { fJet2MinPhi = min, fJet2MaxPhi = max ; }
+  void                        SetJet2Radius(Float_t r)                                        { fJet2Radius        = r         ; }
+  void                        SetJet2AreaCut(Float_t cut)                                     { fJet2AreaCut       = cut       ; }
   void                        SetRho2Name(const char *n)                                      { fRho2Name          = n         ; }
   void                        SetPtBiasJet2Clus(Float_t b)                                    { fPtBiasJet2Clus    = b         ; }
   void                        SetPtBiasJet2Track(Float_t b)                                   { fPtBiasJet2Track   = b         ; }
@@ -65,6 +67,8 @@ class AliJetResponseMaker : public AliAnalysisTaskEmcalJet {
   TString                     fCalo2Name;                     // name of second cluster collection
   TString                     fJets2Name;                     // name of second jet collection
   TString                     fRho2Name;                      // name of second jet collection
+  Float_t                     fJet2Radius;                    // jet radius of second jet collection
+  Float_t                     fJet2AreaCut;                   // cut on jet area (second jet collection)
   Float_t                     fPtBiasJet2Track;               // select jets 2 with a minimum pt track
   Float_t                     fPtBiasJet2Clus;                // select jets 2 with a minimum pt cluster
   Bool_t                      fAreCollections1MC;             // collections 1 MC
@@ -81,6 +85,7 @@ class AliJetResponseMaker : public AliAnalysisTaskEmcalJet {
   Bool_t                      fIsPythia;                      // trigger, if it is a PYTHIA production
   Int_t                       fMCLabelShift;                  // if MC label > fMCLabelShift, MC label -= fMCLabelShift
   Bool_t                      fUseCellsToMatch;               // use cells instead of clusters to match jets (slower but sometimes needed)
+  Double_t                    fMinJetMCPt;                    // minimum jet MC pt
 
   AliGenPythiaEventHeader    *fPythiaHeader;                  //!event Pythia header
   Int_t                       fPtHardBin;                     //!event pt hard bin
@@ -165,11 +170,10 @@ class AliJetResponseMaker : public AliAnalysisTaskEmcalJet {
   TH2                        *fHistDeltaMCPtvsDeltaArea;               //!jet 1 MC pt - jet2 pt vs delta area
   TH2                        *fHistJet1MCPtvsJet2Pt;                   //!correlation jet 1 MC pt vs jet 2 pt
 
-
  private:
   AliJetResponseMaker(const AliJetResponseMaker&);            // not implemented
   AliJetResponseMaker &operator=(const AliJetResponseMaker&); // not implemented
 
-  ClassDef(AliJetResponseMaker, 15) // Jet response matrix producing task
+  ClassDef(AliJetResponseMaker, 16) // Jet response matrix producing task
 };
 #endif

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
index deba4f7615b7abac7540dd4f2fdab90d243c23fa..812c8d204a658ea279d073c2572e8e5197bade3c 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
@@ -65,15 +65,15 @@ AliJetEmbeddingFromAODTask* AddTaskJetEmbeddingFromAOD(
   jetEmb->SetIncludeNoITS(includeNoITS);
   TString runPeriod(runperiod);
   runPeriod.ToLower();
-  if (runPeriod == "lhc11h") {
-    jetEmb->SetAODfilterBits(256,512); // hybrid tracks for LHC11h
+  if (runPeriod == "lhc11h" || runPeriod == "lhc12a15e") {
+    jetEmb->SetAODfilterBits(256,512); // hybrid tracks for LHC11h and LHC12a15e
   }
-  else if (runPeriod == "lhc11a" || runPeriod == "lhc12a15a" || runPeriod == "lhc12a15e") {
-    jetEmb->SetAODfilterBits(256,16); // hybrid tracks for LHC11a, LHC12a15a and LHC12a15e
+  else if (runPeriod == "lhc11a" || runPeriod == "lhc12a15a") {
+    jetEmb->SetAODfilterBits(256,16); // hybrid tracks for LHC11a and LHC12a15a
   }
   else {
-    if (runPeriod.IsNull())
-      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.");
+    if (!runPeriod.IsNull())
+      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.", runPeriod.Data());
   }
 
   //-------------------------------------------------------

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C
index 972e0415d88ff8f676cbc5cea2e111f4b9faae6f..5f25a0e48ef06b9f84498a6b61ee6e51f6ebd27f 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromPYTHIA.C
@@ -71,12 +71,15 @@ AliJetEmbeddingFromPYTHIATask* AddTaskJetEmbeddingFromPYTHIA(
   jetEmb->SetIncludeNoITS(includeNoITS);
   TString runPeriod(runperiod);
   runPeriod.ToLower();
-  if (runPeriod == "lhc12a15a" || runPeriod == "lhc12a15e") {
+  if (runPeriod == "lhc12a15e") {
+    jetEmb->SetAODfilterBits(256,512);
+  }
+  else if (runPeriod == "lhc12a15a") {
     jetEmb->SetAODfilterBits(256,16);
   }
   else {
-    if (runPeriod.IsNull())
-      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.");
+    if (!runPeriod.IsNull())
+      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.", runPeriod.Data());
   }
 
   jetEmb->SetPYTHIAPath(simpath);