Updates in PbPb cuts (Andrea Rossi)

[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisTaskSECompareHF.cxx

diff --git a/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx b/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
index dd9efccd179f5fd98d0630d56582ccdea9f9bc0a..2df7796409d8b856d03fca0ee14754d3cec5d2b5 100644 (file)
--- a/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
+++ b/PWG3/vertexingHF/AliAnalysisTaskSECompareHF.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 /////////////////////////////////////////////////////////////
 //
 // AliAnalysisTaskSE for the comparison of heavy flavor
@@ -51,8 +53,7 @@ AliAnalysisTaskSE(),
 fOutput(0), 
 fNtupleCmp(0),
 fHistMass(0),
-fHistNEvents(0),
-fVHF(0)
+fHistNEvents(0)
 {
   // Default constructor
 
@@ -65,8 +66,7 @@ AliAnalysisTaskSE(name),
 fOutput(0), 
 fNtupleCmp(0),
 fHistMass(0),
-fHistNEvents(0),
-fVHF(0)
+fHistNEvents(0)
 {
   // Standard constructor
 
@@ -84,10 +84,6 @@ AliAnalysisTaskSECompareHF::~AliAnalysisTaskSECompareHF()
     delete fOutput;
     fOutput = 0;
   }
-  if (fVHF) {
-    delete fVHF;
-    fVHF = 0;
-  }
 }  
 
 //________________________________________________________________________
@@ -97,11 +93,6 @@ void AliAnalysisTaskSECompareHF::Init()
 
   if(fDebug > 1) printf("AnalysisTaskSECompareHF::Init() \n");
   
-  gROOT->LoadMacro("ConfigVertexingHF.C");
-
-  fVHF = (AliAnalysisVertexingHF*)gROOT->ProcessLine("ConfigVertexingHF()");  
-  fVHF->PrintStatus();
-  
   return;
 }
 
@@ -163,7 +154,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
       // load D*+ candidates                                                   
       inputArrayDstar = (TClonesArray*)aodFromExt->GetList()->FindObject("Dstar");
     }
-  } else {
+  } else if(aod) {
     // load HF vertices                
     inputArrayVertices = (TClonesArray*)aod->GetList()->FindObject("VerticesHF");
     // load D0->Kpi candidates                                                 
@@ -173,7 +164,7 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
   }
 
 
-  if(!inputArrayVertices) {
+  if(!inputArrayVertices || !aod) {
     printf("AliAnalysisTaskSECompareHF::UserExec: Vertices branch not found!\n");
     return;
   }
@@ -293,7 +284,6 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
          d3->SetOwnPrimaryVtx(vtx1); // needed to compute all variables
          unsetvtx=kTRUE;
        }
-       //if(d3->SelectDplus(fVHF->GetDplusCuts())) {
        AliAODMCParticle *dMC = (AliAODMCParticle*)mcArray->At(lab);
        pdg = dMC->GetPdgCode();
        invmass = d3->InvMassDplus();
@@ -308,7 +298,6 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
                         (Float_t)d3->CosPointingAngle(),(Float_t)(d3->Getd0Prong(0)*d3->Getd0Prong(1)*d3->Getd0Prong(2))};
        fNtupleCmp->Fill(tmp);
        PostData(2,fNtupleCmp);
-       //}
        if(unsetvtx) d3->UnsetOwnPrimaryVtx();
       }
       break;
@@ -323,7 +312,6 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
          unsetvtx=kTRUE;
        }
        okD0=0; okD0bar=0; 
-       //if(d4->SelectD0(fVHF->GetD0to4ProngsCuts(),okD0,okD0bar)) {
        AliAODMCParticle *dMC = (AliAODMCParticle*)mcArray->At(lab);
        pdg = dMC->GetPdgCode();
        //invmass = (pdg==421 ? d->InvMassD0() : d->InvMassD0bar());
@@ -339,7 +327,6 @@ void AliAnalysisTaskSECompareHF::UserExec(Option_t */*option*/)
                         (Float_t)d4->CosPointingAngle(),(Float_t)(d4->Getd0Prong(0)*d4->Getd0Prong(1)*d4->Getd0Prong(2)*d4->Getd0Prong(3))};
        fNtupleCmp->Fill(tmp);
        PostData(2,fNtupleCmp);
-       //}
        if(unsetvtx) d4->UnsetOwnPrimaryVtx();
       }
       break;