reduce output array, add filtered aod merging

diff --git a/PWGDQ/dielectron/AliDielectronHF.cxx b/PWGDQ/dielectron/AliDielectronHF.cxx
index 1bfb813d9e500e612573d413caf215716bce7162..545fe1d4a116811c3419bcfdfc5087f21b41e934 100644 (file)
--- a/PWGDQ/dielectron/AliDielectronHF.cxx
+++ b/PWGDQ/dielectron/AliDielectronHF.cxx
@@ -557,7 +557,7 @@ void AliDielectronHF::Init()
   Int_t istep=0;
   if(fPairType != kMConly) {
     for(istep=0; istep<AliDielectron::kEv1PMRot+1; istep++) {
-      //    for(Int_t i=steps; i<steps+AliDielectron::kEv1PMRot+1; i++) {
+
       if(IsPairTypeSelected(istep)) {
        // add a deep copy of the array
        fArrPairType[istep]=(TObjArray*)histArr->Clone(AliDielectron::PairClassName(istep));
@@ -568,12 +568,6 @@ void AliDielectronHF::Init()
        ((TObjArray*)fArrPairType[istep])->SetOwner();
        ((TObjArray*)fArrPairType[istep])->SetName(AliDielectron::PairClassName(istep));
       }
-      // fArrPairType[istep]=(TObjArray*)histArr->Clone(AliDielectron::PairClassName(istep));
-      // ((TObjArray*)fArrPairType[istep])->SetOwner();
-      // if(!IsPairTypeSelected(istep)) {
-      //       ((TObjArray*)fArrPairType[istep])->Delete();
-      //       ((TObjArray*)fArrPairType[istep])->Expand(0);
-      // }
     } //end: loop over pair types
   }
 
@@ -615,8 +609,8 @@ Bool_t AliDielectronHF::IsPairTypeSelected(Int_t itype)
 {
   //
   // check whether a pair type was selected
-  //
-  
+  // TODO: cross check or replace by mixinghandlers processsing
+
   Bool_t selected = kFALSE;
 
   // fill all
@@ -635,6 +629,8 @@ Bool_t AliDielectronHF::IsPairTypeSelected(Int_t itype)
     if(fPairType==kMeAll || fPairType==kSeMeAll)   selected = kTRUE;
     break;
   case AliDielectron::kEv1PEv2M:
+    if(fPairType==kMeAll || fPairType==kSeMeAll) selected = kTRUE;
+    break;
   case AliDielectron::kEv1MEv2P:
     if(fPairType==kMeAll || fPairType==kSeMeAll || fPairType==kMeOnlyOS || fPairType==kSeMeOnlyOS)   selected = kTRUE;
     break;

diff --git a/PWGDQ/dielectron/AliDielectronHFhelper.cxx b/PWGDQ/dielectron/AliDielectronHFhelper.cxx
index acd46a900b94d3e8e41f732e327b613b46287dc7..4c1d40e04efa8b203b4266194c9764cbf2f699b4 100644 (file)
--- a/PWGDQ/dielectron/AliDielectronHFhelper.cxx
+++ b/PWGDQ/dielectron/AliDielectronHFhelper.cxx
@@ -118,7 +118,7 @@ void AliDielectronHFhelper::SetHFArray(const char* filename, const char* contain
        if( objname.Contains(Form("%s_HF",container)) && obj->IsA()==TObjArray::Class()) {
          fMainArr = new TObjArray( *(dynamic_cast<TObjArray*>(obj)) );
          fMainArr->SetOwner();
-         //fMainArr->Print();
+         //      fMainArr->Print();
          return;
        }
       }
@@ -240,6 +240,7 @@ TObjArray* AliDielectronHFhelper::CollectProfiles(TString option,
   if(varx < AliDielectronVarManager::kNMaxValues) dim++;
   if(vary < AliDielectronVarManager::kNMaxValues) dim++;
   if(varz < AliDielectronVarManager::kNMaxValues) dim++;
+  if(vart < AliDielectronVarManager::kNMaxValues) dim++;
   Bool_t bPairClass=0;
   if( varx < AliDielectronVarManager::kPairMax ||
       vary < AliDielectronVarManager::kPairMax ||

diff --git a/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C b/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
index 3443036272250c0028650ec09d5eec94e9df22b1..147195071be97e4fab5d5f581f57f356b3a7d4ed 100644 (file)
--- a/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
+++ b/PWGDQ/dielectron/macrosJPSI/AddTaskJPSIFilter.C
@@ -18,6 +18,14 @@ AliAnalysisTask *AddTaskJPSIFilter(Bool_t storeLS = kFALSE, Bool_t hasMC_aod = k
   //Do we run on AOD?
   Bool_t isAOD=mgr->GetInputEventHandler()->IsA()==AliAODInputHandler::Class();
 
+  //Allow merging of the filtered aods on grid trains
+  if(mgr->GetGridHandler()) {
+    printf(" SET MERGE FILTERED AODs \n");
+    mgr->GetGridHandler()->SetMergeAOD(kTRUE);
+  }
+
+
+
   //gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macros/ConfigBJpsi_ff_PbPbFilter.C");
   //  gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macrosJPSI/ConfigBJpsi_ff_PbPbFilter.C");
   gROOT->LoadMacro("$ALICE_ROOT/PWGDQ/dielectron/macrosJPSI/ConfigJpsi_nano_PbPb.C");
@@ -90,6 +98,7 @@ AliAnalysisTask *AddTaskJPSIFilter(Bool_t storeLS = kFALSE, Bool_t hasMC_aod = k
   
   
   mgr->ConnectInput(task,  0, mgr->GetCommonInputContainer());
+  mgr->ConnectOutput(task, 0, mgr->GetCommonOutputContainer());
   mgr->ConnectOutput(task, 1, cOutputHist1);
   mgr->ConnectOutput(task, 2, cOutputHist2);