including switch to set on/off iso-track core removal, cleaning and bug fix

[u/mrichter/AliRoot.git] / PWGDQ / dielectron / AliAnalysisTaskDielectronFilter.cxx

diff --git a/PWGDQ/dielectron/AliAnalysisTaskDielectronFilter.cxx b/PWGDQ/dielectron/AliAnalysisTaskDielectronFilter.cxx
index 3177aa886067f24080d54ab7c2f40fed0674bff4..9c435c8ae6765dc169ea5543cb11d70341c52e6a 100644 (file)
--- a/PWGDQ/dielectron/AliAnalysisTaskDielectronFilter.cxx
+++ b/PWGDQ/dielectron/AliAnalysisTaskDielectronFilter.cxx
@@ -216,8 +216,12 @@ void AliAnalysisTaskDielectronFilter::UserExec(Option_t *)
    fEventStat->Fill(kV0andEvents);
 
   //Fill Event histograms before the event filter
+  AliDielectronHistos *h=fDielectron->GetHistoManager();
+
   Double_t values[AliDielectronVarManager::kNMaxValues]={0};
   Double_t valuesMC[AliDielectronVarManager::kNMaxValues]={0};
+  if(h)  AliDielectronVarManager::SetFillMap(h->GetUsedVars());
+  else   AliDielectronVarManager::SetFillMap(0x0);
   AliDielectronVarManager::SetEvent(InputEvent());
   AliDielectronVarManager::Fill(InputEvent(),values);
   AliDielectronVarManager::Fill(InputEvent(),valuesMC);
@@ -228,13 +232,12 @@ void AliAnalysisTaskDielectronFilter::UserExec(Option_t *)
       AliDielectronVarManager::Fill(AliDielectronMC::Instance()->GetMCEvent(),valuesMC);
   }
 
-  AliDielectronHistos *h=fDielectron->GetHistoManager();
-    if (h){
-      if (h->GetHistogramList()->FindObject("Event_noCuts"))
-        h->FillClass("Event_noCuts",AliDielectronVarManager::kNMaxValues,values);
-      if (hasMC && h->GetHistogramList()->FindObject("MCEvent_noCuts"))
-        h->FillClass("Event_noCuts",AliDielectronVarManager::kNMaxValues,valuesMC);
-    }
+  if (h){
+    if (h->GetHistogramList()->FindObject("Event_noCuts"))
+      h->FillClass("Event_noCuts",AliDielectronVarManager::kNMaxValues,values);
+    if (hasMC && h->GetHistogramList()->FindObject("MCEvent_noCuts"))
+      h->FillClass("Event_noCuts",AliDielectronVarManager::kNMaxValues,valuesMC);
+  }
 
   //event filter
   if (fEventFilter) {
@@ -284,8 +287,8 @@ void AliAnalysisTaskDielectronFilter::UserExec(Option_t *)
       if(!obj) continue;
       for(int j=0;j<obj->GetEntriesFast();j++){
         AliDielectronPair *pairObj = (AliDielectronPair*)obj->UncheckedAt(j);
-        Int_t id1 = ((AliVTrack*)pairObj->GetFirstDaughter())->GetID();
-        Int_t id2 = ((AliVTrack*)pairObj->GetSecondDaughter())->GetID();
+        Int_t id1 = ((AliVTrack*)pairObj->GetFirstDaughterP())->GetID();
+        Int_t id2 = ((AliVTrack*)pairObj->GetSecondDaughterP())->GetID();
         
         for(Int_t it=0;it<aod->GetNumberOfTracks();it++){
           if(aod->GetTrack(it)->GetID() == id1) pairObj->SetRefFirstDaughter(aod->GetTrack(it));