Reduce CPU time for Jet Chemistry (Oliver), minar fixes to Fragmentation Task (Swensy)

diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
index 799466ca424c638f0d41f77c83a1be72d2a36145..b4355f385cee2c3c4c0d4100f1d570482897071b 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
@@ -4379,7 +4379,7 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou
     {
       for(Int_t i=0; i<fDiJetNBinsJetInvMass; ++i)
        {
-         jetBin = fDiJetJetInvMassMin + i*stepInvMass/2.;
+         jetBin = fDiJetJetInvMassMin + i*stepInvMass + stepInvMass/2.;
          if(((fDiJetJetInvMassMin+i*stepInvMass) <= invMass) &&
             (fDiJetJetInvMassMin + (i+1)*stepInvMass) > invMass) {jetBinOk = jetBin; break;}
           else jetBinOk = -1.;
@@ -4389,7 +4389,7 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou
     {
       for(Int_t i=0; i<fDiJetNBinsJetPt; ++i)
        {
-         jetBin = fDiJetJetPtMin + i*stepPt/2.;
+         jetBin = fDiJetJetPtMin + i*stepPt + stepPt/2.;
          if(((fDiJetJetPtMin+i*stepPt) <= EtMean) &&
             (fDiJetJetPtMin + (i+1)*stepPt) > EtMean) {jetBinOk = jetBin; break;}
           else jetBinOk = -1.;
@@ -4399,7 +4399,7 @@ Double_t AliAnalysisTaskFragmentationFunction::GetDiJetBin(Double_t invMass, Dou
     {
       for(Int_t i=0; i<fDiJetNBinsJetPt; ++i)
        {
-         jetBin = fDiJetJetPtMin + i*stepPt/2.;
+         jetBin = fDiJetJetPtMin + i*stepPt + stepPt/2.;
          if(((fDiJetJetPtMin+i*stepPt) <= leadingJetPt) &&
             (fDiJetJetPtMin + (i+1)*stepPt) > leadingJetPt) {jetBinOk = jetBin; break;}
           else jetBinOk = -1.;

diff --git a/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx b/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
index cecb209ef4c13b5103562ababa85673a2caf400c..b43927da6567004325bf0d7026d94509eebfde9d 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskJetChem.cxx
@@ -76,7 +76,7 @@ fDeltaAOD(kFALSE),
 fDeltaAODBranch(""),
 fAODBranch("jets"),
 fDeltaAODBranchMC(""),
-fAODBranchMC("jetsMC"),
+fAODBranchMC(""),
 fArrayJetsAOD(0x0), 
 fArrayJetsMC(0x0),
 fAOD(0x0),            
@@ -512,14 +512,14 @@ void  AliAnalysisTaskJetChem::AnalyseEvent()
 
   if(fUseLOConeMCJets)    fArrayJetsMC = FindChargedParticleJetsMC(); 
   else if(fUsePythiaJets) fArrayJetsMC = GetPythiaJets();
-  else{
+  else if( fAODBranchMC.Length() || fDeltaAODBranchMC.Length() ){
 
     if(fDeltaAOD){
       if (fDebug > 1) AliInfo(" ==== MC Jets From  Delta-AODs !");
       if (fDebug > 1) AliInfo(Form(" ====  Reading Branch: %s  ",fDeltaAODBranchMC.Data()));
       fArrayJetsMC = (TClonesArray*)fAODjets->GetList()->FindObject(fDeltaAODBranchMC.Data());
       if (!fArrayJetsMC){
-       AliFatal(" No jet-array! ");
+       AliFatal(" No MC jet-array! ");
        return;
       }
     }
@@ -750,6 +750,7 @@ void  AliAnalysisTaskJetChem::AnalyseEvent()
   CompLeadingJets(leadingJetAOD,leadingJetMC,pythiaPID,foundK0AOD,foundK0MC);
   FillReferencePlotsTracks();
   FillReferenceFF(leadingJetAOD);
+
   
 
   if(fUseLOConeJets && fArrayJetsAOD){
@@ -2750,19 +2751,25 @@ void AliAnalysisTaskJetChem::CheckV0s(AliAODJet* jetVect, Int_t maxPtRegionIndex
       Double_t massK0         = v0->MassK0Short();
       Double_t massLambda     = v0->MassLambda();
       Double_t massAntiLambda = v0->MassAntiLambda();
-      Double_t radiusV0       = v0->RadiusV0();
+
+      fhV0InvMassK0->Fill(massK0);
+      fhV0InvMassLambda->Fill(massLambda);
+      fhV0InvMassAntiLambda->Fill(massAntiLambda);
+
+      if(!(IsK0InvMass(massK0))) continue; // moved invMass cut for HI - otherwise too slow
+
+      //Double_t radiusV0       = v0->RadiusV0(); // slow
 
       Double_t etaV0          = v0->Eta();
       Double_t fDCAV0ToVertex = v0->DcaV0ToPrimVertex();
       Double_t fDCADaughters  = v0->DcaV0Daughters();
 
-
       Double_t v0Mom[3];
       v0->PxPyPz(v0Mom);
       TVector3 v0MomVect(v0Mom);
       
-      AliAODTrack *trackPos = (AliAODTrack *) (v0->GetSecondaryVtx()->GetDaughter(0));
-      AliAODTrack *trackNeg = (AliAODTrack *) (v0->GetSecondaryVtx()->GetDaughter(1));   
+      AliAODTrack *trackPos = (AliAODTrack *) (v0->GetSecondaryVtx()->GetDaughter(0)); // slow 
+      AliAODTrack *trackNeg = (AliAODTrack *) (v0->GetSecondaryVtx()->GetDaughter(1)); // slow  
 
       Double_t posMom[3], negMom[3];
       trackPos->PxPyPz(posMom);
@@ -2788,12 +2795,9 @@ void AliAnalysisTaskJetChem::CheckV0s(AliAODJet* jetVect, Int_t maxPtRegionIndex
       Double_t pV0       = TMath::Sqrt(v0->Ptot2V0());
       Double_t ptV0      = TMath::Sqrt(v0->Pt2V0());
      
-      fhV0InvMassK0->Fill(massK0);
-      fhV0InvMassLambda->Fill(massLambda);
-      fhV0InvMassAntiLambda->Fill(massAntiLambda);
     
       fhV0DCADaughters->Fill(fDCADaughters);
-      fhV0Radius->Fill(radiusV0);
+      //fhV0Radius->Fill(radiusV0);
       fhV0DCAToVertex->Fill(fDCAV0ToVertex);
       fhdNdptV0->Fill(ptV0);
 
@@ -3684,8 +3688,11 @@ Int_t AliAnalysisTaskJetChem::GetPythiaProcessID(){
     return -1;
   }
   
-  AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent);
+  //AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(mcEvent); // not OK for HiJing
   
+  AliGenEventHeader* genHeader = fMCEvent->GenEventHeader();
+  AliGenPythiaEventHeader*  pythiaGenHeader = dynamic_cast<AliGenPythiaEventHeader*>(genHeader);
+
   if (!pythiaGenHeader) {
     AliInfo("Could not retrieve pythiaEventHeader");
     return -1;

diff --git a/PWG4/macros/AddTaskJetChem.C b/PWG4/macros/AddTaskJetChem.C
index 6c8d9f829a181b8ddf496ec5c0161c84a9bfb925..c302e7f668360799484c7403a1c8896022fef5e7 100644 (file)
--- a/PWG4/macros/AddTaskJetChem.C
+++ b/PWG4/macros/AddTaskJetChem.C
@@ -39,8 +39,8 @@ AliAnalysisTask *AddTaskJetChem(){
   // configure task 
 
 
-  task->SetUseLOConeJets();
-  task->SetUseLOConeMCJets();
+  //task->SetUseLOConeJets();
+  //task->SetUseLOConeMCJets();
   
   //task->SetUsePythiaJets();
   task->SetConeRadius(0.4);
@@ -60,8 +60,8 @@ AliAnalysisTask *AddTaskJetChem(){
   task->SetUseOnFlyV0s(); 
   task->SetCutnSigdEdx(2); 
  
-  //task->ReadDeltaAOD(); // uncomment for DeltaAODs
-  //task->SelectDeltaAODBranch("bla"); 
+  task->ReadDeltaAOD(); // uncomment for DeltaAODs
+  task->SelectDeltaAODBranch("jetsAOD_FASTJET04"); 
   //task->SelectAODBranch("jetsAOD_FASTKT04");
   //task->SelectAODBranch("jetsAOD_UA107");
   //task->SelectAODBranch("jets");