Implement TH2Poly support in DQMServices

ywkao · ywkao · commit fb37861aa536 · 2024-12-03T06:53:32.000+01:00
- Add TH2Poly support in DQMServices/Core
- Implement TH2Poly in DQMServices/Components
- Add TH2Poly support in MEtoEDMFormat.h
diff --git a/DQMServices/Components/plugins/DQMStoreStats.cc b/DQMServices/Components/plugins/DQMStoreStats.cc
@@ -668,6 +668,15 @@ 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;
+      // TH2Poly does not have GetArray() method
+      //case MonitorElement::Kind::TH2Poly:
+      //  currentSubfolder.AddBinsD(
+      //      it->getNbinsX() * it->getNbinsY(),
+      //      getEmptyMetric(it->getTH2Poly()->GetArray(), it->getNbinsX() + 2, it->getNbinsY() + 2, 0));
+      //  curr->update(it->getNbinsX() * it->getNbinsY(),
+      //               getEmptyMetric(it->getTH2Poly()->GetArray(), it->getNbinsX() + 2, it->getNbinsY() + 2, 0),
+      //               it->getNbinsX() * it->getNbinsY() * sizeof(int));
+      //  break;
       case MonitorElement::Kind::TPROFILE2D:
         currentSubfolder.AddBinsD(
             it->getNbinsX() * it->getNbinsY(),
diff --git a/DQMServices/Components/plugins/EDMtoMEConverter.cc b/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>
diff --git a/DQMServices/Components/plugins/MEtoEDMConverter.cc b/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);
diff --git a/DQMServices/Components/scripts/dqmiolistmes.py b/DQMServices/Components/scripts/dqmiolistmes.py
@@ -48,7 +48,8 @@
     "TProfiles",
     "TProfile2Ds",
     "TH1Is",
-    "TH2Is"
+    "TH2Is",
+    "TH2Polys"
   ]
   trees = [f[name]["FullName"].array() for name in treenames]
 
diff --git a/DQMServices/Core/interface/DQMNet.h b/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;
diff --git a/DQMServices/Core/interface/DQMStore.h b/DQMServices/Core/interface/DQMStore.h
@@ -274,6 +274,18 @@ namespace dqm {
         });
       }
       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,
diff --git a/DQMServices/Core/src/DQMNet.cc b/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;
diff --git a/DQMServices/Core/src/LegacyIOHelper.cc b/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);
diff --git a/DataFormats/Histograms/interface/MEtoEDMFormat.h b/DataFormats/Histograms/interface/MEtoEDMFormat.h
@@ -9,6 +9,7 @@
  *  \author M. Strang SUNY-Buffalo
  */
 
+#include <TClass.h>
 #include <TObject.h>
 #include <TH1F.h>
 #include <TH1S.h>
@@ -121,6 +122,15 @@ class MEtoEDM {
         if (MEtoEdmObject[j].object.Merge(&list) == -1) {
           std::cout << "ERROR MEtoEDM::mergeProducts(): merge failed for '" << name << "'" << std::endl;
         }
+      // } else if (MEtoEdmObject[j].object.IsA()->InheritsFrom("TH2Poly")) {
+      //   // ad-hoc addition because no matching function for call to 'TH2Poly::Add(const TH2Poly*)'
+      //   int nbins = MEtoEdmObject[j].object.GetNcells() - 9;
+      //   for(int ibin=1; ibin<nbins+1; ++ibin) {
+      //       double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
+      //       double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
+      //       double total = value1 + value2;
+      //       MEtoEdmObject[j].object.SetBinContent(ibin, total);
+      //   }
       } else {
         // this value is also in the new container: add the two
         if (MEtoEdmObject[j].object.GetNbinsX() == newMEtoEDMObject[i].object.GetNbinsX() &&
@@ -347,4 +357,52 @@ inline bool MEtoEDM<TString>::mergeProduct(const MEtoEDM<TString> &newMEtoEDM) {
   return true;
 }
 
+template <>
+inline bool MEtoEDM<TH2Poly>::mergeProduct(const MEtoEDM<TH2Poly> &newMEtoEDM) {
+  const MEtoEdmObjectVector &newMEtoEDMObject = newMEtoEDM.getMEtoEdmObject();
+  const size_t nObjects = newMEtoEDMObject.size();
+  //  NOTE: we remember the present size since we will only add content
+  //        from newMEtoEDMObject after this point
+  const size_t nOldObjects = MEtoEdmObject.size();
+
+  // if the old and new are not the same size, we want to report a problem
+  if (nObjects != nOldObjects) {
+    std::cout << "WARNING MEtoEDM::mergeProducts(): the lists of histograms to be merged have different sizes: new="
+              << nObjects << ", old=" << nOldObjects << std::endl;
+  }
+
+  for (unsigned int i = 0; i < nObjects; ++i) {
+    unsigned int j = 0;
+    // see if the name is already in the old container up to the point where
+    // we may have added new entries in the container
+    const std::string &name = newMEtoEDMObject[i].name;
+    if (i < nOldObjects && (MEtoEdmObject[i].name == name)) {
+      j = i;
+    } else {
+      j = 0;
+      while (j < nOldObjects && (MEtoEdmObject[j].name != name))
+        ++j;
+    }
+    if (j >= nOldObjects) {
+      // this value is only in the new container, not the old one
+#if METOEDMFORMAT_DEBUG
+      std::cout << "WARNING MEtoEDM::mergeProducts(): adding new histogram '" << name << "'" << std::endl;
+#endif
+      MEtoEdmObject.emplace_back(std::move(newMEtoEDMObject[i]));
+    } else if (MEtoEdmObject[j].object.IsA()->InheritsFrom("TH2Poly")) {
+      //MEtoEdmObject[j].object.Add((TH1*)newMEtoEDMObject[i].object, 1);
+
+      // ad-hoc addition because no matching function for call to 'TH2Poly::Add(const TH2Poly*)'
+      int nbins = MEtoEdmObject[j].object.GetNcells() - 9;
+      for(int ibin=1; ibin<nbins+1; ++ibin) {
+          double value1 = MEtoEdmObject[j].object.GetBinContent(ibin);
+          double value2 = newMEtoEDMObject[i].object.GetBinContent(ibin);
+          double total = value1 + value2;
+          MEtoEdmObject[j].object.SetBinContent(ibin, total);
+      }
+    }
+  }
+  return true;
+}
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@`
`48`	`48`	`"TProfiles",`
`49`	`49`	`"TProfile2Ds",`
`50`	`50`	`"TH1Is",`
`51`		`- "TH2Is"`
	`51`	`+ "TH2Is",`
	`52`	`+ "TH2Polys"`
`52`	`53`	`]`
`53`	`54`	`trees = [f[name]["FullName"].array() for name in treenames]`
`54`	`55`