DPL Analysis: fix configurables placeholders in expressions (#5803)

Author: aalkin

Analysis/Tutorials/src/filters.cxx

@@ -52,25 +52,26 @@ struct BTask {
   Spawns<aod::MTracks> mtrk;
 
   float fPI = static_cast<float>(M_PI);
-  float ptlow = 0.5f;
-  float ptup = 2.0f;
+  Configurable<float> ptlow{"ptlow", 0.5f, ""};
+  Configurable<float> ptup{"ptup", 2.0f, ""};
   Filter ptFilter_a = aod::track::pt > ptlow;
   Filter ptFilter_b = aod::track::pt < ptup;
 
-  float etalow = -1.0f;
-  float etaup = 1.0f;
+  Configurable<float> etalow{"etalow", -1.0f, ""};
+  Configurable<float> etaup{"etaup", 1.0f, ""};
   Filter etafilter = (aod::track::eta < etaup) && (aod::track::eta > etalow);
 
   float philow = 1.0f;
   float phiup = 2.0f;
   Filter phifilter = (aod::etaphi::nphi < phiup) && (aod::etaphi::nphi > philow);
 
-  Filter posZfilter = nabs(aod::collision::posZ) < 10.0f;
+  Configurable<float> vtxZ{"vtxZ", 10.f, ""};
+  Filter posZfilter = nabs(aod::collision::posZ) < vtxZ;
 
   void process(soa::Filtered<aod::Collisions>::iterator const& collision, soa::Filtered<soa::Join<aod::Tracks, aod::TPhi>> const& tracks)
   {
-    LOGF(INFO, "Collision: %d [N = %d out of %d], -10 < %.3f < 10",
-         collision.globalIndex(), tracks.size(), tracks.tableSize(), collision.posZ());
+    LOGF(INFO, "Collision: %d [N = %d out of %d], -%.1f < %.3f < %.1f",
+         collision.globalIndex(), tracks.size(), tracks.tableSize(), vtxZ, collision.posZ(), vtxZ);
     for (auto& track : tracks) {
       LOGF(INFO, "id = %d; eta:  %.3f < %.3f < %.3f; phi: %.3f < %.3f < %.3f; pt: %.3f < %.3f < %.3f",
            track.collisionId(), etalow, track.eta(), etaup, philow, track.nphi(), phiup, ptlow, track.pt(), ptup);

Framework/Core/include/Framework/AnalysisTask.h

@@ -677,11 +677,11 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
     if constexpr (has_process_v<T>) {
       /// update configurables in filters
       std::apply(
-        [&ic](auto&&... x) { return (FilterManager<std::decay_t<decltype(x)>>::updatePlaceholders(x, ic), ...); },
+        [&ic](auto&... x) { return (FilterManager<std::decay_t<decltype(x)>>::updatePlaceholders(x, ic), ...); },
         tupledTask);
       /// update configurables in partitions
       std::apply(
-        [&ic](auto&&... x) { return (PartitionManager<std::decay_t<decltype(x)>>::updatePlaceholders(x, ic), ...); },
+        [&ic](auto&... x) { return (PartitionManager<std::decay_t<decltype(x)>>::updatePlaceholders(x, ic), ...); },
         tupledTask);
       /// create for filters gandiva trees matched to schemas and store the pointers into expressionInfos
       std::apply([&expressionInfos](auto&... x) {

Framework/Core/include/Framework/Expressions.h

@@ -123,10 +123,7 @@ struct PlaceholderNode : LiteralNode {
     if constexpr (variant_trait_v<typename std::decay<T>::type> != VariantType::Unknown) {
       retrieve = [](InitContext& context, std::string const& name) { return LiteralNode::var_t{context.options().get<T>(name.c_str())}; };
     } else {
-      retrieve = [](InitContext& context, std::string const& name) {
-        auto pt = context.options().get<boost::property_tree::ptree>(name.c_str());
-        return LiteralNode::var_t{RootConfigParamHelpers::as<T>(pt)};
-      };
+      runtime_error("Unknown parameter used in expression.");
     }
   }
 

Framework/Core/src/Expressions.cxx

@@ -132,31 +132,20 @@ void updatePlaceholders(Filter& filter, InitContext& context)
     }
   };
 
-  auto isLeaf = [](Node const* const node) {
-    return ((node->left == nullptr) && (node->right == nullptr));
-  };
-
   // while the stack is not empty
   while (path.empty() == false) {
     auto& top = path.top();
-
     updateNode(top.node_ptr);
 
+    auto leftp = top.node_ptr->left.get();
+    auto rightp = top.node_ptr->right.get();
     path.pop();
 
-    if (top.node_ptr->left != nullptr) {
-      if (isLeaf(top.node_ptr->left.get())) {
-        updateNode(top.node_ptr->left.get());
-      } else {
-        path.emplace(top.node_ptr->left.get(), 0);
-      }
+    if (leftp != nullptr) {
+      path.emplace(leftp, 0);
     }
-    if (top.node_ptr->right != nullptr) {
-      if (isLeaf(top.node_ptr->right.get())) {
-        updateNode(top.node_ptr->right.get());
-      } else {
-        path.emplace(top.node_ptr->right.get(), 0);
-      }
+    if (rightp != nullptr) {
+      path.emplace(rightp, 0);
     }
   }
 }