preparing jet v2 task for train run

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.cxx
index 689bd876b0ed4f736ffd5832211c336af00543fb..bd4c44bb811ccebfb89646545ed6d4b214e0505c 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.cxx
@@ -31,8 +31,10 @@ ClassImp(AliAnalysisTaskEmcalJetv2QA)
 AliAnalysisTaskEmcalJetv2QA::AliAnalysisTaskEmcalJetv2QA() :
 AliAnalysisTaskEmcalJet("AliAnalysisTaskEmcalJetv2QA", kTRUE),
   nCentBins(0),
-  nJetPtBins(0),
+  nCentBins1(1),
   centBins(0x0),
+  nJetPtBins(0),
+  nJetPtBins1(1),
   jetPtBins(0x0),
   fJetv2(0x0),
   doPtWeight(kFALSE),
@@ -91,14 +93,6 @@ AliAnalysisTaskEmcalJet("AliAnalysisTaskEmcalJetv2QA", kTRUE),
 {
   // Default constructor.
 
-  cout << endl;
-  cout << "*******************************************************" << endl;
-  cout << "*** AliAnalysisTaskEmcalJetv2QA constructor! ***" << endl;
-  cout << "*******************************************************" << endl;
-  cout << endl;
-
-
-
   SetMakeGeneralHistograms(kTRUE);
 }
 
@@ -106,8 +100,10 @@ AliAnalysisTaskEmcalJet("AliAnalysisTaskEmcalJetv2QA", kTRUE),
 AliAnalysisTaskEmcalJetv2QA::AliAnalysisTaskEmcalJetv2QA(const char *name) :
   AliAnalysisTaskEmcalJet(name, kTRUE),
   nCentBins(0),
-  nJetPtBins(0),
+  nCentBins1(1),
   centBins(0x0),
+  nJetPtBins(0),
+  nJetPtBins1(1),
   jetPtBins(0x0),
   fJetv2(0x0),
   doPtWeight(kFALSE),
@@ -166,6 +162,11 @@ AliAnalysisTaskEmcalJetv2QA::AliAnalysisTaskEmcalJetv2QA(const char *name) :
 {
   // Standard constructor.
 
+  // default binning
+  Double_t centBinsTemp[7] = {0,5,10,20,30,40,50};
+  SetCentBins(6,centBinsTemp);
+  Double_t jetPtBinsTemp[6] = {40.,50.,70.,90.,120.,200.};
+  SetJetPtBins(5,jetPtBinsTemp);
 
   SetMakeGeneralHistograms(kTRUE);
 }
@@ -192,13 +193,6 @@ void AliAnalysisTaskEmcalJetv2QA::UserCreateOutputObjects()
     fCaloClustersCont = GetClusterContainer(0);
   }
 
-  nCentBins = 6; // set number of centrality bins
-  nJetPtBins = 4; // set number of jetPtBins
-  centBins = new Double_t[nCentBins+1];
-  jetPtBins = new Double_t[nJetPtBins+1];
-  centBins[0] = 0.; centBins[1] = 5.; centBins[2] = 10.; centBins[3] = 20.; centBins[4] = 30.; centBins[5] = 40.; centBins[6] = 50.; // set edges of bins
-  jetPtBins[0] = 50.; jetPtBins[1] = 70.; jetPtBins[2] = 90.; jetPtBins[3] = 120.; jetPtBins[4] = 200.; // set edges of bins
-
   fTracksCont->SetClassName("AliVTrack");
   fCaloClustersCont->SetClassName("AliVCluster");
 
@@ -566,7 +560,7 @@ Bool_t AliAnalysisTaskEmcalJetv2QA::Run() // this part loops over each event
   AliEmcalJet *dijet = fJetsCont->GetNextAcceptJet(0); // check for dijet events
   while(dijet)
     {
-      if(dijet->Pt() > 50 && fabs(jetPhi-dijet->Phi()-TMath::Pi()) < 0.4) // loop over jets with pT>50 and exclude leading jet and check that angular separation is < 0.4
+      if(dijet->Pt() > jetPt*2./3. && fabs(jetPhi-dijet->Phi()-TMath::Pi()) < 0.4) // loop over jets with pT>50 and exclude leading jet and check that angular separation is < 0.4
        isDijet = 1;
       dijet = fJetsCont->GetNextAcceptJet();
     }
@@ -734,3 +728,31 @@ void AliAnalysisTaskEmcalJetv2QA::Terminate(Option_t *)
   if(centBins) delete [] centBins;
   if(jetPtBins) delete [] jetPtBins;
 }
+
+void AliAnalysisTaskEmcalJetv2QA::SetCentBins(Int_t n, Double_t* bins)
+{
+  if(centBins) delete [] centBins;
+  nCentBins = n;
+  nCentBins1 = n+1;
+  centBins = new Double_t[nCentBins+1];
+  for(Int_t i = 0; i < nCentBins+1; i++)
+    centBins[i]=bins[i];
+  cout << endl << "Setting " << nCentBins << " centrality bins: " << endl;
+  for(Int_t i = 0; i < nCentBins+1; i++)
+    cout << centBins[i] << "   ";
+  cout << endl << endl;
+}
+
+void AliAnalysisTaskEmcalJetv2QA::SetJetPtBins(Int_t n, Double_t* bins)
+{
+  if(jetPtBins) delete [] jetPtBins;
+  nJetPtBins = n;
+  nJetPtBins1 = n+1;
+  jetPtBins = new Double_t[nJetPtBins+1];
+  for(Int_t i = 0; i < nJetPtBins+1; i++)
+    jetPtBins[i]=bins[i];
+  cout << endl << "Setting " << nJetPtBins << " jet pt bins: " << endl;
+  for(Int_t i = 0; i < nJetPtBins+1; i++)
+    cout << jetPtBins[i] << "   ";
+  cout << endl << endl;
+}

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.h
index 923f2e70376b79ae7fcff6f5bb4ccfed0d9ea800..646731bc64cffc91c9d87e5a58f79005721351bf 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetv2QA.h
@@ -25,6 +25,10 @@ class AliAnalysisTaskEmcalJetv2QA : public AliAnalysisTaskEmcalJet {
 
   void                        UserCreateOutputObjects();
   void                        Terminate(Option_t *option);
+
+  void                        SetCentBins(Int_t n, Double_t* bins);
+  void                        SetJetPtBins(Int_t n, Double_t* bins);
+
   Double_t                   GetJetv2(){return fJetv2;};
   void                       SetJetv2(Double_t jetv2){fJetv2 = jetv2;};
   Bool_t                     GetDoPtWeight(){return doPtWeight;};
@@ -32,9 +36,11 @@ class AliAnalysisTaskEmcalJetv2QA : public AliAnalysisTaskEmcalJet {
 
  protected:
   Int_t                              nCentBins;
+  Int_t                       nCentBins1;
+  Double_t*                  centBins; //[nCentBins1]
   Int_t                              nJetPtBins;
-  Double_t                   *centBins;
-  Double_t                   *jetPtBins;
+  Int_t                              nJetPtBins1;
+  Double_t*                  jetPtBins; //[nJetPtBins1]
   void                        ExecOnce();
   Bool_t                      FillHistograms();
   Bool_t                      Run();

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetv2QA.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetv2QA.C
index 8ff9d22617452e1ab4badb15abbb545a6568d6ec..57d188ef2841147f7c22ff1242bc6787dde8e47a 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetv2QA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetv2QA.C
@@ -7,6 +7,8 @@ AliAnalysisTaskEmcalJetv2QA* AddTaskEmcalJetv2QA(
   const char *nclusters          = "CaloClusters",
   const char *njets              = "Jets",
   const char *nrho               = "Rho",
+  Double_t    jetv2              = 0.0,
+  Bool_t      ptweight           = kFALSE,
   Int_t       nCentBins          = 1,
   Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
@@ -42,10 +44,13 @@ AliAnalysisTaskEmcalJetv2QA* AddTaskEmcalJetv2QA(
     name += "_";
     name += njets;
   }
+  name += Form("_v%.2i",(Int_t)(10*jetv2));
   if (strcmp(nrho,"")) {
     name += "_";
     name += nrho;
   }
+  if (ptweight)
+    name += "_ptweight";
   if (strcmp(type,"")) {
     name += "_";
     name += type;
@@ -54,6 +59,10 @@ AliAnalysisTaskEmcalJetv2QA* AddTaskEmcalJetv2QA(
   Printf("name: %s",name.Data());
 
   AliAnalysisTaskEmcalJetv2QA* jetTask = new AliAnalysisTaskEmcalJetv2QA(name);
+
+  jetTask->SetJetv2(jetv2); // set your jet v2 here
+  jetTask->SetDoPtWeight(ptweight); // set doPtWeight
+
   jetTask->SetCentRange(0.,100.);
   jetTask->SetNCentBins(nCentBins);