Disable ROOT automatic class parsing while checking for missing dicti…

…onaries
cms-sw · Dec 10, 2024 · 5d0a065 · 5d0a065
1 parent 48600da
commit 5d0a065
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/DataFormats/Provenance/interface/ProductRegistry.h b/DataFormats/Provenance/interface/ProductRegistry.h
@@ -60,7 +60,8 @@ namespace edm {
 
     void setFrozen(std::set<TypeID> const& productTypesConsumed,
                    std::set<TypeID> const& elementTypesConsumed,
-                   std::string const& processName);
+                   std::string const& processName,
+                   bool disableRootAutoParsing = false);
 
     void setUnscheduledProducts(std::set<std::string> const& unscheduledLabels);
 

diff --git a/DataFormats/Provenance/src/ProductRegistry.cc b/DataFormats/Provenance/src/ProductRegistry.cc
@@ -11,11 +11,12 @@
 
 #include "DataFormats/Provenance/interface/ProductResolverIndexHelper.h"
 
+#include "FWCore/Reflection/interface/DictionaryTools.h"
+#include "FWCore/Reflection/interface/SetClassParsing.h"
+#include "FWCore/Reflection/interface/TypeWithDict.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "FWCore/Reflection/interface/DictionaryTools.h"
 #include "FWCore/Utilities/interface/TypeID.h"
-#include "FWCore/Reflection/interface/TypeWithDict.h"
 #include "FWCore/Utilities/interface/WrappedClassName.h"
 
 #include "TDictAttributeMap.h"
@@ -162,11 +163,18 @@ namespace edm {
 
   void ProductRegistry::setFrozen(std::set<TypeID> const& productTypesConsumed,
                                   std::set<TypeID> const& elementTypesConsumed,
-                                  std::string const& processName) {
+                                  std::string const& processName,
+                                  bool disableRootAutoParsing) {
     if (frozen())
       return;
     freezeIt();
-    initializeLookupTables(&productTypesConsumed, &elementTypesConsumed, &processName);
+    if (disableRootAutoParsing) {
+      // disable ROOT automatic class parsing while checking for missing dictionaries
+      edm::SetClassParsing guard(false);
+      initializeLookupTables(&productTypesConsumed, &elementTypesConsumed, &processName);
+    } else {
+      initializeLookupTables(&productTypesConsumed, &elementTypesConsumed, &processName);
+    }
     sort_all(transient_.aliasToOriginal_);
   }
 

diff --git a/FWCore/Framework/src/Schedule.cc b/FWCore/Framework/src/Schedule.cc
@@ -679,7 +679,7 @@ namespace edm {
       }
       // The RandomNumberGeneratorService is not a module, yet it consumes.
       { RngEDConsumer rngConsumer = RngEDConsumer(productTypesConsumed); }
-      preg.setFrozen(productTypesConsumed, elementTypesConsumed, processConfiguration->processName());
+      preg.setFrozen(productTypesConsumed, elementTypesConsumed, processConfiguration->processName(), true);
     }
 
     for (auto& c : all_output_communicators_) {

diff --git a/FWCore/Framework/test/productregistry.cppunit.cc b/FWCore/Framework/test/productregistry.cppunit.cc
@@ -265,7 +265,7 @@ void testProductRegistry::testAddAlias() {
                                              simpleVecBranch_->unwrappedTypeID(),
                                              simpleDerivedVecBranch_->unwrappedTypeID()};
   std::set<edm::TypeID> elementTypesConsumed{intBranch_->unwrappedTypeID(), edm::TypeID(typeid(edmtest::Simple))};
-  reg.setFrozen(productTypesConsumed, elementTypesConsumed, "TEST");
+  reg.setFrozen(productTypesConsumed, elementTypesConsumed, "TEST", true);
   {
     auto notFound = reg.aliasToModules(edm::PRODUCT_TYPE, intBranch_->unwrappedTypeID(), "alias", "instance");
     CPPUNIT_ASSERT(notFound.empty());