Better process order handling

Author: Dr15Jones

DataFormats/Provenance/interface/ProductRegistry.h

@@ -182,6 +182,7 @@ namespace edm {
           iter->second.merge(prod.second);
         }
       }
+      mergeProcessOrderFromAddInput(iReg.processOrder());
     }
 
   private:
@@ -206,6 +207,7 @@ namespace edm {
 
     void checkForDuplicateProcessName(ProductDescription const& desc, std::string const* processName) const;
     void updateProcessOrder(std::vector<std::string> const& processOrder);
+    void mergeProcessOrderFromAddInput(std::vector<std::string> const& processOrder);
 
     void throwIfNotFrozen() const;
     void throwIfFrozen() const;

DataFormats/Provenance/src/ProductRegistry.cc

@@ -218,6 +218,17 @@ namespace edm {
     processingOrderMerge(processOrder, transient_.processOrder_);
   }
 
+  void ProductRegistry::mergeProcessOrderFromAddInput(std::vector<std::string> const& processOrder) {
+    if (processOrder.empty())
+      return;
+    //see if the input already has the current process
+    if (not transient_.processOrder_.empty() and (transient_.processOrder_[0] != processOrder[0])) {
+      transient_.processOrder_.insert(transient_.processOrder_.end(), processOrder.begin(), processOrder.end());
+    } else {
+      updateProcessOrder(processOrder);
+    }
+  }
+
   void ProductRegistry::setUnscheduledProducts(std::set<std::string> const& unscheduledLabels) {
     throwIfFrozen();
 
@@ -250,9 +261,20 @@ namespace edm {
   std::string ProductRegistry::merge(ProductRegistry const& other,
                                      std::string const& fileName,
                                      ProductDescription::MatchMode branchesMustMatch) {
-    if (branchesMustMatch == ProductDescription::FromInputToCurrent and transient_.processOrder_.size() == 1) {
-      transient_.processOrder_.insert(
-          transient_.processOrder_.end(), other.transient_.processOrder_.begin(), other.transient_.processOrder_.end());
+    if (branchesMustMatch == ProductDescription::FromInputToCurrent) {
+      if (processOrder().size() == 1 and not other.processOrder().empty() and
+          processOrder()[0] != other.processOrder()[0]) {
+        assert(transient_.processOrder_.size() == 1);
+        transient_.processOrder_.insert(transient_.processOrder_.end(),
+                                        other.transient_.processOrder_.begin(),
+                                        other.transient_.processOrder_.end());
+      } else {
+        //the current process must not change
+        assert(not processOrder().empty());
+        auto current = processOrder()[0];
+        processingOrderMerge(other.processOrder(), transient_.processOrder_);
+        assert(current == processOrder()[0]);
+      }
     } else {
       processingOrderMerge(other.processOrder(), transient_.processOrder_);
     }
@@ -310,6 +332,7 @@ namespace edm {
     std::vector<std::string> producedTypes;
 
     transient_.branchIDToIndex_.clear();
+    assert(productList_.empty() or processOrder().size() > 0);
 
     std::array<std::shared_ptr<ProductResolverIndexHelper>, NumBranchTypes> new_productLookups{
         {std::make_shared<ProductResolverIndexHelper>(),
@@ -452,7 +475,7 @@ namespace edm {
 
     std::string_view processNameSV(processName ? std::string_view(*processName) : std::string_view());
     for (auto& iterProductLookup : new_productLookups) {
-      iterProductLookup->setFrozen(processNameSV);
+      iterProductLookup->setFrozen(processOrder());
     }
     for (size_t i = 0; i < new_productLookups.size(); ++i) {
       transient_.productLookups_[i] = std::move(new_productLookups[i]);

FWCore/Framework/interface/SignallingProductRegistryFiller.h

@@ -80,6 +80,8 @@ namespace edm {
       registry_.setProcessOrder(std::vector<std::string>(1, processOrder));
     }
 
+    void setProcessOrder(std::vector<std::string> const& processOrder) { registry_.setProcessOrder(processOrder); }
+
     template <class T>
     void watchProductAdditions(const T& iFunc) {
       serviceregistry::connect_but_block_self(productAddedSignal_, iFunc);

FWCore/Framework/test/productregistry.cppunit.cc

@@ -238,6 +238,7 @@ void testProductRegistry::testAddAlias() {
                                              simpleVecBranch_->unwrappedTypeID(),
                                              simpleDerivedVecBranch_->unwrappedTypeID()};
   std::set<edm::TypeID> elementTypesConsumed{intBranch_->unwrappedTypeID(), edm::TypeID(typeid(edmtest::Simple))};
+  reg.setProcessOrder({"PROD"});
   reg.setFrozen(productTypesConsumed, elementTypesConsumed, "TEST");
   {
     auto notFound =

FWCore/Integration/plugins/PutOrMergeTestSource.cc

@@ -78,6 +78,7 @@ void PutOrMergeTestSource::registerProducts() {
   productRegistryUpdate().copyProduct(thingDesc_);
   productRegistryUpdate().copyProduct(thingWithMergeDesc_);
   productRegistryUpdate().copyProduct(thingWithEqualDesc_);
+  productRegistryUpdate().setProcessOrder({"PROD"});
 }
 
 InputSource::ItemTypeInfo PutOrMergeTestSource::getNextItemType() {

FWCore/Sources/src/PuttableSourceBase.cc

@@ -41,6 +41,7 @@ PuttableSourceBase::PuttableSourceBase(ParameterSet const& iPSet, InputSourceDes
 
 void PuttableSourceBase::registerProducts() {
   SignallingProductRegistryFiller reg;
+  reg.setProcessOrder({moduleDescription().processName()});
   //this handled case were Source's construct injects items into the ProductRegistry
   reg.addFromInput(productRegistryUpdate());
   registerProducts(this, &reg, moduleDescription());

FWCore/TestProcessor/src/TestProcessor.cc

@@ -45,6 +45,7 @@
 #include "FWCore/ParameterSet/interface/ProcessDesc.h"
 #include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
 
+#include "DataFormats/Provenance/interface/processingOrderMerge.h"
 #include "FWCore/Utilities/interface/ExceptionCollector.h"
 
 #include "oneTimeInitialization.h"
@@ -121,6 +122,11 @@ namespace edm {
         processHistory_.emplace_back(p, psetid, xstr(PROJECT_VERSION), HardwareResourcesDescription());
         processHistoryRegistry_.registerProcessHistory(processHistory_);
       }
+      std::vector<std::string> orderedProcesses;
+      processingOrderMerge(processHistoryRegistry_, orderedProcesses);
+      orderedProcesses.insert(orderedProcesses.begin(), processConfiguration_->processName());
+
+      tempReg->setProcessOrder(orderedProcesses);
 
       //setup the products we will be adding to the event
       for (auto const& produce : iConfig.produceEntries()) {