Merge pull request #27473 from Dr15Jones/moreExceptionInfoDQMSource

Added additional exception info to DQMRootSource
cms-sw · Jul 10, 2019 · c7fe46e · c7fe46e
2 parents 937e431 + d4009a8
commit c7fe46e
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/DQMServices/FwkIO/plugins/DQMRootSource.cc b/DQMServices/FwkIO/plugins/DQMRootSource.cc
@@ -219,20 +219,25 @@ namespace {
     MonitorElement* doRead(ULong64_t iIndex, DQMStore& iStore, bool iIsLumi) override {
       m_tree->GetEntry(iIndex);
       MonitorElement* element = iStore.get(*m_fullName);
-      if (nullptr == element) {
-        std::string path;
-        const char* name;
-        splitName(*m_fullName, path, name);
-        iStore.setCurrentFolder(path);
-        element = createElement(iStore, name, m_buffer);
-        if (iIsLumi) {
-          element->setLumiFlag();
+      try {
+        if (nullptr == element) {
+          std::string path;
+          const char* name;
+          splitName(*m_fullName, path, name);
+          iStore.setCurrentFolder(path);
+          element = createElement(iStore, name, m_buffer);
+          if (iIsLumi) {
+            element->setLumiFlag();
+          }
+        } else {
+          mergeWithElement(element, m_buffer);
         }
-      } else {
-        mergeWithElement(element, m_buffer);
-      }
-      if (0 != m_tag) {
-        iStore.tag(element, m_tag);
+        if (0 != m_tag) {
+          iStore.tag(element, m_tag);
+        }
+      } catch (cms::Exception& e) {
+        e.addContext(std::string("While reading element ") + *m_fullName);
+        e.raise();
       }
       return element;
     }