Merge pull request #47478 from ywkao/th2poly-getarray-implementation

Implement TH2Poly in DQM Services and add GetArray support

Author: cmsbuild

DQMServices/Components/plugins/DQMStoreStats.cc

@@ -338,6 +338,7 @@ class DQMStoreStats : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one:
 
 private:
   int calcstats(int);
+  std::vector<double> GetTH2PolyArray(TH2Poly* poly);
   void calcIgProfDump(Folder&);
   void dumpMemoryProfile();
   std::pair<unsigned int, unsigned int> readMemoryEntry() const;
@@ -514,6 +515,15 @@ void DQMStoreStats::calcIgProfDump(Folder& root) {
   stream << sql_statement << std::endl;
 }
 
+std::vector<double> DQMStoreStats::GetTH2PolyArray(TH2Poly* poly) {
+  int nBins = poly->GetNumberOfBins();
+  std::vector<double> array(nBins + 1, 0.0);  // Initialize with zeros
+  for (int i = 1; i <= nBins; i++) {
+    array[i] = poly->GetBinContent(i);
+  }
+  return array;
+}
+
 ///
 /// do the stats here and produce output;
 ///
@@ -668,6 +678,13 @@ int DQMStoreStats::calcstats(int mode = DQMStoreStats::considerAllME) {
                      getEmptyMetric(it->getTH2I()->GetArray(), it->getNbinsX() + 2, it->getNbinsY() + 2, 0),
                      it->getNbinsX() * it->getNbinsY() * sizeof(int));
         break;
+      case MonitorElement::Kind::TH2Poly: {
+        std::vector<double> polyArray = GetTH2PolyArray(it->getTH2Poly());
+        int nBins = polyArray.size() - 1;
+        currentSubfolder.AddBinsD(nBins, getEmptyMetric(polyArray.data(), nBins + 1, 1, 0));
+        curr->update(nBins, getEmptyMetric(polyArray.data(), nBins + 1, 1, 0), nBins * sizeof(double));
+        break;
+      }
       case MonitorElement::Kind::TPROFILE2D:
         currentSubfolder.AddBinsD(
             it->getNbinsX() * it->getNbinsY(),

DQMServices/Components/plugins/EDMtoMEConverter.cc

@@ -107,6 +107,7 @@ class EDMtoMEConverter : public edm::one::EDProducer<edm::one::WatchRuns,
              Tokens<TH2S>,
              Tokens<TH2D>,
              Tokens<TH2I>,
+             Tokens<TH2Poly>,
              Tokens<TH3F>,
              Tokens<TProfile>,
              Tokens<TProfile2D>,
@@ -235,6 +236,14 @@ namespace {
     }
   };
   template <>
+  struct HistoTraits<TH2Poly> {
+    static TH2Poly *get(MonitorElement *me) { return me->getTH2Poly(); }
+    template <typename... Args>
+    static MonitorElement *book(DQMStore::IBooker &iBooker, Args &&...args) {
+      return iBooker.book2DPoly(std::forward<Args>(args)...);
+    }
+  };
+  template <>
   struct HistoTraits<TH3F> {
     static TH3F *get(MonitorElement *me) { return me->getTH3F(); }
     template <typename... Args>

DQMServices/Components/plugins/MEtoEDMConverter.cc

@@ -50,6 +50,7 @@
 #include "TH2S.h"
 #include "TH2D.h"
 #include "TH2I.h"
+#include "TH2Poly.h"
 #include "TH3F.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
@@ -139,6 +140,7 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet& iPSet) : fName(""),
   produces<MEtoEDM<TH2S>, edm::Transition::EndRun>(sName);
   produces<MEtoEDM<TH2D>, edm::Transition::EndRun>(sName);
   produces<MEtoEDM<TH2I>, edm::Transition::EndRun>(sName);
+  produces<MEtoEDM<TH2Poly>, edm::Transition::EndRun>(sName);
   produces<MEtoEDM<TH3F>, edm::Transition::EndRun>(sName);
   produces<MEtoEDM<TProfile>, edm::Transition::EndRun>(sName);
   produces<MEtoEDM<TProfile2D>, edm::Transition::EndRun>(sName);
@@ -155,6 +157,7 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet& iPSet) : fName(""),
   produces<MEtoEDM<TH2S>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TH2D>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TH2I>, edm::Transition::EndLuminosityBlock>(sName);
+  produces<MEtoEDM<TH2Poly>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TH3F>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TProfile>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TProfile2D>, edm::Transition::EndLuminosityBlock>(sName);
@@ -220,6 +223,7 @@ void MEtoEDMConverter::putData(DQMStore::IGetter& iGetter, T& iPutTo, bool iLumi
   unsigned int n2S = 0;
   unsigned int n2D = 0;
   unsigned int n2I = 0;
+  unsigned int n2P = 0;
   unsigned int n3F = 0;
   unsigned int nProf = 0;
   unsigned int nProf2 = 0;
@@ -282,6 +286,10 @@ void MEtoEDMConverter::putData(DQMStore::IGetter& iGetter, T& iPutTo, bool iLumi
         ++n2I;
         break;
 
+      case MonitorElement::Kind::TH2Poly:
+        ++n2P;
+        break;
+
       case MonitorElement::Kind::TH3F:
         ++n3F;
         break;
@@ -313,6 +321,7 @@ void MEtoEDMConverter::putData(DQMStore::IGetter& iGetter, T& iPutTo, bool iLumi
   std::unique_ptr<MEtoEDM<TH2S> > pOut2s(new MEtoEDM<TH2S>(n2S));
   std::unique_ptr<MEtoEDM<TH2D> > pOut2d(new MEtoEDM<TH2D>(n2D));
   std::unique_ptr<MEtoEDM<TH2I> > pOut2i(new MEtoEDM<TH2I>(n2I));
+  std::unique_ptr<MEtoEDM<TH2Poly> > pOut2p(new MEtoEDM<TH2Poly>(n2P));
   std::unique_ptr<MEtoEDM<TH3F> > pOut3(new MEtoEDM<TH3F>(n3F));
   std::unique_ptr<MEtoEDM<TProfile> > pOutProf(new MEtoEDM<TProfile>(nProf));
   std::unique_ptr<MEtoEDM<TProfile2D> > pOutProf2(new MEtoEDM<TProfile2D>(nProf2));
@@ -371,6 +380,10 @@ void MEtoEDMConverter::putData(DQMStore::IGetter& iGetter, T& iPutTo, bool iLumi
         pOut2i->putMEtoEdmObject(me->getFullname(), *me->getTH2I());
         break;
 
+      case MonitorElement::Kind::TH2Poly:
+        pOut2p->putMEtoEdmObject(me->getFullname(), *me->getTH2Poly());
+        break;
+
       case MonitorElement::Kind::TH3F:
         pOut3->putMEtoEdmObject(me->getFullname(), *me->getTH3F());
         break;
@@ -411,6 +424,7 @@ void MEtoEDMConverter::putData(DQMStore::IGetter& iGetter, T& iPutTo, bool iLumi
   iPutTo.put(std::move(pOut2s), sName);
   iPutTo.put(std::move(pOut2d), sName);
   iPutTo.put(std::move(pOut2i), sName);
+  iPutTo.put(std::move(pOut2p), sName);
   iPutTo.put(std::move(pOut3), sName);
   iPutTo.put(std::move(pOutProf), sName);
   iPutTo.put(std::move(pOutProf2), sName);

DQMServices/Components/scripts/dqmiolistmes.py

@@ -44,6 +44,7 @@
     "TH2Fs",
     "TH2Ss",
     "TH2Ds",
+    "TH2Polys",
     "TH3Fs",
     "TProfiles",
     "TProfile2Ds",

DQMServices/Core/interface/DQMNet.h

@@ -38,6 +38,7 @@ class DQMNet {
   static const uint32_t DQM_PROP_TYPE_TH2S = 0x00000021;
   static const uint32_t DQM_PROP_TYPE_TH2D = 0x00000022;
   static const uint32_t DQM_PROP_TYPE_TH2I = 0x00000023;
+  static const uint32_t DQM_PROP_TYPE_TH2Poly = 0x00000024;
   static const uint32_t DQM_PROP_TYPE_TH3F = 0x00000030;
   static const uint32_t DQM_PROP_TYPE_TH3S = 0x00000031;
   static const uint32_t DQM_PROP_TYPE_TH3D = 0x00000032;

DQMServices/Core/interface/DQMStore.h

@@ -36,7 +36,7 @@ namespace dqm {
       virtual ~NavigatorBase() {}
 
     protected:
-      NavigatorBase(){};
+      NavigatorBase() {};
       std::string cwd_ = "";
     };
 
@@ -260,6 +260,32 @@ namespace dqm {
             /* forceReplace */ true);
       }
       template <typename FUNC = NOOP, std::enable_if_t<not std::is_arithmetic<FUNC>::value, int> = 0>
+      MonitorElement* book2DPoly(TString const& name,
+                                 TString const& title,
+                                 double lowX,
+                                 double highX,
+                                 double lowY,
+                                 double highY,
+                                 FUNC onbooking = NOOP()) {
+        return bookME(name, MonitorElementData::Kind::TH2Poly, [=]() {
+          auto th2poly = new TH2Poly(name, title, lowX, highX, lowY, highY);
+          onbooking(th2poly);
+          return th2poly;
+        });
+      }
+      template <typename FUNC = NOOP, std::enable_if_t<not std::is_arithmetic<FUNC>::value, int> = 0>
+      MonitorElement* book2DPoly(TString const& name, TH2Poly* object, FUNC onbooking = NOOP()) {
+        return bookME(
+            name,
+            MonitorElementData::Kind::TH2Poly,
+            [=]() {
+              auto th2 = static_cast<TH2Poly*>(object->Clone(name));
+              onbooking(th2);
+              return th2;
+            },
+            /* forceReplace */ true);
+      }
+      template <typename FUNC = NOOP, std::enable_if_t<not std::is_arithmetic<FUNC>::value, int> = 0>
       MonitorElement* book2S(TString const& name,
                              TString const& title,
                              int nchX,

DQMServices/Core/interface/MonitorElement.h

@@ -21,11 +21,13 @@
 #include "TH2S.h"
 #include "TH2I.h"
 #include "TH2D.h"
+#include "TH2Poly.h"
 #include "TH3F.h"
 #include "TProfile.h"
 #include "TProfile2D.h"
 #include "TObjString.h"
 #include "TAxis.h"
+#include "TGraph.h"
 
 #include <mutex>
 #include <memory>
@@ -55,7 +57,7 @@ namespace dqm {
     static const int STATUS_OK = 100;   //< Test was succesful.
     static const int WARNING = 200;     //< Test had some problems.
     static const int ERROR = 300;       //< Test has failed.
-  }                                     // namespace qstatus
+  }  // namespace qstatus
 
   namespace me_util {
     using Channel = DQMChannel;
@@ -374,6 +376,7 @@ namespace dqm::impl {
     virtual int getNbinsY() const;
     virtual int getNbinsZ() const;
     virtual int getBin(int binx, int biny) const;
+    virtual int getNcells() const;
     virtual std::string getAxisTitle(int axis = 1) const;
     virtual std::string getTitle() const;
 
@@ -398,6 +401,9 @@ namespace dqm::impl {
     virtual const std::string &getStringValue() const;
 
     // non-const -- thread safety and semantical issues
+    virtual void addBin(TGraph *graph);
+    virtual void addBin(int n, const double *x, const double *y);
+    virtual void addBin(double x1, double y1, double x2, double y2);
     virtual void setBinContent(int binx, double content);
     virtual void setBinContent(int binx, int biny, double content);
     virtual void setBinContent(int binx, int biny, int binz, double content);
@@ -443,6 +449,7 @@ namespace dqm::impl {
     virtual TH2S *getTH2S();
     virtual TH2I *getTH2I();
     virtual TH2D *getTH2D();
+    virtual TH2Poly *getTH2Poly();
     virtual TH3F *getTH3F();
     virtual TProfile *getTProfile();
     virtual TProfile2D *getTProfile2D();
@@ -511,6 +518,10 @@ namespace dqm::legacy {
     virtual TH2D *getTH2D() const {
       return const_cast<dqm::legacy::MonitorElement *>(this)->dqm::reco::MonitorElement::getTH2D();
     };
+    using dqm::reco::MonitorElement::getTH2Poly;
+    virtual TH2Poly *getTH2Poly() const {
+      return const_cast<dqm::legacy::MonitorElement *>(this)->dqm::reco::MonitorElement::getTH2Poly();
+    };
     using dqm::reco::MonitorElement::getTH3F;
     virtual TH3F *getTH3F() const {
       return const_cast<dqm::legacy::MonitorElement *>(this)->dqm::reco::MonitorElement::getTH3F();

DQMServices/Core/src/DQMNet.cc

@@ -327,6 +327,10 @@ DQMNet::reinstateObject(DQMStore *store, Object &o)
     obj = store->book2I(name, dynamic_cast<TH2I *>(o.object));
     break;
 
+  case DQM_PROP_TYPE_TH2Poly:
+    obj = store->book2DPoly(name, dynamic_cast<TH2Poly *>(o.object));
+    break;
+
   case DQM_PROP_TYPE_TH3F:
     obj = store->book3D(name, dynamic_cast<TH3F *>(o.object));
     break;

DQMServices/Core/src/LegacyIOHelper.cc

@@ -253,6 +253,13 @@ bool LegacyIOHelper::readdir(TDirectory *dir, const std::string &toppath) {
           getMEName<TH2I>(h, toppath, meName);
           data_.insert(dbe_->book2I(meName, h));
         }
+      } else if (cl->InheritsFrom("TH2Poly")) {
+        TH2Poly *h = dynamic_cast<TH2Poly *>(key->ReadObject<TH2Poly>()->Clone());
+        h->SetDirectory(nullptr);
+        if (h) {
+          getMEName<TH2Poly>(h, toppath, meName);
+          data_.insert(dbe_->book2DPoly(meName, h));
+        }
       } else if (cl->InheritsFrom("TH3F")) {
         TH3F *h = dynamic_cast<TH3F *>(key->ReadObject<TH3F>()->Clone());
         h->SetDirectory(nullptr);