workflow splitted to contain also an event selection; configuration updated for the analysis challenge (#4353)

* optimizations for the table-reader task
* Added a task for dilepton - hadron combinations in the tableReader workflow
* Added an event selection task in the workflow; a few small fixes

Author: iarsene

Analysis/Core/include/Analysis/AnalysisCompositeCut.h

@@ -25,6 +25,8 @@ class AnalysisCompositeCut : public AnalysisCut
  public:
   AnalysisCompositeCut(bool useAND = kTRUE);
   AnalysisCompositeCut(const char* name, const char* title, bool useAND = kTRUE);
+  AnalysisCompositeCut(const AnalysisCompositeCut& c) = default;
+  AnalysisCompositeCut& operator=(const AnalysisCompositeCut& c) = default;
   ~AnalysisCompositeCut() override;
 
   void AddCut(AnalysisCut* cut) { fCutList.push_back(*cut); };
@@ -38,9 +40,6 @@ class AnalysisCompositeCut : public AnalysisCut
   bool fOptionUseAND;                // true (default): apply AND on all cuts; false: use OR
   std::vector<AnalysisCut> fCutList; // list of cuts
 
-  AnalysisCompositeCut(const AnalysisCompositeCut& c);
-  AnalysisCompositeCut& operator=(const AnalysisCompositeCut& c);
-
   ClassDef(AnalysisCompositeCut, 1);
 };
 

Analysis/Core/include/Analysis/VarManager.h

@@ -195,7 +195,7 @@ class VarManager : public TObject
   ~VarManager() override;
 
   static float fgValues[kNVars]; // array holding all variables computed during analysis
-  static void ResetValues(int startValue = 0, int endValue = kNVars);
+  static void ResetValues(int startValue = 0, int endValue = kNVars, float* values = nullptr);
 
  private:
   static bool fgUsedVars[kNVars];        // holds flags for when the corresponding variable is needed (e.g., in the histogram manager, in cuts, mixing handler, etc.)

Analysis/Core/src/AnalysisCompositeCut.cxx

@@ -41,16 +41,15 @@ bool AnalysisCompositeCut::IsSelected(float* values)
   //
   // apply cuts
   //
-  std::vector<AnalysisCut>::iterator it = fCutList.begin();
   for (std::vector<AnalysisCut>::iterator it = fCutList.begin(); it < fCutList.end(); ++it) {
     if (fOptionUseAND && !(*it).IsSelected(values))
-      return kFALSE;
+      return false;
     if (!fOptionUseAND && (*it).IsSelected(values))
-      return kTRUE;
+      return true;
   }
 
   if (fOptionUseAND)
-    return kTRUE;
+    return true;
   else
-    return kFALSE;
+    return false;
 }

Analysis/Core/src/VarManager.cxx

@@ -45,13 +45,15 @@ void VarManager::SetVariableDependencies()
 }
 
 //__________________________________________________________________
-void VarManager::ResetValues(int startValue, int endValue)
+void VarManager::ResetValues(int startValue, int endValue, float* values)
 {
   //
   // reset all variables to an "innocent" value
   // NOTE: here we use -9999.0 as a neutral value, but depending on situation, this may not be the case
+  if (!values)
+    values = fgValues;
   for (Int_t i = startValue; i < endValue; ++i)
-    fgValues[i] = -9999.;
+    values[i] = -9999.;
 }
 
 //__________________________________________________________________