Adapt to framework modifications
authorbianchin <chiara.bianchin@cern.ch>
Mon, 3 Feb 2014 15:15:45 +0000 (16:15 +0100)
committermvl <marco.van.leeuwen@cern.ch>
Mon, 3 Feb 2014 16:32:07 +0000 (17:32 +0100)
PWGJE/FlavourJetTasks/0001-Change-DeltaPhi-axis-in-THnSparse.patch [new file with mode: 0644]
PWGJE/FlavourJetTasks/macros/AddTasksFlavourJet.C
PWGJE/FlavourJetTasks/macros/AnalysisTrainCorrJetsLocal.C

diff --git a/PWGJE/FlavourJetTasks/0001-Change-DeltaPhi-axis-in-THnSparse.patch b/PWGJE/FlavourJetTasks/0001-Change-DeltaPhi-axis-in-THnSparse.patch
new file mode 100644 (file)
index 0000000..aa8d561
--- /dev/null
@@ -0,0 +1,33 @@
+From 0302282c69ba46ff735a3e19ae85dd14ba3c217a Mon Sep 17 00:00:00 2001
+From: Chiara Bianchin <chiara.bianchin@cern.ch>
+Date: Mon, 13 Jan 2014 14:46:33 +0100
+Subject: [PATCH] Change DeltaPhi axis in THnSparse
+
+---
+ .../AliAnalysisTaskFlavourJetCorrelations.cxx      |    9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
+index de17b49..54a7af8 100644
+--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
++++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
+@@ -633,10 +633,13 @@ Bool_t  AliAnalysisTaskFlavourJetCorrelations::DefineHistoForAnalysis(){
+       fmyOutput->Add(hInvMassptDbg);
+       
+    }
+-   const Int_t nAxis=6;
++   Double_t pi=TMath::Pi(), philims2[2];
++   philims2[0]=-pi*1./2.;
++   philims2[1]=pi*3./2.;
++   const Int_t nAxis=6;   
+    const Int_t nbinsSparse[nAxis]={nbinsz,nbinsphi,nbinsptjet,nbinsptD,nbinsmass,2};
+-   const Double_t minSparse[nAxis]={zlims[0],philims[0],ptjetlims[0],ptDlims[0],fMinMass,-0.5};
+-   const Double_t maxSparse[nAxis]={zlims[1],philims[1],ptjetlims[1],ptDlims[1],fMaxMass, 1.5};
++   const Double_t minSparse[nAxis]={zlims[0],philims2[0],ptjetlims[0],ptDlims[0],fMinMass,-0.5};
++   const Double_t maxSparse[nAxis]={zlims[1],philims2[1],ptjetlims[1],ptDlims[1],fMaxMass, 1.5};
+    THnSparseF *hsDphiz=new THnSparseF("hsDphiz","Z and #Delta#phi vs p_{T}^{jet}, p_{T}^{D}, and mass", nAxis, nbinsSparse, minSparse, maxSparse);
+    hsDphiz->Sumw2();
+    
+-- 
+1.7.9.5
+
index 1b7251f..b004a95 100644 (file)
@@ -82,10 +82,10 @@ void AddTasksFlavourJet(const Int_t iCandType = 1 /*0 = D0, 1=Dstar...*/,
    // Jet preparation
    //gROOT->LoadMacro("/data/Work/jets/testEMCalJetFramework/code/v4/AddTaskJetPreparation.C");
    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C");
-   AddTaskJetPreparation(type,sRunPeriod,"PicoTracks",bIsMC ? "MCParticlesSelected" : "",/*next 7 emcal default settings*/"","",2.,0.,0.03,0.015,0.15,uTriggerMask, kFALSE /*track cluster*/,kFALSE /*do histos*/,kTRUE /*make pico tracks*/,kFALSE /*make emcal trigger*/,kFALSE /*is emcal train*/);
+   AddTaskJetPreparation(sRunPeriod,"PicoTracks",bIsMC ? "MCParticlesSelected" : "",/*next 7 emcal default settings*/"","",2.,0.,0.03,0.015,0.15,uTriggerMask, kFALSE /*track cluster*/,kFALSE /*do histos*/,kTRUE /*make pico tracks*/,kFALSE /*make emcal trigger*/,kFALSE /*is emcal train*/);
    
    gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C");
-   AliEmcalPicoTrackMaker *taskPicoTrack = AddTaskEmcalPicoTrackMaker(sUsedTrks.Data(),sInputTrk.Data(),sRunPeriod.Data());
+   AliEmcalPicoTrackMaker *taskPicoTrack = AddTaskEmcalPicoTrackMaker(sUsedTrks.Data(),sInputTrk.Data());
    taskPicoTrack->SelectCollisionCandidates(uTriggerMask);
    
    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
index 2090575..20907a9 100644 (file)
@@ -212,47 +212,47 @@ void LoadLibs()
   gSystem->Load("libEVGEN");
   gSystem->Load("libANALYSISalice");
   gSystem->Load("libCORRFW");
-  gSystem->Load("libTOFbase");
+  //gSystem->Load("libTOFbase");
   //gSystem->Load("libTOFrec");
-  gSystem->Load("libRAWDatabase.so");
-  gSystem->Load("libRAWDatarec.so");
-  gSystem->Load("libTPCbase.so");
-  gSystem->Load("libTPCrec.so");
-  gSystem->Load("libITSbase.so");
-  gSystem->Load("libITSrec.so");
-  gSystem->Load("libTRDbase.so");
-  gSystem->Load("libTENDER.so");
-  gSystem->Load("libSTAT.so");
-  gSystem->Load("libTRDrec.so");
-  gSystem->Load("libHMPIDbase.so");
+  //gSystem->Load("libRAWDatabase.so");
+  //gSystem->Load("libRAWDatarec.so");
+  //gSystem->Load("libTPCbase.so");
+  //gSystem->Load("libTPCrec.so");
+  //gSystem->Load("libITSbase.so");
+  //gSystem->Load("libITSrec.so");
+  //gSystem->Load("libTRDbase.so");
+  //gSystem->Load("libTENDER.so");
+  //gSystem->Load("libSTAT.so");
+  //gSystem->Load("libTRDrec.so");
+  //gSystem->Load("libHMPIDbase.so");
   gSystem->Load("libPWGTools.so");
-  gSystem->Load("libPWGPP.so");
+  //gSystem->Load("libPWGPP.so");
   gSystem->Load("libPWGHFbase");
-  gSystem->Load("libPWGDQdielectron");
-  gSystem->Load("libPWGHFhfe");
+  //gSystem->Load("libPWGDQdielectron");
+  //gSystem->Load("libPWGHFhfe");
   gSystem->Load("libPWGflowBase.so");
   gSystem->Load("libPWGflowTasks.so");
   gSystem->Load("libPWGHFvertexingHF");
   gSystem->Load("libEMCALUtils");
-  gSystem->Load("libPHOSUtils");
-  gSystem->Load("libPWGCaloTrackCorrBase");
+  //gSystem->Load("libPHOSUtils");
+  //gSystem->Load("libPWGCaloTrackCorrBase");
   gSystem->Load("libEMCALraw");
   gSystem->Load("libEMCALbase");
-  gSystem->Load("libEMCALrec");
-  gSystem->Load("libTRDbase");
-  gSystem->Load("libVZERObase");
-  gSystem->Load("libVZEROrec");
+  //gSystem->Load("libEMCALrec");
+  //gSystem->Load("libTRDbase");
+  //gSystem->Load("libVZERObase");
+  //gSystem->Load("libVZEROrec");
   gSystem->Load("libTENDER");
-  gSystem->Load("libTENDERSupplies");
+  //gSystem->Load("libTENDERSupplies");
   gSystem->Load("libPWGEMCAL");
   gSystem->Load("libPWGGAEMCALTasks");
-  gSystem->Load("libPWGTools");
-  gSystem->Load("libPWGCFCorrelationsBase");
-  gSystem->Load("libPWGCFCorrelationsDPhi");
+  //gSystem->Load("libPWGCFCorrelationsBase");
+  //gSystem->Load("libPWGCFCorrelationsDPhi");
 
   //load CGAL, Fastjet and SISCone
   //gSystem->Load("libCGAL");
   gSystem->Load("libfastjet");
+  gSystem->Load("libCDFConesPlugin");
   gSystem->Load("libSISConePlugin");
 
   gSystem->Load("libJETAN");
@@ -286,7 +286,7 @@ AliAnalysisGrid* CreateAlienHandler(const char* uniqueName, const char* gridDir,
   }else tmpName +="_20130412_122423";
   */
   TString tmpAdditionalLibs("");
-  tmpAdditionalLibs = Form("libTree.so libVMC.so libGeom.so libGui.so libXMLParser.so libMinuit.so libMinuit2.so libProof.so libPhysics.so libSTEERBase.so libESD.so libAOD.so libOADB.so libANALYSIS.so libCDB.so libRAWDatabase.so libSTEER.so libANALYSISalice.so libCORRFW.so libTOFbase.so libRAWDatabase.so libRAWDatarec.so libTPCbase.so libTPCrec.so libITSbase.so libITSrec.so libTRDbase.so libTENDER.so libSTAT.so libTRDrec.so libHMPIDbase.so libPWGTools.so libPWGPP.so libPWGHFbase.so libPWGDQdielectron.so libPWGHFhfe.so libPWGflowBase.so libPWGflowTasks.so libPWGHFvertexingHF.so libEMCALUtils.so libPHOSUtils.so libPWGCaloTrackCorrBase.so libEMCALraw.so libEMCALbase.so libEMCALrec.so libTRDbase.so libVZERObase.so libVZEROrec.so libTENDER.so libTENDERSupplies.so libPWGEMCAL.so libPWGGAEMCALTasks.so libPWGTools.so libPWGCFCorrelationsBase.so libPWGCFCorrelationsDPhi.so  libCGAL.so libJETAN.so libfastjet.so libSISConePlugin.so libFASTJETAN.so libPWGJE.so libPWGmuon.so libPWGJEEMCALJetTasks.so libPWGJEFlavourJetTasks.so %s %s",additionalCode.Data(),additionalHeaders.Data());
+  tmpAdditionalLibs = Form("libTree.so libVMC.so libGeom.so libGui.so libXMLParser.so libMinuit.so libMinuit2.so libProof.so libPhysics.so libSTEERBase.so libESD.so libESDfilter.so libAOD.so libOADB.so libANALYSIS.so libCDB.so libRAWDatabase.so libSTEER.so libANALYSISalice.so libCORRFW.so libPWGTools.so libPWGHFbase.so libPWGflowBase.so libPWGflowTasks.so libPWGHFvertexingHF.so libEMCALUtils.so libEMCALraw.so libEMCALbase.so libTENDER.so libPWGEMCAL.so libPWGGAEMCALTasks.so libPWGTools.so libCGAL.so libJETAN.so libfastjet.so libSISConePlugin.so libCDFConesPlugin.so libFASTJETAN.so libPWGJE.so libPWGmuon.so libPWGJEEMCALJetTasks.so libPWGJEFlavourJetTasks.so %s %s",additionalCode.Data(),additionalHeaders.Data());
 
 
   TString macroName("");
@@ -302,8 +302,8 @@ AliAnalysisGrid* CreateAlienHandler(const char* uniqueName, const char* gridDir,
 
   // Here you can set the (Ali)ROOT version you want to use
   plugin->SetAPIVersion("V1.1x");
-  plugin->SetROOTVersion("v5-34-08");
-  plugin->SetAliROOTVersion("v5-05-11-AN");
+  plugin->SetROOTVersion("v5-34-08-4");
+  plugin->SetAliROOTVersion("v5-05-63-AN");
 
   plugin->SetGridDataDir(gridDir); // e.g. "/alice/sim/LHC10a6"
   plugin->SetDataPattern(pattern); //dir structure in run directory