From 4486a907eae746f68981e3a2f2dd88961d974177 Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Thu, 27 Sep 2018 17:41:43 +0200
Subject: [PATCH 1/2] EventFilter/RawDataCollector: replace auto_ptr removed in
 strict std=c++17

---
 EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~ b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~
index 46ae55e17a148..d1be109ef2b7b 100644
--- a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~
+++ b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~
@@ -43,7 +43,7 @@ void RawDataCollectorByLabel::produce(Event & e, const EventSetup& c){
    rawData.push_back(input);
  }
 
- std::auto_ptr<FEDRawDataCollection> producedData(new FEDRawDataCollection);
+ std::unique_ptr<FEDRawDataCollection> producedData(new FEDRawDataCollection);
 
  for (unsigned int i=0; i< rawData.size(); ++i ) { 
 

From 8ba0cd35f5b005624b4252cb7339f02caeaed5b3 Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Thu, 27 Sep 2018 18:31:48 +0200
Subject: [PATCH 2/2] Remove really old backup file

---
 .../src/RawDataCollectorByLabel.cc~           | 88 -------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~

diff --git a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~ b/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~
deleted file mode 100644
index d1be109ef2b7b..0000000000000
--- a/EventFilter/RawDataCollector/src/RawDataCollectorByLabel.cc~
+++ /dev/null
@@ -1,88 +0,0 @@
-/** \file
- * Implementation of class RawDataCollectorByLabel
- *
- */
-
-#include "EventFilter/RawDataCollector/interface/RawDataCollectorByLabel.h"
-#include <DataFormats/FEDRawData/interface/FEDRawDataCollection.h> 
-#include <DataFormats/FEDRawData/interface/FEDRawData.h>
-#include <DataFormats/FEDRawData/interface/FEDNumbering.h>
-
-#include <DataFormats/Common/interface/Handle.h>
-#include <FWCore/Framework/interface/Event.h>
-#include "DataFormats/Provenance/interface/ProcessHistory.h" 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-#include <iostream>
-
-using namespace edm;
-
-RawDataCollectorByLabel::RawDataCollectorByLabel(const edm::ParameterSet& pset) {
-
-  inputTags_ = pset.getParameter<std::vector<InputTag> >("RawCollectionList");
-  verbose_ = pset.getUntrackedParameter<int>("verbose",0);
-
-  produces<FEDRawDataCollection>();
-}
-
-RawDataCollectorByLabel::~RawDataCollectorByLabel(){
-
-}
-
-
-void RawDataCollectorByLabel::produce(Event & e, const EventSetup& c){
-
- /// Get Data from all FEDs
- std::vector< Handle<FEDRawDataCollection> > rawData;
- for(tag_iterator_t inputTag = inputTags_.begin(); inputTag != inputTags_.end(); ++inputTag ) {
-   Handle<FEDRawDataCollection> input;
-   e.getByLabel(*inputTag,input);
-   rawData.push_back(input);
- }
-
- std::unique_ptr<FEDRawDataCollection> producedData(new FEDRawDataCollection);
-
- for (unsigned int i=0; i< rawData.size(); ++i ) { 
-
-   const FEDRawDataCollection *rdc=rawData[i].product();
-
-   if ( verbose_ > 0 ) {
-     std::cout << "\nRAW collection #" << i+1 << std::endl;
-     std::cout << "branch name = " << rawData[i].provenance()->branchName() << std::endl;
-     std::cout << "process index = " << rawData[i].provenance()->productID().processIndex() << std::endl;
-   }
-
-   for ( int j=0; j< FEDNumbering::MAXFEDID; ++j ) {
-     const FEDRawData & fedData = rdc->FEDData(j);
-     size_t size=fedData.size();
-
-     if ( size > 0 ) {
-       // this fed has data -- lets copy it
-       if(verbose_ > 1) std::cout << "Copying data from FED #" << j << std::endl;
-       FEDRawData & fedDataProd = producedData->FEDData(j);
-       if ( fedDataProd.size() != 0 ) {
-	 if(verbose_ > 1) {
-	   std::cout << " More than one FEDRawDataCollection with data in FED ";
-	   std::cout << j << " Skipping the 2nd\n";
-	 }
-	 continue;
-       } 
-       fedDataProd.resize(size);
-       unsigned char *dataProd=fedDataProd.data();
-       const unsigned char *data=fedData.data();
-       for ( unsigned int k=0; k<size; ++k ) {
-	 dataProd[k]=data[k];
-       }
-     }
-   }
- }
-
- // Insert the new product in the event  
- e.put(producedData);  
-
-}
-
-