Merge pull request #18022 from wddgit/from-CMSSW_9_1_X_2017-03-20-2300

Fix problem introduced by recent PR #17950 related to dropOnInput
cms-sw · Mar 22, 2017 · c3b387a · c3b387a
2 parents 1e88593 + 7132cfa
commit c3b387a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/FWCore/Framework/interface/GetterOfProducts.h b/FWCore/Framework/interface/GetterOfProducts.h
@@ -132,8 +132,9 @@ namespace edm {
 
       void operator()(edm::BranchDescription const& branchDescription) {
 
-         if (branchDescription.unwrappedTypeID() == edm::TypeID(typeid(T)) &&
-             branchDescription.branchType() == branchType_) {
+         if (branchDescription.dropped()) return;
+         if (branchDescription.branchType() == branchType_ &&
+             branchDescription.unwrappedTypeID() == edm::TypeID(typeid(T))) {
 
             auto const& token =matcher_(branchDescription);
             if (not token.isUninitialized()) {

diff --git a/FWCore/Integration/test/testRunMergeTEST11_cfg.py b/FWCore/Integration/test/testRunMergeTEST11_cfg.py
@@ -39,7 +39,6 @@
                                         'm1', 'm2', 'm3',
                                         'makeThingToBeDropped',
                                         'makeThingToBeDropped1',
-                                        'makeThingToBeDropped2',
                                         'thingWithMergeProducer',
                                         'tryNoPut'
                                         ),
@@ -61,7 +60,6 @@
                                         'm1', 'm2', 'm3',
                                         'makeThingToBeDropped',
                                         'makeThingToBeDropped1',
-                                        'makeThingToBeDropped2',
                                         'thingWithMergeProducer',
                                         'tryNoPut'
                                         ),
@@ -84,7 +82,6 @@
                                         'm1','m1', 'm2','m2', 'm3','m3',
                                         'makeThingToBeDropped','makeThingToBeDropped',
                                         'makeThingToBeDropped1','makeThingToBeDropped1',
-                                        'makeThingToBeDropped2',
                                         'thingWithMergeProducer','thingWithMergeProducer',
                                         'tryNoPut','tryNoPut'
                                         ),
@@ -108,7 +105,6 @@
                                         'm1','m1', 'm2','m2', 'm3','m3',
                                         'makeThingToBeDropped','makeThingToBeDropped',
                                         'makeThingToBeDropped1','makeThingToBeDropped1',
-                                        'makeThingToBeDropped2',
                                         'thingWithMergeProducer','thingWithMergeProducer',
                                         'tryNoPut','tryNoPut'
                                         ),

diff --git a/IOPool/Input/src/RootFile.cc b/IOPool/Input/src/RootFile.cc
@@ -1749,15 +1749,17 @@ namespace edm {
     for(ProductRegistry::ProductList::iterator it = prodList.begin(), itEnd = prodList.end(); it != itEnd;) {
       BranchDescription const& prod = it->second;
       bool drop = branchesToDrop.find(prod.branchID()) != branchesToDropEnd;
-      if(drop && !prod.dropped()) {
-        if(productSelector.selected(prod) && prod.unwrappedType() != typeid(ThinnedAssociation)) {
-          LogWarning("RootFile")
-            << "Branch '" << prod.branchName() << "' is being dropped from the input\n"
-            << "of file '" << file_ << "' because it is dependent on a branch\n"
-            << "that was explicitly dropped.\n";
+      if(drop) {
+        if(!prod.dropped()) {
+          if(productSelector.selected(prod) && prod.unwrappedType() != typeid(ThinnedAssociation)) {
+            LogWarning("RootFile")
+              << "Branch '" << prod.branchName() << "' is being dropped from the input\n"
+              << "of file '" << file_ << "' because it is dependent on a branch\n"
+              << "that was explicitly dropped.\n";
+          }
+          treePointers_[prod.branchType()]->dropBranch(newBranchToOldBranch(prod.branchName()));
+          hasNewlyDroppedBranch_[prod.branchType()] = true;
         }
-        treePointers_[prod.branchType()]->dropBranch(newBranchToOldBranch(prod.branchName()));
-        hasNewlyDroppedBranch_[prod.branchType()] = true;
         ProductRegistry::ProductList::iterator icopy = it;
         ++it;
         prodList.erase(icopy);