diff --git a/EOverPCalibration/interface/ConvoluteTemplate.h b/EOverPCalibration/interface/ConvoluteTemplate.h index 745b2d8945a..a11cc9b8966 100644 --- a/EOverPCalibration/interface/ConvoluteTemplate.h +++ b/EOverPCalibration/interface/ConvoluteTemplate.h @@ -1,7 +1,7 @@ #ifndef ConvoluteTemplate_h #define ConvoluteTemplate_h -#include "histoFunc.h" +#include "Calibration/EOverPCalibration/interface/histoFunc.h" #include "TH1.h" #include "TF1.h" diff --git a/EOverPCalibration/interface/FastCalibratorEB.h b/EOverPCalibration/interface/FastCalibratorEB.h index 5c6c179d788..d5f00fb5a49 100644 --- a/EOverPCalibration/interface/FastCalibratorEB.h +++ b/EOverPCalibration/interface/FastCalibratorEB.h @@ -15,8 +15,8 @@ #include #include #include -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include #include @@ -24,8 +24,8 @@ //#include "Math/PtEtaPhiM4D.h" //#include "Math/LorentzVector.h" -#include "../interface/CalibrationUtils.h" -#include "../interface/readJSONFile.h" +#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h" +#include "Calibration/EOverPCalibration/interface/readJSONFile.h" class FastCalibratorEB { diff --git a/EOverPCalibration/interface/FastCalibratorEE.h b/EOverPCalibration/interface/FastCalibratorEE.h index 14faf08f3cc..7647dc6d5d5 100644 --- a/EOverPCalibration/interface/FastCalibratorEE.h +++ b/EOverPCalibration/interface/FastCalibratorEE.h @@ -15,8 +15,8 @@ /* #include */ /* #include */ /* #include */ -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include /* #include */ @@ -26,7 +26,7 @@ /* #include "../interface/CalibrationUtils.h" */ /* #include "../interface/readJSONFile.h" */ -#include "../interface/TEndcapRings.h" +#include "Calibration/EOverPCalibration/interface/TEndcapRings.h" class FastCalibratorEE { diff --git a/EOverPCalibration/interface/GetHashedIndexEB.h b/EOverPCalibration/interface/GetHashedIndexEB.h index a7ff1823f66..8cbe37ac799 100644 --- a/EOverPCalibration/interface/GetHashedIndexEB.h +++ b/EOverPCalibration/interface/GetHashedIndexEB.h @@ -4,8 +4,8 @@ #include #include #include -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include #include diff --git a/EOverPCalibration/interface/GetHashedIndexEE.h b/EOverPCalibration/interface/GetHashedIndexEE.h index 654d66d55a8..8b6487297d0 100644 --- a/EOverPCalibration/interface/GetHashedIndexEE.h +++ b/EOverPCalibration/interface/GetHashedIndexEE.h @@ -4,8 +4,8 @@ #include #include #include -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include #include diff --git a/EOverPCalibration/interface/XtalAlphaEB.h b/EOverPCalibration/interface/XtalAlphaEB.h index fb1fd4a8f55..78aea2c8cfe 100644 --- a/EOverPCalibration/interface/XtalAlphaEB.h +++ b/EOverPCalibration/interface/XtalAlphaEB.h @@ -14,14 +14,14 @@ #include #include #include -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include #include -#include "../interface/CalibrationUtils.h" -#include "../interface/readJSONFile.h" +#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h" +#include "Calibration/EOverPCalibration/interface/readJSONFile.h" class XtalAlphaEB { diff --git a/EOverPCalibration/interface/XtalAlphaEE.h b/EOverPCalibration/interface/XtalAlphaEE.h index 2e86db9d7d2..8a1f550feb1 100644 --- a/EOverPCalibration/interface/XtalAlphaEE.h +++ b/EOverPCalibration/interface/XtalAlphaEE.h @@ -14,15 +14,15 @@ #include #include #include -#include "../interface/hChain.h" -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" #include -#include "../interface/CalibrationUtils.h" -#include "../interface/readJSONFile.h" -#include "../interface/TEndcapRings.h" -#include "../interface/TSicCrystals.h" +#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h" +#include "Calibration/EOverPCalibration/interface/readJSONFile.h" +#include "Calibration/EOverPCalibration/interface/TEndcapRings.h" +#include "Calibration/EOverPCalibration/interface/TSicCrystals.h" class XtalAlphaEE { diff --git a/EOverPCalibration/src/CalibrationUtils.cc b/EOverPCalibration/src/CalibrationUtils.cc index a898b2867f2..2c66ce91f60 100644 --- a/EOverPCalibration/src/CalibrationUtils.cc +++ b/EOverPCalibration/src/CalibrationUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/CalibrationUtils.h" +#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h" #include #include diff --git a/EOverPCalibration/src/ConfigFileLine.cc b/EOverPCalibration/src/ConfigFileLine.cc index b9a187fd2bd..ed4220c5501 100644 --- a/EOverPCalibration/src/ConfigFileLine.cc +++ b/EOverPCalibration/src/ConfigFileLine.cc @@ -28,7 +28,7 @@ * for it. */ -#include "../interface/ConfigFileLine.h" +#include "Calibration/EOverPCalibration/interface/ConfigFileLine.h" #include using namespace std; diff --git a/EOverPCalibration/src/ConvoluteTemplate.cc b/EOverPCalibration/src/ConvoluteTemplate.cc index edc70fa39dd..36981020f3a 100644 --- a/EOverPCalibration/src/ConvoluteTemplate.cc +++ b/EOverPCalibration/src/ConvoluteTemplate.cc @@ -1,4 +1,4 @@ -#include "../interface/ConvoluteTemplate.h" +#include "Calibration/EOverPCalibration/interface/ConvoluteTemplate.h" diff --git a/EOverPCalibration/src/DrawingUtils.cc b/EOverPCalibration/src/DrawingUtils.cc index 4ace9d88097..09965f1dfce 100644 --- a/EOverPCalibration/src/DrawingUtils.cc +++ b/EOverPCalibration/src/DrawingUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/DrawingUtils.h" +#include "Calibration/EOverPCalibration/interface/DrawingUtils.h" diff --git a/EOverPCalibration/src/FastCalibratorEB.cc b/EOverPCalibration/src/FastCalibratorEB.cc index 1debb46c300..9d1e94dd2e3 100644 --- a/EOverPCalibration/src/FastCalibratorEB.cc +++ b/EOverPCalibration/src/FastCalibratorEB.cc @@ -1,7 +1,7 @@ //adapting it to ECALELF ntuple -#include "../interface/FastCalibratorEB.h" -#include "../interface/GetHashedIndexEB.h" +#include "Calibration/EOverPCalibration/interface/FastCalibratorEB.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h" #include #include #include diff --git a/EOverPCalibration/src/FastCalibratorEE.cc b/EOverPCalibration/src/FastCalibratorEE.cc index 9b834c4f0f9..080870688cf 100644 --- a/EOverPCalibration/src/FastCalibratorEE.cc +++ b/EOverPCalibration/src/FastCalibratorEE.cc @@ -1,9 +1,9 @@ -#include "../interface/FastCalibratorEE.h" -#include "../interface/GetHashedIndexEE.h" +#include "Calibration/EOverPCalibration/interface/FastCalibratorEE.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h" #include #include #include -#include "../interface/CalibrationUtils.h" +#include "Calibration/EOverPCalibration/interface/CalibrationUtils.h" /// Default constructor diff --git a/EOverPCalibration/src/GetHashedIndexEB.cc b/EOverPCalibration/src/GetHashedIndexEB.cc index f5c62997fae..1a6e4b3e2b3 100644 --- a/EOverPCalibration/src/GetHashedIndexEB.cc +++ b/EOverPCalibration/src/GetHashedIndexEB.cc @@ -1,4 +1,4 @@ -#include "../interface/GetHashedIndexEB.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h" int GetHashedIndexEB(int iEta, int iPhi, int Zside) { diff --git a/EOverPCalibration/src/GetHashedIndexEE.cc b/EOverPCalibration/src/GetHashedIndexEE.cc index 3bda30dcf58..3bbfae7b2f5 100644 --- a/EOverPCalibration/src/GetHashedIndexEE.cc +++ b/EOverPCalibration/src/GetHashedIndexEE.cc @@ -1,4 +1,4 @@ -#include "../interface/GetHashedIndexEE.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h" const int kxf[] = { 41, 51, 41, 51, 41, 51, 36, 51, 36, 51, diff --git a/EOverPCalibration/src/LHEReader.cc b/EOverPCalibration/src/LHEReader.cc index 6b5c6251356..f2908b68d2f 100644 --- a/EOverPCalibration/src/LHEReader.cc +++ b/EOverPCalibration/src/LHEReader.cc @@ -1,4 +1,4 @@ -#include "../interface/LHEReader.h" +#include "Calibration/EOverPCalibration/interface/LHEReader.h" diff --git a/EOverPCalibration/src/LaserMonitoringEoP.cc b/EOverPCalibration/src/LaserMonitoringEoP.cc index b1d323e839a..5af661ad131 100644 --- a/EOverPCalibration/src/LaserMonitoringEoP.cc +++ b/EOverPCalibration/src/LaserMonitoringEoP.cc @@ -1,6 +1,6 @@ //Class for the monitoring of laser corrections with E/p -#include "../interface/LaserMonitoringEoP.h" +#include "Calibration/EOverPCalibration/interface/LaserMonitoringEoP.h" #include #include #include diff --git a/EOverPCalibration/src/TEndcapRings.cc b/EOverPCalibration/src/TEndcapRings.cc index 94e2d09c666..f5555731e79 100644 --- a/EOverPCalibration/src/TEndcapRings.cc +++ b/EOverPCalibration/src/TEndcapRings.cc @@ -1,4 +1,4 @@ -#include "../interface/TEndcapRings.h" +#include "Calibration/EOverPCalibration/interface/TEndcapRings.h" diff --git a/EOverPCalibration/src/TSicCrystals.cc b/EOverPCalibration/src/TSicCrystals.cc index db0c4107289..462e17f7927 100644 --- a/EOverPCalibration/src/TSicCrystals.cc +++ b/EOverPCalibration/src/TSicCrystals.cc @@ -1,4 +1,4 @@ -#include "../interface/TSicCrystals.h" +#include "Calibration/EOverPCalibration/interface/TSicCrystals.h" // default constructor, reading the map from file TSicCrystals::TSicCrystals() diff --git a/EOverPCalibration/src/XtalAlphaEB.cc b/EOverPCalibration/src/XtalAlphaEB.cc index c3f6495a2d7..8c00f45de80 100644 --- a/EOverPCalibration/src/XtalAlphaEB.cc +++ b/EOverPCalibration/src/XtalAlphaEB.cc @@ -1,5 +1,5 @@ -#include "../interface/XtalAlphaEB.h" -#include "../interface/GetHashedIndexEB.h" +#include "Calibration/EOverPCalibration/interface/XtalAlphaEB.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEB.h" #include #include #include diff --git a/EOverPCalibration/src/XtalAlphaEE.cc b/EOverPCalibration/src/XtalAlphaEE.cc index feea2254a30..6b4dd1556d3 100644 --- a/EOverPCalibration/src/XtalAlphaEE.cc +++ b/EOverPCalibration/src/XtalAlphaEE.cc @@ -1,5 +1,5 @@ -#include "../interface/XtalAlphaEE.h" -#include "../interface/GetHashedIndexEE.h" +#include "Calibration/EOverPCalibration/interface/XtalAlphaEE.h" +#include "Calibration/EOverPCalibration/interface/GetHashedIndexEE.h" #include #include #include diff --git a/EOverPCalibration/src/Zutils.cc b/EOverPCalibration/src/Zutils.cc index 56d38882bed..5a2e3c955e7 100644 --- a/EOverPCalibration/src/Zutils.cc +++ b/EOverPCalibration/src/Zutils.cc @@ -1,4 +1,4 @@ -#include "../interface/Zutils.h" +#include "Calibration/EOverPCalibration/interface/Zutils.h" #include #include "TMath.h" #include "TRandom3.h" diff --git a/EOverPCalibration/src/geometryUtils.cc b/EOverPCalibration/src/geometryUtils.cc index c803a3b2780..6c88002d5cc 100644 --- a/EOverPCalibration/src/geometryUtils.cc +++ b/EOverPCalibration/src/geometryUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/geometryUtils.h" +#include "Calibration/EOverPCalibration/interface/geometryUtils.h" // --- EE --- // default constructor, reading the map from file diff --git a/EOverPCalibration/src/h2Chain.cc b/EOverPCalibration/src/h2Chain.cc index e690caab428..ef876a20a22 100644 --- a/EOverPCalibration/src/h2Chain.cc +++ b/EOverPCalibration/src/h2Chain.cc @@ -1,4 +1,4 @@ -#include "../interface/h2Chain.h" +#include "Calibration/EOverPCalibration/interface/h2Chain.h" h2Chain::h2Chain (TString baseName, TString baseTitle, int nbinsx, double minx, double maxx, diff --git a/EOverPCalibration/src/hChain.cc b/EOverPCalibration/src/hChain.cc index 61d4123196f..16fb0018e33 100644 --- a/EOverPCalibration/src/hChain.cc +++ b/EOverPCalibration/src/hChain.cc @@ -1,4 +1,4 @@ -#include "../interface/hChain.h" +#include "Calibration/EOverPCalibration/interface/hChain.h" #include "TStyle.h" #include "TROOT.h" #include "TCanvas.h" diff --git a/EOverPCalibration/src/ntpleUtils.cc b/EOverPCalibration/src/ntpleUtils.cc index 60a79b3eeb8..cfcbec983fa 100644 --- a/EOverPCalibration/src/ntpleUtils.cc +++ b/EOverPCalibration/src/ntpleUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/ntpleUtils.h" +#include "Calibration/EOverPCalibration/interface/ntpleUtils.h" // ------------------------------------------------------------ diff --git a/EOverPCalibration/src/ntpleUtils2.cc b/EOverPCalibration/src/ntpleUtils2.cc index dcc76e2529c..4dcd6b3c022 100644 --- a/EOverPCalibration/src/ntpleUtils2.cc +++ b/EOverPCalibration/src/ntpleUtils2.cc @@ -1,4 +1,4 @@ -#include "../interface/ntpleUtils2.h" +#include "Calibration/EOverPCalibration/interface/ntpleUtils2.h" TH1F* templateHisto; TF1* templateFunc; diff --git a/EOverPCalibration/src/readJSONFile.cc b/EOverPCalibration/src/readJSONFile.cc index ce3020e5196..251d418b5d9 100644 --- a/EOverPCalibration/src/readJSONFile.cc +++ b/EOverPCalibration/src/readJSONFile.cc @@ -1,4 +1,4 @@ -#include "../interface/readJSONFile.h" +#include "Calibration/EOverPCalibration/interface/readJSONFile.h" diff --git a/EOverPCalibration/src/stabilityUtils.cc b/EOverPCalibration/src/stabilityUtils.cc index d1ce9bcffca..3086ffdadb6 100644 --- a/EOverPCalibration/src/stabilityUtils.cc +++ b/EOverPCalibration/src/stabilityUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/stabilityUtils.h" +#include "Calibration/EOverPCalibration/interface/stabilityUtils.h" using namespace std; diff --git a/EOverPCalibration/src/treeReader.cc b/EOverPCalibration/src/treeReader.cc index 6e340c82ad4..e523428e54c 100644 --- a/EOverPCalibration/src/treeReader.cc +++ b/EOverPCalibration/src/treeReader.cc @@ -1,4 +1,4 @@ -#include "../interface/treeReader.h" +#include "Calibration/EOverPCalibration/interface/treeReader.h" treeReader::treeReader (TTree * tree, bool verbosity) : m_tree (tree), diff --git a/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc b/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc index 8271f9f5cd1..5e724a6a5ac 100644 --- a/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc +++ b/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc @@ -130,11 +130,11 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent, iEvent.getByToken(EESuperClusterToken_, EESCHandle); //Create empty output collections - std::auto_ptr< EBRecHitCollection > miniEBRecHitCollection (new EBRecHitCollection) ; - std::auto_ptr< EERecHitCollection > miniEERecHitCollection (new EERecHitCollection) ; - std::auto_ptr< ESRecHitCollection > miniESRecHitCollection (new ESRecHitCollection) ; - std::auto_ptr< EBUncalibratedRecHitCollection > miniEBUncalibRecHitCollection (new EBUncalibratedRecHitCollection) ; - std::auto_ptr< EEUncalibratedRecHitCollection > miniEEUncalibRecHitCollection (new EEUncalibratedRecHitCollection) ; + std::unique_ptr< EBRecHitCollection > miniEBRecHitCollection (new EBRecHitCollection) ; + std::unique_ptr< EERecHitCollection > miniEERecHitCollection (new EERecHitCollection) ; + std::unique_ptr< ESRecHitCollection > miniESRecHitCollection (new ESRecHitCollection) ; + std::unique_ptr< EBUncalibratedRecHitCollection > miniEBUncalibRecHitCollection (new EBUncalibratedRecHitCollection) ; + std::unique_ptr< EEUncalibratedRecHitCollection > miniEEUncalibRecHitCollection (new EEUncalibratedRecHitCollection) ; std::set reducedRecHit_EBmap; std::set reducedRecHit_EEmap; @@ -142,7 +142,7 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent, // std::set< edm::Ref > reducedCaloClusters_map; - std::auto_ptr< reco::CaloClusterCollection > reducedCaloClusterCollection (new reco::CaloClusterCollection); + std::unique_ptr< reco::CaloClusterCollection > reducedCaloClusterCollection (new reco::CaloClusterCollection); //Photons: #ifdef shervin @@ -166,11 +166,11 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent, #endif Handle > eleViewHandle; - for(auto iToken = eleViewTokens_.begin(); iToken != eleViewTokens_.end(); iToken++) { + for( auto iToken = eleViewTokens_.begin(); iToken != eleViewTokens_.end(); iToken++) { iEvent.getByToken(*iToken, eleViewHandle); //Electrons: - for (auto eleIt = eleViewHandle->begin(); eleIt != eleViewHandle->end(); eleIt++) { + for ( auto eleIt = eleViewHandle->begin(); eleIt != eleViewHandle->end(); eleIt++) { const reco::SuperCluster& sc = *(eleIt->superCluster()) ; if (sc.seed()->seed().subdetId() == EcalBarrel) { @@ -238,13 +238,12 @@ AlCaECALRecHitReducer::produce (edm::Event& iEvent, } //--------------------------------------- Put selected information in the event - iEvent.put( miniEBRecHitCollection, alcaBarrelHitsCollection_ ); - iEvent.put( miniEBUncalibRecHitCollection, alcaBarrelUncalibHitsCollection_ ); - iEvent.put( miniEERecHitCollection, alcaEndcapHitsCollection_ ); - iEvent.put( miniEEUncalibRecHitCollection, alcaEndcapUncalibHitsCollection_ ); - iEvent.put( miniESRecHitCollection, alcaPreshowerHitsCollection_ ); - - iEvent.put( reducedCaloClusterCollection, alcaCaloClusterCollection_); + iEvent.put( std::move( miniEBRecHitCollection ), alcaBarrelHitsCollection_ ); + iEvent.put( std::move( miniEBUncalibRecHitCollection ), alcaBarrelUncalibHitsCollection_ ); + iEvent.put( std::move( miniEERecHitCollection ), alcaEndcapHitsCollection_ ); + iEvent.put( std::move( miniEEUncalibRecHitCollection ), alcaEndcapUncalibHitsCollection_ ); + iEvent.put( std::move( miniESRecHitCollection ), alcaPreshowerHitsCollection_ ); + iEvent.put( std::move( reducedCaloClusterCollection ), alcaCaloClusterCollection_); } void AlCaECALRecHitReducer::AddMiniRecHitCollection(const reco::SuperCluster& sc, @@ -273,7 +272,7 @@ void AlCaECALRecHitReducer::AddMiniRecHitCollection(const reco::SuperCluster& sc if (sc.preshowerClusters().isAvailable()) { // std::cout << "[DEBUG] Preshower available!" << std::endl; - for(auto iES = sc.preshowerClustersBegin(); iES != sc.preshowerClustersEnd(); ++iES) { + for( auto iES = sc.preshowerClustersBegin(); iES != sc.preshowerClustersEnd(); ++iES) { const std::vector< std::pair >& hits = (*iES)->hitsAndFractions(); for(std::vector >::const_iterator rh = hits.begin(); rh != hits.end(); ++rh) { reducedESRecHitMap.insert(rh->first); diff --git a/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc b/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc index f3d6b88aee3..7ccb43df5f6 100644 --- a/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc +++ b/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc @@ -44,8 +44,8 @@ void AlCaElectronTracksReducer::produce (edm::Event& iEvent, iEvent.getByToken(generalTracksExtraToken_, generalTracksExtraHandle); //Create empty output collections - std::auto_ptr< TrackCollection > redGeneralTracksCollection (new TrackCollection) ; - std::auto_ptr< TrackExtraCollection > redGeneralTracksExtraCollection (new TrackExtraCollection) ; + std::unique_ptr< TrackCollection > redGeneralTracksCollection (new TrackCollection) ; + std::unique_ptr< TrackExtraCollection > redGeneralTracksExtraCollection (new TrackExtraCollection) ; reco::GsfElectronCollection::const_iterator eleIt; @@ -65,8 +65,8 @@ void AlCaElectronTracksReducer::produce (edm::Event& iEvent, } //Put selected information in the event - iEvent.put( redGeneralTracksCollection, alcaTrackCollection_ ); - iEvent.put( redGeneralTracksExtraCollection, alcaTrackExtraCollection_ ); + iEvent.put( std::move(redGeneralTracksCollection), alcaTrackCollection_ ); + iEvent.put( std::move(redGeneralTracksExtraCollection), alcaTrackExtraCollection_ ); } diff --git a/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc index 6217fea2b79..5183f3f012c 100644 --- a/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc +++ b/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc @@ -567,7 +567,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event & iEvent, } // make the final raw data collection - std::auto_ptr streamFEDRawProduct(new FEDRawDataCollection()); + std::unique_ptr streamFEDRawProduct(new FEDRawDataCollection()); std::sort(fedList_.begin(), fedList_.end()); std::vector::const_iterator itfedList = fedList_.begin(); for( ; itfedList != fedList_.end() ; ++itfedList) { @@ -580,7 +580,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event & iEvent, } } - iEvent.put(streamFEDRawProduct, outputLabelModule_); + iEvent.put(std::move( streamFEDRawProduct ), outputLabelModule_); if(!fedList_.empty()) fedList_.clear(); diff --git a/EcalAlCaRecoProducers/src/ElectronRecalibSuperClusterAssociatorSH.cc_topatch b/EcalAlCaRecoProducers/src/ElectronRecalibSuperClusterAssociatorSH.cc_topatch index 58f173ecde5..50dc4bb29e6 100644 --- a/EcalAlCaRecoProducers/src/ElectronRecalibSuperClusterAssociatorSH.cc_topatch +++ b/EcalAlCaRecoProducers/src/ElectronRecalibSuperClusterAssociatorSH.cc_topatch @@ -56,8 +56,8 @@ void ElectronRecalibSuperClusterAssociatorSH::produce(edm::Event& e, const edm:: std::cout<< "ElectronRecalibSuperClusterAssociatorSH::produce" << std::endl; #endif // Create the output collections - std::auto_ptr pOutEle(new GsfElectronCollection); - std::auto_ptr pOutEleCore(new GsfElectronCoreCollection); + std::unique_ptr pOutEle(new GsfElectronCollection); + std::unique_ptr pOutEleCore(new GsfElectronCoreCollection); // std::auto_ptr pOutNewEndcapSC(new SuperClusterCollection); // reco::SuperClusterRefProd rSC = e.getRefBeforePut(); diff --git a/EcalAlCaRecoProducers/src/ValueMapTraslator.cc b/EcalAlCaRecoProducers/src/ValueMapTraslator.cc index 0975e395828..da9de2d5830 100644 --- a/EcalAlCaRecoProducers/src/ValueMapTraslator.cc +++ b/EcalAlCaRecoProducers/src/ValueMapTraslator.cc @@ -117,7 +117,7 @@ ValueMapTraslator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; std::vector valueVector; - std::auto_ptr valueVectorPtr(new Map_t()); + std::unique_ptr valueVectorPtr(new Map_t()); //------------------------------ Handle< reco::GsfElectronCollection > referenceHandle; @@ -174,7 +174,7 @@ ValueMapTraslator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) filler.insert(referenceHandle, valueVector.begin(), valueVector.end()); filler.fill(); - iEvent.put(valueVectorPtr); + iEvent.put(std::move(valueVectorPtr)); } diff --git a/EcalCalibAlgos/interface/ZeeCalibration.h b/EcalCalibAlgos/interface/ZeeCalibration.h index e939a76a40a..8e082077b79 100644 --- a/EcalCalibAlgos/interface/ZeeCalibration.h +++ b/EcalCalibAlgos/interface/ZeeCalibration.h @@ -75,19 +75,19 @@ class ZeeCalibration : public edm::ESProducerLooper public: /// Constructor - ZeeCalibration( const edm::ParameterSet& iConfig ); + ZeeCalibration( const edm::ParameterSet& ); /// Destructor - ~ZeeCalibration(); + ~ZeeCalibration() = default; /// Dummy implementation (job done in duringLoop) virtual void produce(edm::Event&, const edm::EventSetup&) {}; /// Called at beginning of job - virtual void beginOfJob(); + virtual void beginOfJob() override; /// Called at end of job - virtual void endOfJob(); + virtual void endOfJob() override; /// Called at beginning of loop virtual void startingNewLoop( unsigned int iLoop ); @@ -99,7 +99,7 @@ class ZeeCalibration : public edm::ESProducerLooper virtual Status duringLoop( const edm::Event&, const edm::EventSetup& ); /// Produce Ecal interCalibrations - virtual boost::shared_ptr produceEcalIntercalibConstants( const EcalIntercalibConstantsRcd& iRecord ); + virtual std::shared_ptr produceEcalIntercalibConstants( const EcalIntercalibConstantsRcd& ); private: @@ -114,11 +114,16 @@ class ZeeCalibration : public edm::ESProducerLooper int ringNumberCorrector(int k); double getEtaCorrection(const reco::GsfElectron*); - \ - void fillEleInfo(std::vector& a, std::map& b); - void fillMCInfo(HepMC::GenParticle* mcele); - void fillMCmap(const std::vector* electronCollection, const std::vector& mcEle, std::map& myMCmap); + void fillEleInfo(std::vector&, + std::map&); + void fillMCInfo(HepMC::GenParticle*); + + void fillMCmap(const std::vector*, + const std::vector&, + std::map&); // void fillMCmap(const reco::ElectronCollection* electronCollection, const std::vector& mcEle,std::map& myMCmap); float EvalDPhi(float Phi, float Phi_ref); @@ -133,7 +138,9 @@ class ZeeCalibration : public edm::ESProducerLooper void printStatistics(); - std::pair getHottestDetId(const std::vector >& mySCRecHits, const EBRecHitCollection* ebhits , const EERecHitCollection* eehits); + std::pair getHottestDetId(const std::vector >&, + const EBRecHitCollection*, + const EERecHitCollection*); bool xtalIsOnModuleBorder( EBDetId myEBDetId ); @@ -193,7 +200,7 @@ class ZeeCalibration : public edm::ESProducerLooper float calibCoeffError[nMaxChannels]; float initCalibCoeff[nMaxChannels]; - boost::shared_ptr ical; + std::shared_ptr ical; ZIterativeAlgorithmWithFit* theAlgorithm_; diff --git a/EcalCalibAlgos/src/ElectronRecalibSuperClusterAssociator.cc b/EcalCalibAlgos/src/ElectronRecalibSuperClusterAssociator.cc index 7511b6d4aed..14759d24029 100644 --- a/EcalCalibAlgos/src/ElectronRecalibSuperClusterAssociator.cc +++ b/EcalCalibAlgos/src/ElectronRecalibSuperClusterAssociator.cc @@ -55,8 +55,8 @@ void ElectronRecalibSuperClusterAssociator::produce(edm::Event& e, const edm::Ev iSetup.get().get(_theGeometry); // Create the output collections - std::auto_ptr pOutEle(new reco::GsfElectronCollection); - std::auto_ptr pOutEleCore(new reco::GsfElectronCoreCollection); + std::unique_ptr pOutEle(new reco::GsfElectronCollection); + std::unique_ptr pOutEleCore(new reco::GsfElectronCoreCollection); // Get SuperClusters in EB edm::Handle superClusterEBHandle; @@ -208,8 +208,8 @@ void ElectronRecalibSuperClusterAssociator::produce(edm::Event& e, const edm::Ev // put result into the Event - e.put(pOutEle); - e.put(pOutEleCore); + e.put(std::move( pOutEle )); + e.put(std::move( pOutEleCore )); // e.put(pOutNewEndcapSC); diff --git a/EcalCalibAlgos/src/ZeeCalibration.cc b/EcalCalibAlgos/src/ZeeCalibration.cc index 7d11749e2be..90e7662fe82 100644 --- a/EcalCalibAlgos/src/ZeeCalibration.cc +++ b/EcalCalibAlgos/src/ZeeCalibration.cc @@ -172,15 +172,15 @@ ZeeCalibration::ZeeCalibration(const edm::ParameterSet& iConfig) } -ZeeCalibration::~ZeeCalibration() -{ -// if (theAlgorithm_) -// delete theAlgorithm_; -} +//ZeeCalibration::~ZeeCalibration() +//{ +//// if (theAlgorithm_) +//// delete theAlgorithm_; +//} //_____________________________________________________________________________ // Produce EcalIntercalibConstants -boost::shared_ptr +std::shared_ptr ZeeCalibration::produceEcalIntercalibConstants( const EcalIntercalibConstantsRcd& iRecord ) { std::cout << "@SUB=ZeeCalibration::produceEcalIntercalibConstants" << std::endl; @@ -737,7 +737,9 @@ ZeeCalibration::duringLoop( const edm::Event& iEvent, const edm::EventSetup& iSe } } - ical = boost::shared_ptr( new EcalIntercalibConstants() ); + //ical = boost::shared_ptr( new EcalIntercalibConstants() ); + ical = std::make_shared(); + //ical = std::make_unique(); for(int k = 0; k < theAlgorithm_->getNumberOfChannels(); k++) { // std::vector ringIds = EcalRingCalibrationTools::getDetIdsInRing(k); diff --git a/README.md b/README.md index 79e9ccb100c..ce2dbdbdf98 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Download instructions. ``` wget --no-check-certificate https://raw.githubusercontent.com/ECALELFS/ECALELF/HEAD/setup_git.sh chmod +x setup_git.sh -CMSSW_VERSION=CMSSW_8_0_24_patch1 +CMSSW_VERSION=CMSSW_9_2_0_patch5 ./setup_git.sh $CMSSW_VERSION cd $CMSSW_VERSION/src/ cmsenv diff --git a/ZFitter/src/ElectronCategory_class.cc b/ZFitter/src/ElectronCategory_class.cc index 020039d79ca..f28bfc73dd2 100644 --- a/ZFitter/src/ElectronCategory_class.cc +++ b/ZFitter/src/ElectronCategory_class.cc @@ -349,7 +349,7 @@ std::set ElectronCategory_class::GetCutSet(TString region) TString string1 = Objstring1->GetString(); if(string1 == "12") string1 = "0"; else if(string1 == "6") string1 = "1"; - else if(string1 == "1") string1 = "2"; + else if(string1 == "1") string1 = "2"; else if(string1 == "61") string1 = "3"; TCut cutEle1("gainSeedSC_ele1 ==" + string1); diff --git a/ZFitter/src/ZFit_class.cc b/ZFitter/src/ZFit_class.cc index a3aa0b726e9..9c354f69bdc 100644 --- a/ZFitter/src/ZFit_class.cc +++ b/ZFitter/src/ZFit_class.cc @@ -171,7 +171,7 @@ TChain *ZFit_class::ImportTree(TChain *chain, TString commonCut, std::setGetBranch("r9Weight")) chain->SetBranchStatus("r9Weight", 1); chain->SetBranchStatus("R9Ele", 1); chain->SetBranchStatus("etaEle", 1); - chain->SetBranchStatus("etaSCEle",1); + chain->SetBranchStatus("etaSCEle", 1); chain->SetBranchStatus("recoFlagsEle", 1); chain->SetBranchStatus("chargeEle", 1); chain->SetBranchStatus("eleID", 1); diff --git a/ZFitter/src/anyVar_class.cc b/ZFitter/src/anyVar_class.cc index 662d2a49d5e..f868c93a7f5 100644 --- a/ZFitter/src/anyVar_class.cc +++ b/ZFitter/src/anyVar_class.cc @@ -9,15 +9,15 @@ #define MAXBRANCHES 20 #define BUFSIZE 12 /* bytes */ #include - +#include anyVar_class::~anyVar_class(void) { std::cerr << "[anyVar_class DESTROYING]" << std::endl; -// data_chain->SetEntryList(NULL); -// reduced_data_vec.clear(); + // data_chain->SetEntryList(NULL); + // reduced_data_vec.clear(); std::cerr << "[anyVar_class DESTROY]" << std::endl; -// delete data_chain; + // delete data_chain; } anyVar_class::anyVar_class(TChain *data_chain_, std::vector branchNames, ElectronCategory_class& cutter, std::string massBranchName, std::string outDirFitRes, TDirectory* dir, bool updateOnly): @@ -102,7 +102,7 @@ void anyVar_class::ImportTree(TChain *chain, TCut& commonCut, std::set& chain->SetBranchStatus("*", 0); for(auto& branch : commonCutBranches) { - if(branch.Sizeof()==0) continue; + if(branch.Sizeof() == 0) continue; std::cout << "[anyVar_class][STATUS] Enabling branch: " << branch << std::endl; chain->SetBranchStatus(branch, 1); // chain->AddBranchToCache(branch, kTRUE); @@ -141,7 +141,7 @@ void anyVar_class::ImportTree(TChain *chain, TCut& commonCut, std::set& chain_ecal->TECALChain::SetEntryList(elist); std::cout << "[INFO] Selected events: " << chain_ecal->GetEntryList()->GetN() << std::endl; - assert(chain_ecal->GetEntryList()->GetN()>0); + assert(chain_ecal->GetEntryList()->GetN() > 0); //chain = dynamic_cast(chain_ecal); ts.Stop(); ts.Print(); @@ -215,10 +215,10 @@ void anyVar_class::TreeToTree(TChain *chain, std::set& branchList, unsi if(i % (nentries / 100) == 0) std::cerr << "\b\b\b\b\b\b[" << std::setw(3) << i / (nentries / 100) << "%]"; Long64_t ientry = chain->GetEntryNumber(i); - //Long64_t jentry = + //Long64_t jentry = chain->LoadTree(ientry);// entry in the tree - //Long64_t nb = + //Long64_t nb = chain->GetEntry(ientry); if (chain->GetTreeNumber() != treenumber) { treenumber = chain->GetTreeNumber(); @@ -295,19 +295,19 @@ void anyVar_class::TreeAnalyzeShervin(std::string region, TCut cut_ele1, TCut cu // doProcess = doProcess && (system(s.c_str())); // if(doProcess==false) break; // } - + // if(doProcess == true) return; - + Float_t *mll = NULL; Float_t branches_Float_t[MAXBRANCHES][3]; size_t nBranches = _branchNames.size(); - size_t indexMassBranch =-1 ; + size_t indexMassBranch = -1 ; for(unsigned int ibranch = 0; ibranch < nBranches; ++ibranch) { //std::cout << "[DEBUG] " << ibranch << std::endl; TString bname = _branchNames[ibranch]; reduced_data->SetBranchAddress(bname, &branches_Float_t[ibranch]); - if(bname == massBranchName_){ + if(bname == massBranchName_) { mll = &(branches_Float_t[ibranch][0]); indexMassBranch = ibranch; } @@ -319,8 +319,8 @@ void anyVar_class::TreeAnalyzeShervin(std::string region, TCut cut_ele1, TCut cu Float_t corrEle_[2] = {1, 1}; //corrEle_[0]=1; corrEle_[1]=1; Float_t smearEle_[2] = {1, 1}; //corrEle_[0]=1; corrEle_[1]=1; - UInt_t runNumber=0; - if(reduced_data->GetBranch("runNumber")!=NULL) reduced_data->SetBranchAddress("runNumber", &runNumber); + UInt_t runNumber = 0; + if(reduced_data->GetBranch("runNumber") != NULL) reduced_data->SetBranchAddress("runNumber", &runNumber); if(reduced_data->GetBranch("puWeight") != NULL) { std::cout << "[anyVar_class][STATUS] Adding pileup weight branch from friend" << std::endl; @@ -404,7 +404,7 @@ void anyVar_class::TreeAnalyzeShervin(std::string region, TCut cut_ele1, TCut cu for(size_t i = 0; i < sv.size(); ++i) { auto& s = sv[i]; - if(s.name().find("invMass")!=std::string::npos) continue; + if(s.name().find("invMass") != std::string::npos) continue; sv[i].add(branches_Float_t[i][iele]*scale); #ifdef DEBUG if(i == 0 && jentry % (entries / 100) == 0) std::cout << i << "\t" << iele << "\t" << branches_Float_t[i][iele] << std::endl; @@ -436,35 +436,35 @@ void anyVar_class::TreeAnalyzeShervin(std::string region, TCut cut_ele1, TCut cu // auto &sv = stats_run_map.begin()->second; // sv[indexMassBranch].sort(); // std::cout << region << "\t" << stats_run_map.begin()->first << "\t" << sv[indexMassBranch] << std::endl; - if(runRanges.size()==0){ - auto &sv = stats_run_map.begin()->second; + if(runRanges.size() == 0) { + auto &sv = stats_run_map.begin()->second; for(size_t i = 0; i < sv.size(); ++i) { auto& s = sv[i]; s.sort(); - *(_statfiles[i]) << region+"-"+commonCut << "\t" << s << std::endl; + *(_statfiles[i]) << region + "-" + commonCut << "\t" << s << std::endl; } - }else{ - for(auto& runRange : runRanges) { - TString runMin, runMax; - TObjArray *tx = runRange.Tokenize("-"); - runMin = ((TObjString *)(tx->At(0)))->String(); - runMax = ((TObjString *)(tx->At(1)))->String(); - std::string category = region + "-runNumber_" + runMin.Data() + "_" + runMax.Data() + "-" + commonCut; - - auto ptr = (stats_run_map.upper_bound(runMin.Atoll())); - if(ptr != stats_run_map.begin()) ptr--; - auto &sv = ptr->second; - for(size_t i = 0; i < sv.size(); ++i) { - auto& s = sv[i]; + } else { + for(auto& runRange : runRanges) { + TString runMin, runMax; + TObjArray *tx = runRange.Tokenize("-"); + runMin = ((TObjString *)(tx->At(0)))->String(); + runMax = ((TObjString *)(tx->At(1)))->String(); + std::string category = region + "-runNumber_" + runMin.Data() + "_" + runMax.Data() + "-" + commonCut; + + auto ptr = (stats_run_map.upper_bound(runMin.Atoll())); + if(ptr != stats_run_map.begin()) ptr--; + auto &sv = ptr->second; + for(size_t i = 0; i < sv.size(); ++i) { + auto& s = sv[i]; // std::cout << "Start sorting " << s.name() << "\t" << runMin << " " << ptr->first << std::endl; - s.sort(); - *(_statfiles[i]) << category << "\t" << s << std::endl; + s.sort(); + *(_statfiles[i]) << category << "\t" << s << std::endl; #ifdef DEBUG - std::cout << category << "\t" << s << std::endl; + std::cout << category << "\t" << s << std::endl; #endif + } } } - } std::cout << "[INFO] Region fully processed" << "\t" << count << std::endl; // _stats_vec.dump("testfile.dat"); _stats_vec.reset(); diff --git a/ZFitter/src/puWeights_class.cc b/ZFitter/src/puWeights_class.cc index 89f5118b422..907d4f91965 100644 --- a/ZFitter/src/puWeights_class.cc +++ b/ZFitter/src/puWeights_class.cc @@ -181,8 +181,8 @@ void puWeights_class::ReadFromFiles(std::string mcPUFile, std::string dataPUFile double binContent = puMC_hist->GetBinContent(i + 1); //Give warnings if the Pileup bins are empty if(binContent == 0 && puData_hist->GetBinContent(i + 1) != 0) { - std::cerr << "[WARNING] mc bin empty while data not: iBin = " << i + 1 << std::endl; - std::cerr << " data bin = " << puData_hist->GetBinContent(i + 1) << std::endl; + std::cerr << "[WARNING] mc bin empty while data not: iBin = " << i + 1 << std::endl; + std::cerr << " data bin = " << puData_hist->GetBinContent(i + 1) << std::endl; } double weight = binContent > 0 ? puData_hist->GetBinContent(i + 1) / binContent : 0; // the MC normalization should not change, so calculate the diff --git a/ZFitter/src/runDivide_class.cc b/ZFitter/src/runDivide_class.cc index fb282863254..a25be604227 100644 --- a/ZFitter/src/runDivide_class.cc +++ b/ZFitter/src/runDivide_class.cc @@ -100,13 +100,11 @@ void runDivide_class::LoadRunEventNumbers(TChain *tree, std::string runNumber_br Long64_t treenumber = -1; for(Long64_t ientry = 0; ientry < tree->GetEntriesFast(); ++ientry) { tree->GetEntry(ientry); - if(tree->GetTreeNumber() != treenumber) - { + if(tree->GetTreeNumber() != treenumber) { treenumber = tree->GetTreeNumber(); selector->UpdateFormulaLeaves(); } - if(selector != NULL && selector->EvalInstance() == true) - { + if(selector != NULL && selector->EvalInstance() == true) { auto itr = _runMap.find(runNumber); if( itr == _runMap.end()) { _runMap.insert(itr, std::make_pair(runNumber, line(runTime, runNumber))); diff --git a/ZNtupleDumper/plugins/EleNewEnergiesProducer.cc b/ZNtupleDumper/plugins/EleNewEnergiesProducer.cc index ba29019c88e..6cccff8d9ea 100644 --- a/ZNtupleDumper/plugins/EleNewEnergiesProducer.cc +++ b/ZNtupleDumper/plugins/EleNewEnergiesProducer.cc @@ -198,10 +198,10 @@ EleNewEnergiesProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu using namespace edm; - std::auto_ptr energySC_mustMap(new NewEnergyMap()); - std::auto_ptr energySC_mustVarMap(new NewEnergyMap()); - std::auto_ptr energySC_phoMap(new NewEnergyMap()); - std::auto_ptr energySC_phoVarMap(new NewEnergyMap()); + std::unique_ptr energySC_mustMap(new NewEnergyMap()); + std::unique_ptr energySC_mustVarMap(new NewEnergyMap()); + std::unique_ptr energySC_phoMap(new NewEnergyMap()); + std::unique_ptr energySC_phoVarMap(new NewEnergyMap()); iEvent.getByToken(electronsTAG, electronsHandle); iEvent.getByToken(photonsTAG, photonsHandle); @@ -271,10 +271,10 @@ EleNewEnergiesProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu //------------------------------ // put the ValueMap in the event - iEvent.put(energySC_mustMap, "energySCEleMust"); - iEvent.put(energySC_mustVarMap, "energySCEleMustVar"); - iEvent.put(energySC_phoMap, "energySCElePho"); - iEvent.put(energySC_phoVarMap, "energySCElePhoVar"); + iEvent.put(std::move(energySC_mustMap), "energySCEleMust"); + iEvent.put(std::move(energySC_mustVarMap), "energySCEleMustVar"); + iEvent.put(std::move(energySC_phoMap), "energySCElePho"); + iEvent.put(std::move(energySC_phoVarMap), "energySCElePhoVar"); } diff --git a/ZNtupleDumper/plugins/EleSelectionProducers.cc b/ZNtupleDumper/plugins/EleSelectionProducers.cc index 66a2fbe3565..60328025b3c 100644 --- a/ZNtupleDumper/plugins/EleSelectionProducers.cc +++ b/ZNtupleDumper/plugins/EleSelectionProducers.cc @@ -56,9 +56,9 @@ class EleSelectionProducers : public edm::EDProducer public: explicit EleSelectionProducers(const edm::ParameterSet&); - ~EleSelectionProducers(); + ~EleSelectionProducers() = default; - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + static void fillDescriptions(edm::ConfigurationDescriptions&); private: virtual void beginJob() ; @@ -183,13 +183,13 @@ EleSelectionProducers::EleSelectionProducers(const edm::ParameterSet& iConfig): } -EleSelectionProducers::~EleSelectionProducers() -{ +//EleSelectionProducers::~EleSelectionProducers() +//{ - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) +// do anything here that needs to be done at desctruction time +// (e.g. close files, deallocate resources etc.) -} +//} // @@ -205,34 +205,34 @@ void EleSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& i std::vector WP70_PU_vec; std::vector WP80_PU_vec; std::vector WP90_PU_vec; - std::auto_ptr fiducialMap(new SelectionMap()); - std::auto_ptr WP70_PUMap(new SelectionMap()); - std::auto_ptr WP80_PUMap(new SelectionMap()); - std::auto_ptr WP90_PUMap(new SelectionMap()); + std::unique_ptr fiducialMap(new SelectionMap()); + std::unique_ptr WP70_PUMap(new SelectionMap()); + std::unique_ptr WP80_PUMap(new SelectionMap()); + std::unique_ptr WP90_PUMap(new SelectionMap()); std::vector loose_vec; std::vector medium_vec; std::vector tight_vec; - std::auto_ptr looseMap(new SelectionMap()); - std::auto_ptr mediumMap(new SelectionMap()); - std::auto_ptr tightMap(new SelectionMap()); + std::unique_ptr looseMap(new SelectionMap()); + std::unique_ptr mediumMap(new SelectionMap()); + std::unique_ptr tightMap(new SelectionMap()); std::vector loose25nsRun2_vec; std::vector medium25nsRun2_vec; std::vector tight25nsRun2_vec; - std::auto_ptr looseMap_run2_25ns(new SelectionMap()); - std::auto_ptr mediumMap_run2_25ns(new SelectionMap()); - std::auto_ptr tightMap_run2_25ns(new SelectionMap()); + std::unique_ptr looseMap_run2_25ns(new SelectionMap()); + std::unique_ptr mediumMap_run2_25ns(new SelectionMap()); + std::unique_ptr tightMap_run2_25ns(new SelectionMap()); std::vector loose50nsRun2_vec; std::vector medium50nsRun2_vec; std::vector tight50nsRun2_vec; - std::auto_ptr looseMap50nsRun2(new SelectionMap()); - std::auto_ptr mediumMap50nsRun2(new SelectionMap()); - std::auto_ptr tightMap50nsRun2(new SelectionMap()); + std::unique_ptr looseMap50nsRun2(new SelectionMap()); + std::unique_ptr mediumMap50nsRun2(new SelectionMap()); + std::unique_ptr tightMap50nsRun2(new SelectionMap()); std::vector medium25nsRun2Boff_vec; - std::auto_ptr mediumMap25nsRun2Boff(new SelectionMap()); + std::unique_ptr mediumMap25nsRun2Boff(new SelectionMap()); std::vector loose25nsRun2V2016_vec; - std::auto_ptr looseMap_run2_25nsV2016(new SelectionMap()); + std::unique_ptr looseMap_run2_25nsV2016(new SelectionMap()); //------------------------------ ELECTRON iEvent.getByToken(electronsToken_, electronsHandle); @@ -437,21 +437,21 @@ void EleSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& i //------------------------------ // put the ValueMap in the event - iEvent.put(fiducialMap, "fiducial"); - iEvent.put(WP70_PUMap, "WP70PU"); - iEvent.put(WP80_PUMap, "WP80PU"); - iEvent.put(WP90_PUMap, "WP90PU"); - iEvent.put(looseMap, "loose"); - iEvent.put(mediumMap, "medium"); - iEvent.put(tightMap, "tight"); - iEvent.put(looseMap_run2_25ns, "loose25nsRun2"); - iEvent.put(mediumMap_run2_25ns, "medium25nsRun2"); - iEvent.put(tightMap_run2_25ns, "tight25nsRun2"); - iEvent.put(looseMap50nsRun2, "loose50nsRun2"); - iEvent.put(mediumMap50nsRun2, "medium50nsRun2"); - iEvent.put(tightMap50nsRun2, "tight50nsRun2"); - iEvent.put(mediumMap25nsRun2Boff, "medium25nsRun2Boff"); - iEvent.put(looseMap_run2_25nsV2016, "loose25nsRun2V2016"); + iEvent.put(std::move(fiducialMap), "fiducial"); + iEvent.put(std::move(WP70_PUMap), "WP70PU"); + iEvent.put(std::move(WP80_PUMap), "WP80PU"); + iEvent.put(std::move(WP90_PUMap), "WP90PU"); + iEvent.put(std::move(looseMap), "loose"); + iEvent.put(std::move(mediumMap), "medium"); + iEvent.put(std::move(tightMap), "tight"); + iEvent.put(std::move(looseMap_run2_25ns), "loose25nsRun2"); + iEvent.put(std::move(mediumMap_run2_25ns), "medium25nsRun2"); + iEvent.put(std::move(tightMap_run2_25ns), "tight25nsRun2"); + iEvent.put(std::move(looseMap50nsRun2), "loose50nsRun2"); + iEvent.put(std::move(mediumMap50nsRun2), "medium50nsRun2"); + iEvent.put(std::move(tightMap50nsRun2), "tight50nsRun2"); + iEvent.put(std::move(mediumMap25nsRun2Boff), "medium25nsRun2Boff"); + iEvent.put(std::move(looseMap_run2_25nsV2016), "loose25nsRun2V2016"); } // ------------ method called once each job just before starting event loop ------------ diff --git a/ZNtupleDumper/plugins/MuonSelectionProducers.cc b/ZNtupleDumper/plugins/MuonSelectionProducers.cc index d53b5d36a26..e2f52f14804 100644 --- a/ZNtupleDumper/plugins/MuonSelectionProducers.cc +++ b/ZNtupleDumper/plugins/MuonSelectionProducers.cc @@ -154,15 +154,15 @@ void MuonSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& using namespace edm; std::vector fiducial_vec; - std::auto_ptr fiducialMap(new SelectionMap()); + std::unique_ptr fiducialMap(new SelectionMap()); std::vector loose_vec; std::vector soft_vec; std::vector tight_vec; std::vector highPT_vec; - std::auto_ptr looseMap(new SelectionMap()); - std::auto_ptr softMap(new SelectionMap()); - std::auto_ptr tightMap(new SelectionMap()); - std::auto_ptr highPTMap(new SelectionMap()); + std::unique_ptr looseMap(new SelectionMap()); + std::unique_ptr softMap(new SelectionMap()); + std::unique_ptr tightMap(new SelectionMap()); + std::unique_ptr highPTMap(new SelectionMap()); //------------------------------ MUON iEvent.getByLabel(muonsTAG, muonsHandle); @@ -256,11 +256,11 @@ void MuonSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& //------------------------------ // put the ValueMap in the event - iEvent.put(fiducialMap, "fiducial"); - iEvent.put(looseMap, "loose"); - iEvent.put(softMap, "soft"); - iEvent.put(tightMap, "tight"); - iEvent.put(highPTMap, "highPT"); + iEvent.put(std::move(fiducialMap), "fiducial"); + iEvent.put(std::move(looseMap), "loose"); + iEvent.put(std::move(softMap), "soft"); + iEvent.put(std::move(tightMap), "tight"); + iEvent.put(std::move(highPTMap), "highPT"); } diff --git a/ZNtupleDumper/plugins/PhoSelectionProducers.cc b/ZNtupleDumper/plugins/PhoSelectionProducers.cc index a3461a46688..c3d8324f8ed 100644 --- a/ZNtupleDumper/plugins/PhoSelectionProducers.cc +++ b/ZNtupleDumper/plugins/PhoSelectionProducers.cc @@ -162,19 +162,19 @@ void PhoSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& i using namespace edm; std::vector fiducial_vec; - std::auto_ptr fiducialMap(new SelectionMap()); + std::unique_ptr fiducialMap(new SelectionMap()); std::vector loose_vec; std::vector medium_vec; std::vector tight_vec; std::vector loose25nsRun2_vec; std::vector medium25nsRun2_vec; std::vector tight25nsRun2_vec; - std::auto_ptr looseMap(new SelectionMap()); - std::auto_ptr mediumMap(new SelectionMap()); - std::auto_ptr tightMap(new SelectionMap()); - std::auto_ptr loose25nsRun2Map(new SelectionMap()); - std::auto_ptr medium25nsRun2Map(new SelectionMap()); - std::auto_ptr tight25nsRun2Map(new SelectionMap()); + std::unique_ptr looseMap(new SelectionMap()); + std::unique_ptr mediumMap(new SelectionMap()); + std::unique_ptr tightMap(new SelectionMap()); + std::unique_ptr loose25nsRun2Map(new SelectionMap()); + std::unique_ptr medium25nsRun2Map(new SelectionMap()); + std::unique_ptr tight25nsRun2Map(new SelectionMap()); //------------------------------ PHOTON iEvent.getByLabel(photonsTAG, photonsHandle); @@ -288,13 +288,13 @@ void PhoSelectionProducers::produce(edm::Event& iEvent, const edm::EventSetup& i //------------------------------ // put the ValueMap in the event - iEvent.put(fiducialMap, "fiducial"); - iEvent.put(looseMap, "loose"); - iEvent.put(mediumMap, "medium"); - iEvent.put(tightMap, "tight"); - iEvent.put(loose25nsRun2Map, "loose25nsRun2"); - iEvent.put(medium25nsRun2Map, "medium25nsRun2"); - iEvent.put(tight25nsRun2Map, "tight25nsRun2"); + iEvent.put(std::move(fiducialMap), "fiducial"); + iEvent.put(std::move(looseMap), "loose"); + iEvent.put(std::move(mediumMap), "medium"); + iEvent.put(std::move(tightMap), "tight"); + iEvent.put(std::move(loose25nsRun2Map), "loose25nsRun2"); + iEvent.put(std::move(medium25nsRun2Map), "medium25nsRun2"); + iEvent.put(std::move(tight25nsRun2Map), "tight25nsRun2"); } diff --git a/ZNtupleDumper/plugins/ZNtupleDumper.cc b/ZNtupleDumper/plugins/ZNtupleDumper.cc index 28399d7da30..9d3a48dc098 100644 --- a/ZNtupleDumper/plugins/ZNtupleDumper.cc +++ b/ZNtupleDumper/plugins/ZNtupleDumper.cc @@ -1430,8 +1430,8 @@ void ZNtupleDumper::TreeSetSingleSCVar(const reco::SuperCluster& sc, int index) sumE += oneHit->energy(); } avgLCSC[index] = sumLC_E / sumE; - - gainSeedSC[index]=0; + + gainSeedSC[index] = 0; if(seedRecHit->checkFlag(EcalRecHit::kHasSwitchToGain6)) gainSeedSC[index] |= 0x01; if(seedRecHit->checkFlag(EcalRecHit::kHasSwitchToGain1)) gainSeedSC[index] |= 0x02; diff --git a/setup_git.sh b/setup_git.sh index c9c8bd77155..3758ca27330 100755 --- a/setup_git.sh +++ b/setup_git.sh @@ -10,9 +10,12 @@ checkVERSION(){ echo "[`basename $0` ERROR] $CMSSW_VERSION (2015 13TeV analysis) is not anymore supported by ECALELF" exit 1 ;; - CMSSW_8_0_24_patch1) + CMSSW_8_0_24_patch1) echo "[INFO] Installing for $CMSSW_VERSION (2016 13TeV)" ;; + CMSSW_9_2_0_patch5) + echo "[INFO] Installing for $CMSSW_VERSION (2017 13TeV)" + ;; *) echo "[`basename $0` ERROR] Sorry, $CMSSW_VERSION not configured for ECALELF" echo " Supported releases are:" @@ -72,6 +75,9 @@ case $CMSSW_VERSION in git cms-merge-topic ikrav:egm_id_80X_v1 || exit 1 git cms-merge-topic shervin86:slewrate || exit 1 ;; + CMSSW_9_2_*) + echo "[STATUS] cms-merge-topics" + ;; esac # compile