Merge pull request #48264 from Dr15Jones/constCastDaqProvenanceHelper

Remove const_cast from DaqProvenanceHelper

Author: cmsbuild

DataFormats/Provenance/interface/BranchChildren.h

@@ -43,6 +43,8 @@ namespace edm {
     // const accessor for the data
     map_t const& childLookup() const { return childLookup_; }
 
+    map_t& mutableChildLookup() { return childLookup_; }
+
   private:
     map_t childLookup_;
 

FWCore/Sources/interface/DaqProvenanceHelper.h

@@ -42,7 +42,7 @@ namespace edm {
     bool matchProcesses(ProcessConfiguration const& pc, ProcessHistory const& ph) const;
     void fixMetaData(ProcessConfigurationVector& pcv, std::vector<ProcessHistory>& phv);
     void fixMetaData(std::vector<BranchID>& branchIDs) const;
-    void fixMetaData(BranchIDLists const&) const;
+    void fixMetaData(BranchIDLists&) const;
     void fixMetaData(ProductDependencies& productDependencies) const;
     ProcessHistoryID const& mapProcessHistoryID(ProcessHistoryID const& phid);
     ParentageID const& mapParentageID(ParentageID const& phid) const;

FWCore/Sources/src/DaqProvenanceHelper.cc

@@ -161,20 +161,17 @@ namespace edm {
     std::replace(branchID.begin(), branchID.end(), oldBranchID_, newBranchID_);
   }
 
-  void DaqProvenanceHelper::fixMetaData(BranchIDLists const& branchIDLists) const {
+  void DaqProvenanceHelper::fixMetaData(BranchIDLists& branchIDLists) const {
     BranchID::value_type oldID = oldBranchID_.id();
     BranchID::value_type newID = newBranchID_.id();
-    // The const_cast is ugly, but it beats the alternatives.
-    BranchIDLists& lists = const_cast<BranchIDLists&>(branchIDLists);
-    for (auto& list : lists) {
+    for (auto& list : branchIDLists) {
       std::replace(list.begin(), list.end(), oldID, newID);
     }
   }
 
   void DaqProvenanceHelper::fixMetaData(ProductDependencies& productDependencies) const {
     typedef std::map<BranchID, std::set<BranchID> > BCMap;
-    // The const_cast is ugly, but it beats the alternatives.
-    BCMap& childLookup = const_cast<BCMap&>(productDependencies.childLookup());
+    BCMap& childLookup = productDependencies.mutableChildLookup();
     // First fix any old branchID's in the key.
     {
       BCMap::iterator i = childLookup.find(oldBranchID_);

IOPool/Input/src/ProvenanceAdaptor.cc

@@ -92,7 +92,7 @@ namespace edm {
 
     void fillListsAndIndexes(ProductRegistry& productRegistry,
                              ProcessHistoryMap const& pHistMap,
-                             std::shared_ptr<BranchIDLists const>& branchIDLists,
+                             std::shared_ptr<BranchIDLists>& branchIDLists,
                              std::vector<BranchListIndex>& branchListIndexes) {
       OrderedProducts orderedProducts;
       std::set<std::string> processNamesThatProduced;
@@ -182,7 +182,11 @@ namespace edm {
     return it->second;
   }
 
-  std::shared_ptr<BranchIDLists const> ProvenanceAdaptor::branchIDLists() const { return branchIDLists_; }
+  std::shared_ptr<BranchIDLists> ProvenanceAdaptor::releaseBranchIDLists() {
+    auto ptr = branchIDLists_;
+    branchIDLists_.reset();
+    return ptr;
+  }
 
   void ProvenanceAdaptor::branchListIndexes(BranchListIndexes& indexes) const { indexes = branchListIndexes_; }
 }  // namespace edm

IOPool/Input/src/ProvenanceAdaptor.h

@@ -38,7 +38,7 @@ namespace edm {
     ProvenanceAdaptor(ProvenanceAdaptor const&) = delete;             // Disallow copying and moving
     ProvenanceAdaptor& operator=(ProvenanceAdaptor const&) = delete;  // Disallow copying and moving
 
-    std::shared_ptr<BranchIDLists const> branchIDLists() const;
+    std::shared_ptr<BranchIDLists> releaseBranchIDLists();
 
     void branchListIndexes(BranchListIndexes& indexes) const;
 
@@ -51,7 +51,7 @@ namespace edm {
 
     ParameterSetIdConverter parameterSetIdConverter_;
     ProcessHistoryIdConverter processHistoryIdConverter_;
-    std::shared_ptr<BranchIDLists const> branchIDLists_;
+    std::shared_ptr<BranchIDLists> branchIDLists_;
     std::vector<BranchListIndex> branchListIndexes_;
   };  // class ProvenanceAdaptor
 }  // namespace edm

IOPool/Input/src/RootFile.cc

@@ -400,13 +400,14 @@ namespace edm {
         }
       }
     }
+    std::shared_ptr<BranchIDLists> mutableBranchIDLists;
     if (!fileFormatVersion().splitProductIDs()) {
       // Old provenance format input file.  Create a provenance adaptor.
       // propagate_const<T> has no reset() function
       provenanceAdaptor_ = std::make_unique<ProvenanceAdaptor>(
           inputProdDescReg, pHistMap, pHistVector, processConfigurations, psetIdConverter, true);
       // Fill in the branchIDLists branch from the provenance adaptor
-      branchIDLists_ = provenanceAdaptor_->branchIDLists();
+      mutableBranchIDLists = provenanceAdaptor_->releaseBranchIDLists();
     } else {
       if (!fileFormatVersion().triggerPathsTracked()) {
         // New provenance format, but change in ParameterSet Format. Create a provenance adaptor.
@@ -418,7 +419,7 @@ namespace edm {
       if (metaDataTree->FindBranch(poolNames::branchIDListBranchName().c_str()) == nullptr) {
         throw Exception(errors::EventCorruption) << "Failed to find branchIDLists branch in metaData tree.\n";
       }
-      branchIDLists_.reset(branchIDListsAPtr.release());
+      mutableBranchIDLists.reset(branchIDListsAPtr.release());
     }
 
     if (fileFormatVersion().hasThinnedAssociations()) {
@@ -460,9 +461,10 @@ namespace edm {
         inputProdDescReg.copyProduct(newBD);
         // Fix up other per file metadata.
         daqProvenanceHelper_->fixMetaData(processConfigurations, pHistVector);
-        daqProvenanceHelper_->fixMetaData(*branchIDLists_);
+        daqProvenanceHelper_->fixMetaData(*mutableBranchIDLists);
         daqProvenanceHelper_->fixMetaData(*productDependencies_);
       }
+      branchIDLists_ = std::move(mutableBranchIDLists);
     }
 
     for (auto const& history : pHistVector) {