pt,a < pt,t condition optional

diff --git a/PWGCF/Correlations/Base/AliUEHistograms.cxx b/PWGCF/Correlations/Base/AliUEHistograms.cxx
index f3a3d9f2c03742232fdd617c63e0a60060f31be4..8573059c6edafaba8b0f2c9594f294138a5e242c 100644 (file)
--- a/PWGCF/Correlations/Base/AliUEHistograms.cxx
+++ b/PWGCF/Correlations/Base/AliUEHistograms.cxx
@@ -70,6 +70,7 @@ AliUEHistograms::AliUEHistograms(const char* name, const char* histograms, const
   fCutResonances(kFALSE),
   fOnlyOneEtaSide(0),
   fWeightPerEvent(kFALSE),
+  fPtOrder(kTRUE),
   fRunNumber(0),
   fMergeCount(1)
 {
@@ -239,6 +240,7 @@ AliUEHistograms::AliUEHistograms(const AliUEHistograms &c) :
   fCutResonances(kFALSE),
   fOnlyOneEtaSide(0),
   fWeightPerEvent(kFALSE),
+  fPtOrder(kTRUE),
   fRunNumber(0),
   fMergeCount(1)
 {
@@ -629,7 +631,7 @@ void AliUEHistograms::FillCorrelations(Double_t centrality, Float_t zVtx, AliUEH
         if (mixed && triggerParticle == particle)
           continue;
         
-        if (particle->Pt() > triggerParticle->Pt())
+        if (fPtOrder && particle->Pt() > triggerParticle->Pt())
           continue;
           
        if (fAssociatedSelectCharge != 0)
@@ -1153,6 +1155,8 @@ void AliUEHistograms::Copy(TObject& c) const
   target.fWeightPerEvent = fWeightPerEvent;
   target.fRunNumber = fRunNumber;
   target.fMergeCount = fMergeCount;
+  target.fWeightPerEvent = fWeightPerEvent;
+  target.fPtOrder = fPtOrder;
 }
 
 //____________________________________________________________________

diff --git a/PWGCF/Correlations/Base/AliUEHistograms.h b/PWGCF/Correlations/Base/AliUEHistograms.h
index 18bec68f3b451bde70e4c8c53763a9ebf7e899da..c91af69feb535ab1e4108e185668dd6fbf68eadd 100644 (file)
--- a/PWGCF/Correlations/Base/AliUEHistograms.h
+++ b/PWGCF/Correlations/Base/AliUEHistograms.h
@@ -89,6 +89,7 @@ class AliUEHistograms : public TNamed
   void SetEtaOrdering(Bool_t flag) { fEtaOrdering = flag; }
   void SetPairCuts(Bool_t conversions, Bool_t resonances) { fCutConversions = conversions; fCutResonances = resonances; }
   void SetOnlyOneEtaSide(Int_t flag)    { fOnlyOneEtaSide = flag; }
+  void SetPtOrder(Bool_t flag) { fPtOrder = flag; }
   
   void ExtendTrackingEfficiency(Bool_t verbose = kFALSE);
   void Reset();
@@ -146,12 +147,13 @@ protected:
   Bool_t fCutResonances;         // cut on resonances (inv mass)
   Int_t fOnlyOneEtaSide;       // decides that only trigger particle from one eta side are considered (0 = all; -1 = negative, 1 = positive)
   Bool_t fWeightPerEvent;      // weight with the number of trigger particles per event
+  Bool_t fPtOrder;             // apply pT,a < pT,t condition
   
   Long64_t fRunNumber;           // run number that has been processed
   
   Int_t fMergeCount;           // counts how many objects have been merged together
   
-  ClassDef(AliUEHistograms, 24)  // underlying event histogram container
+  ClassDef(AliUEHistograms, 25)  // underlying event histogram container
 };
 
 Float_t AliUEHistograms::GetDPhiStar(Float_t phi1, Float_t pt1, Float_t charge1, Float_t phi2, Float_t pt2, Float_t charge2, Float_t radius, Float_t bSign)

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx
index 3607b24501f53b978b32ccdd6cdf7803e6377020..4ff44ce8d38f9f232180640fee0ef00d69096bb3 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskLeadingTrackUE.cxx
@@ -240,16 +240,17 @@ void  AliAnalysisTaskLeadingTrackUE::Exec(Option_t */*option*/)
        }
 
   // Get number of trials from MC header
-  Float_t nTrials = 1;
+  
+//   Float_t nTrials = 1;
   if (fMcHandler) {
        fMcEvent = fMcHandler->MCEvent();
-       if (fMcEvent) {
+//     if (fMcEvent) {
                 // TO-DO: extend to PHOJET
-               AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(fMcEvent);
-               if(pythiaGenHeader){
-                       nTrials = pythiaGenHeader->Trials();
-                       }
-               }
+//             AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(fMcEvent);
+//             if(pythiaGenHeader){
+//                     nTrials = pythiaGenHeader->Trials();
+//                     }
+//             }
        }
 
   // TO-DO     

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
index d6a4e1c763ff7e80dac151f7d88ad2c830bee3c9..3be17cfa4e0a28870e3acd8319aae1d0b2658920 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
@@ -143,6 +143,7 @@ fRemoveDuplicates(kFALSE),
 fSkipFastCluster(kFALSE),
 fWeightPerEvent(kFALSE),
 fCustomBinning(),
+fPtOrder(kTRUE),
 fFillpT(kFALSE)
 {
   // Default constructor
@@ -272,6 +273,9 @@ void  AliAnalysisTaskPhiCorrelations::CreateOutputObjects()
   fHistos->SetWeightPerEvent(fWeightPerEvent);
   fHistosMixed->SetWeightPerEvent(fWeightPerEvent);
   
+  fHistos->SetPtOrder(fPtOrder);
+  fHistosMixed->SetPtOrder(fPtOrder);
+  
   if (fEfficiencyCorrectionTriggers)
    {
     fHistos->SetEfficiencyCorrectionTriggers(fEfficiencyCorrectionTriggers);
@@ -396,6 +400,7 @@ void  AliAnalysisTaskPhiCorrelations::AddSettingsTree()
   settingsTree->Branch("fRemoveDuplicates", &fRemoveDuplicates,"RemoveDuplicates/O");
   settingsTree->Branch("fSkipFastCluster", &fSkipFastCluster,"SkipFastCluster/O");
   settingsTree->Branch("fWeightPerEvent", &fWeightPerEvent,"WeightPerEvent/O");
+  settingsTree->Branch("fPtOrder", &fPtOrder,"PtOrder/O");
   //fCustomBinning
   
   settingsTree->Fill();

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h
index 9b126603ad8349b2e4428f416e8fdc51e6cbf917..0a5af216627173b3b71fb63e4d26e655adbe5c9b 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.h
@@ -108,6 +108,7 @@ class  AliAnalysisTaskPhiCorrelations : public AliAnalysisTask
     void   SetSkipFastCluster(Bool_t flag = kTRUE)  { fSkipFastCluster = flag; }
     void   SetWeightPerEvent(Bool_t flag = kTRUE)   { fWeightPerEvent = flag; }
     void   SetCustomBinning(const char* binningStr) { fCustomBinning = binningStr; }
+    void   SetPtOrder(Bool_t flag) { fPtOrder = flag; }
     
     AliHelperPID* GetHelperPID() { return fHelperPID; }
     void   SetHelperPID(AliHelperPID* pid){ fHelperPID = pid; }
@@ -193,10 +194,11 @@ class  AliAnalysisTaskPhiCorrelations : public AliAnalysisTask
     Bool_t fSkipFastCluster;      // skip kFastOnly flagged events (only for data)
     Bool_t fWeightPerEvent;       // weight with the number of trigger particles per event
     TString fCustomBinning;       // supersedes default binning if set, see AliUEHist::GetBinning or AliUEHistograms::AliUEHistograms for syntax and examples
+    Bool_t fPtOrder;              // apply pT,a < pt,t condition; default: kTRUE
     
     Bool_t fFillpT;                // fill sum pT instead of number density
     
-    ClassDef( AliAnalysisTaskPhiCorrelations, 29); // Analysis task for delta phi correlations
+    ClassDef( AliAnalysisTaskPhiCorrelations, 30); // Analysis task for delta phi correlations
   };
 
 class AliDPhiBasicParticle : public AliVParticle