Merge branch 'cp/dump' into '21.2'

Fix SysListDumperAlg

See merge request !47107

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/SysListDumperAlg.h

@@ -9,6 +9,7 @@
 #define ASG_ANALYSIS_ALGORITHMS__SYS_LIST_DUMPER_ALG_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
+#include <AsgServices/ServiceHandle.h>
 #include <SystematicsHandles/SysListHandle.h>
 
 namespace CP
@@ -32,10 +33,17 @@ namespace CP
   public:
     virtual ::StatusCode execute () override;
 
+    /// \brief make the systematics vector using a regex
+  private:
+    std::vector<CP::SystematicSet> makeSystematicsVector (const std::string &regex) const;
+
+    /// \brief the handle for the systematics service
+  private:
+    ServiceHandle<ISystematicsSvc> m_systematicsService {"SystematicsSvc", ""};
 
-    /// \brief the systematics list we run
+    /// \brief the regex
   private:
-    SysListHandle m_systematicsList {this};
+    std::string m_regex {};
 
     /// \brief the name of the histogram to use
   private:

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListDumperAlg.cxx

@@ -9,6 +9,7 @@
 // includes
 //
 
+#include <regex>
 #include <AsgAnalysisAlgorithms/SysListDumperAlg.h>
 #include <TH1.h>
 
@@ -23,6 +24,8 @@ namespace CP
                     ISvcLocator* pSvcLocator)
     : AnaAlgorithm (name, pSvcLocator)
   {
+    declareProperty ("systematicsService", m_systematicsService, "systematics service");
+    declareProperty ("systematicsRegex", m_regex, "systematics regex");
     declareProperty ("histogramName", m_histogramName, "the name of the output histogram");
   }
 
@@ -37,7 +40,7 @@ namespace CP
       return StatusCode::FAILURE;
     }
 
-    ANA_CHECK (m_systematicsList.initialize());
+    ANA_CHECK (m_systematicsService.retrieve());
 
     return StatusCode::SUCCESS;
   }
@@ -54,16 +57,16 @@ namespace CP
 
     m_firstEvent = false;
 
-    const auto& systematics = m_systematicsList.systematicsVector();
+    const std::vector<CP::SystematicSet> systematics = makeSystematicsVector (m_regex);
 
     ANA_CHECK (book (TH1F (m_histogramName.c_str(), "systematics", systematics.size(), 0, systematics.size())));
     TH1 *histogram = hist (m_histogramName);
 
     int i = 1;
-    for (const auto& sys : m_systematicsList.systematicsVector())
+    for (const auto& sys : systematics)
     {
       std::string name;
-      ANA_CHECK (m_systematicsList.service().makeSystematicsName (name, "%SYS%", sys));
+      ANA_CHECK (m_systematicsService->makeSystematicsName (name, "%SYS%", sys));
 
       histogram->GetXaxis()->SetBinLabel(i, name.c_str());
       i++;
@@ -71,4 +74,28 @@ namespace CP
 
     return StatusCode::SUCCESS;
   }
+
+
+
+  std::vector<CP::SystematicSet> SysListDumperAlg ::
+  makeSystematicsVector (const std::string &regex) const
+  {
+    std::vector<CP::SystematicSet> inputVector = m_systematicsService->makeSystematicsVector ();
+    if (regex.empty())
+    {
+      return inputVector;
+    }
+
+    std::vector<CP::SystematicSet> systematicsVector;
+    std::regex expr (regex);
+    for (const CP::SystematicSet& sys : inputVector)
+    {
+      if (regex_match (sys.name(), expr))
+      {
+        systematicsVector.push_back (sys);
+      }
+    }
+    return systematicsVector;
+  }
+
 }