Merge pull request #47562 from Dr15Jones/dropUselessCodeStreamer

Removed unneeded code in StreamerInputSource

Author: cmsbuild

IOPool/Streamer/interface/StreamerInputSource.h

@@ -128,7 +128,6 @@ namespace edm::streamer {
     edm::propagate_const<std::unique_ptr<SendEvent>> sendEvent_;
     edm::propagate_const<std::unique_ptr<EventPrincipalHolder>> eventPrincipalHolder_;
     std::vector<edm::propagate_const<std::unique_ptr<EventPrincipalHolder>>> streamToEventPrincipalHolders_;
-    bool adjustEventToNewProductRegistry_;
 
     std::string processName_;
     unsigned int protocolVersion_;

IOPool/Streamer/src/StreamerInputSource.cc

@@ -49,7 +49,6 @@ namespace edm::streamer {
         xbuf_(TBuffer::kRead, init_size),
         sendEvent_(),
         eventPrincipalHolder_(),
-        adjustEventToNewProductRegistry_(false),
         processName_(),
         protocolVersion_(0U) {}
 
@@ -159,9 +158,6 @@ namespace edm::streamer {
   void StreamerInputSource::deserializeAndMergeWithRegistry(InitMsgView const& initView, bool subsequent) {
     std::unique_ptr<SendJobHeader> sd = deserializeRegistry(initView);
     mergeIntoRegistry(*sd, productRegistryUpdate(), subsequent);
-    if (subsequent) {
-      adjustEventToNewProductRegistry_ = true;
-    }
     SendJobHeader::ParameterSetMap const& psetMap = sd->processParameterSet();
     pset::Registry& psetRegistry = *pset::Registry::instance();
     for (auto const& item : psetMap) {
@@ -297,10 +293,6 @@ namespace edm::streamer {
   }
 
   void StreamerInputSource::read(EventPrincipal& eventPrincipal) {
-    if (adjustEventToNewProductRegistry_) {
-      eventPrincipal.adjustIndexesAfterProductRegistryAddition();
-      adjustEventToNewProductRegistry_ = false;
-    }
     EventSelectionIDVector ids(sendEvent_->eventSelectionIDs());
     BranchListIndexes indexes(sendEvent_->branchListIndexes());
     branchIDListHelper()->fixBranchListIndexes(indexes);