Fixed EINCLUDE

[u/mrichter/AliRoot.git] / PWG4 / macros / AddTaskJetCluster.C

diff --git a/PWG4/macros/AddTaskJetCluster.C b/PWG4/macros/AddTaskJetCluster.C
index 39275a86bab8169f4663d13843fa0166cf85d1d3..8a90857e2523bf38c97999dd939374dc1223ce78 100644 (file)
--- a/PWG4/macros/AddTaskJetCluster.C
+++ b/PWG4/macros/AddTaskJetCluster.C
@@ -1,7 +1,8 @@
- AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec = "AOD",char* bGen = "",UInt_t filterMask = 16, UInt_t iPhysicsSelectionFlag = AliVEvent::kMB,Char_t *jf = "KT", Float_t radius = 0.4,Int_t nSkip = 0,Int_t kWriteAOD = kFALSE,char* deltaFile = "",Float_t ptTrackCut = 0.15);
+AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec = "AOD",char* bGen = "",UInt_t filterMask = 16, UInt_t iPhysicsSelectionFlag = AliVEvent::kAny,Char_t *jf = "KT", Float_t radius = 0.4,Int_t nSkip = 0,Int_t kWriteAOD = kFALSE,char* deltaFile = "",Float_t ptTrackCut = 0.15, Float_t etaTrackWindow = 0.9,Int_t nSkipCone = 2);
 
 Int_t kBackgroundMode = 0;
 Float_t kPtTrackCut = 0.15;
+Float_t kTrackEtaWindow = 0.8;
 
 AliAnalysisTaskJetCluster *AddTaskJetClusterDelta(UInt_t filterMask = 16,Bool_t kUseAODMC = kFALSE,UInt_t iPhysicsSelectionFlag = AliVEvent::kMB,Char_t *jf = "KT", UInt_t iFlag){
    AliAnalysisTaskJetCluster *js = 0;
@@ -28,10 +29,11 @@ AliAnalysisTaskJetCluster *AddTaskJetClusterDelta(UInt_t filterMask = 16,Bool_t
  }
 
 
- AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filterMask,UInt_t iPhysicsSelectionFlag,Char_t *jf,Float_t radius,Int_t nSkip,Int_t kWriteAOD,char *deltaFile,Float_t ptTrackCut)
+AliAnalysisTaskJetCluster *AddTaskJetCluster(char* bRec,char* bGen ,UInt_t filterMask,UInt_t iPhysicsSelectionFlag,Char_t *jf,Float_t radius,Int_t nSkip,Int_t kWriteAOD,char *deltaFile,Float_t ptTrackCut,Float_t etaTrackWindow,Int_t nSkipCone)
  {
  // Creates a jet fider task, configures it and adds it to the analysis manager.
    kPtTrackCut = ptTrackCut;
+   kTrackEtaWindow = etaTrackWindow;
 
    TString outputFile(deltaFile);
     // Get the pointer to the existing analysis manager via the static access method.
@@ -87,43 +89,36 @@ AliAnalysisTaskJetCluster *AddTaskJetClusterDelta(UInt_t filterMask = 16,Bool_t
 
    if(typeRec.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCChargedAcceptance);
+     pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(kTrackEtaWindow);
    }
    else if (typeRec.Contains("AODMC2")){
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCCharged);
+     pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(5);
    }
    else if (typeRec.Contains("AODMC")){
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODMCAll);
+     pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(5);
    }
    else if (typeRec.Contains("AODextraonly")) {
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextraonly);
      pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(kTrackEtaWindow);
    }
    else if (typeRec.Contains("AODextra")) {
      cout << "AliAnalysisTaskJetCluster::kTrackAODextra: " << AliAnalysisTaskJetCluster::kTrackAODextra << endl;
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAODextra);
      pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(kTrackEtaWindow);
    }
    else if (typeRec.Contains("AOD")) {
      pwg4spec->SetTrackTypeRec(AliAnalysisTaskJetCluster::kTrackAOD);
      pwg4spec->SetTrackPtCut(kPtTrackCut);
+     pwg4spec->SetTrackEtaWindow(kTrackEtaWindow);
    }
 
-
-   if(typeGen.Contains("AODMC2b")){// work down from the top AODMC2b -> AODMC2 -> AODMC -> AOD
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetCluster::kTrackAODMCChargedAcceptance);
-   }
-   else if (typeGen.Contains("AODMC2")){
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetCluster::kTrackAODMCCharged);
-   }
-   else if (typeGen.Contains("AODMC")){
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetCluster::kTrackAODMCAll);
-   }
-   else if (typeGen.Contains("AOD")) {
-     pwg4spec->SetTrackTypeGen(AliAnalysisTaskJetCluster::kTrackAOD);
-   }
-
-
-
    pwg4spec->SetRparam(radius);
 
    switch (jf) {
@@ -149,6 +144,7 @@ AliAnalysisTaskJetCluster *AddTaskJetClusterDelta(UInt_t filterMask = 16,Bool_t
    }
 
    pwg4spec->SetNSkipLeadingRan(nSkip);
+   pwg4spec->SetNSkipLeadingCone(nSkipCone);
 
    if(iPhysicsSelectionFlag)pwg4spec->SelectCollisionCandidates(iPhysicsSelectionFlag);