diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainFakeESSource.cc index 7f52c85a9d310..d55df2bd6ebbf 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripApvGainFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripApvGainFakeESSource : public edm::ESProducer, public edm::EventSetu void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripApvGainRcd&); private: @@ -71,7 +71,7 @@ SiStripApvGainFakeESSource::produce(const SiStripApvGainRcd& iRecord) { using namespace edm::es; - std::shared_ptr apvGain{new SiStripApvGain}; + auto apvGain = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc index 0848d85a931e6..a026cb029a13b 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripBackPlaneCorrectioNFakeESSource : public edm::ESProducer, public ed void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripBackPlaneCorrectionRcd&); private: @@ -67,7 +67,7 @@ SiStripBackPlaneCorrectioNFakeESSource::produce(const SiStripBackPlaneCorrection edm::ESHandle tTopo; iRecord.getRecord().get(tTopo); - std::shared_ptr backPlaneCorrection{new SiStripBackPlaneCorrection}; + auto backPlaneCorrection = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc index de16a7a3d8fad..20c320c7cb9dc 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBadModuleConfigurableFakeESSource.cc @@ -30,7 +30,7 @@ class SiStripBadModuleConfigurableFakeESSource : public edm::ESProducer, public void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripBadModuleRcd&); private: @@ -73,7 +73,7 @@ SiStripBadModuleConfigurableFakeESSource::produce(const SiStripBadModuleRcd& iRe edm::ESHandle tTopo; iRecord.getRecord().get(tTopo); - std::shared_ptr quality{new SiStripQuality}; + auto quality = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBaseDelayFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBaseDelayFakeESSource.cc index a4febe809852d..28a32050b6539 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBaseDelayFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBaseDelayFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripBaseDelayFakeESSource : public edm::ESProducer, public edm::EventSe void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripBaseDelayRcd&); private: @@ -64,7 +64,7 @@ SiStripBaseDelayFakeESSource::produce(const SiStripBaseDelayRcd& iRecord) { using namespace edm::es; - std::shared_ptr baseDelay{new SiStripBaseDelay}; + auto baseDelay = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripConfObjectFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripConfObjectFakeESSource.cc index 37a795571e874..c276e6f6b3937 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripConfObjectFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripConfObjectFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripConfObjectFakeESSource : public edm::ESProducer, public edm::EventS void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripConfObjectRcd&); private: @@ -61,7 +61,7 @@ SiStripConfObjectFakeESSource::produce(const SiStripConfObjectRcd& iRecord) { using namespace edm::es; - std::shared_ptr confObject{new SiStripConfObject}; + auto confObject = std::make_unique(); for ( const auto& param : m_parameters ) { const std::string paramType{param.getParameter("ParameterType")}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLatencyFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLatencyFakeESSource.cc index f1fe11c32f744..413185d001cea 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLatencyFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLatencyFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripLatencyFakeESSource : public edm::ESProducer, public edm::EventSetu void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripLatencyRcd&); private: @@ -64,7 +64,7 @@ SiStripLatencyFakeESSource::produce(const SiStripLatencyRcd& iRecord) { using namespace edm::es; - std::shared_ptr latency{new SiStripLatency}; + auto latency = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; const auto& detInfos = reader.getAllData(); diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc index 8cbd26c0793c9..855748e61c173 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc @@ -38,7 +38,7 @@ class SiStripLorentzAngleFakeESSource : public edm::ESProducer, public edm::Even void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripLorentzAngleRcd&); private: @@ -169,7 +169,7 @@ SiStripLorentzAngleFakeESSource::produce(const SiStripLorentzAngleRcd& iRecord) edm::ESHandle tTopo; iRecord.getRecord().get(tTopo); - std::shared_ptr lorentzAngle{new SiStripLorentzAngle}; + auto lorentzAngle = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoisesFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoisesFakeESSource.cc index 19e0653346a14..0e24fd6dbae73 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoisesFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoisesFakeESSource.cc @@ -33,7 +33,7 @@ class SiStripNoisesFakeESSource : public edm::ESProducer, public edm::EventSetup void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripNoisesRcd&); private: @@ -98,7 +98,7 @@ SiStripNoisesFakeESSource::produce(const SiStripNoisesRcd& iRecord) edm::ESHandle tTopo; iRecord.getRecord().get(tTopo); - std::shared_ptr noises{new SiStripNoises}; + auto noises = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripPedestalsFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripPedestalsFakeESSource.cc index db81cfeeb7458..6c4c5cea1df35 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripPedestalsFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripPedestalsFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripPedestalsFakeESSource : public edm::ESProducer, public edm::EventSe void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripPedestalsRcd&); private: @@ -64,7 +64,7 @@ SiStripPedestalsFakeESSource::produce(const SiStripPedestalsRcd& iRecord) { using namespace edm::es; - std::shared_ptr pedestals{new SiStripPedestals}; + auto pedestals = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripThresholdFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripThresholdFakeESSource.cc index 1e69cf1760f14..f13b070bf9345 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripThresholdFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripThresholdFakeESSource.cc @@ -29,7 +29,7 @@ class SiStripThresholdFakeESSource : public edm::ESProducer, public edm::EventSe void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce(const SiStripThresholdRcd&); private: @@ -66,7 +66,7 @@ SiStripThresholdFakeESSource::produce(const SiStripThresholdRcd& iRecord) { using namespace edm::es; - std::shared_ptr threshold{new SiStripThreshold}; + auto threshold = std::make_unique(); SiStripDetInfoFileReader reader{m_file.fullPath()}; diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc index 03d183dc7860b..4821acfe862fa 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc @@ -32,9 +32,9 @@ SiStripBackPlaneCorrectionDepESProducer::SiStripBackPlaneCorrectionDepESProducer } -std::shared_ptr SiStripBackPlaneCorrectionDepESProducer::produce(const SiStripBackPlaneCorrectionDepRcd& iRecord) +std::unique_ptr SiStripBackPlaneCorrectionDepESProducer::produce(const SiStripBackPlaneCorrectionDepRcd& iRecord) { - std::shared_ptr siStripBPC; + std::unique_ptr siStripBPC; edm::LogInfo("SiStripBackPlaneCorrectionDepESProducer") << "Producer called" << std::endl; std::string latencyRecordName = getLatency.getParameter("record"); @@ -61,7 +61,7 @@ std::shared_ptr SiStripBackPlaneCorrectionDepESProdu if ( backPlaneCorrectionRecordName == "SiStripBackPlaneCorrectionRcd"){ edm::ESHandle siStripBackPlaneCorrection; iRecord.getRecord().get(backPlaneCorrectionLabel, siStripBackPlaneCorrection); - siStripBPC = std::make_shared(*(siStripBackPlaneCorrection.product())); + siStripBPC = std::make_unique(*(siStripBackPlaneCorrection.product())); } else edm::LogError("SiStripBackPlaneCorrectionDepESProducer") << "[SiStripBackPlaneCorrectionDepESProducer::produce] No Lorentz Angle Record found " << std::endl; diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.h b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.h index 04ccaf8d74d94..de1da1c9f23cc 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.h +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.h @@ -23,7 +23,7 @@ class SiStripBackPlaneCorrectionDepESProducer : public edm::ESProducer { SiStripBackPlaneCorrectionDepESProducer(const edm::ParameterSet&); ~SiStripBackPlaneCorrectionDepESProducer() override{}; - std::shared_ptr produce(const SiStripBackPlaneCorrectionDepRcd&); + std::unique_ptr produce(const SiStripBackPlaneCorrectionDepRcd&); private: diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripBadModuleFedErrESSource.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripBadModuleFedErrESSource.cc index ba287b8d2cb5d..34dafe1668eff 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripBadModuleFedErrESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripBadModuleFedErrESSource.cc @@ -47,7 +47,7 @@ class SiStripBadModuleFedErrESSource : public edm::ESProducer, public edm::Event void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override; - typedef std::shared_ptr ReturnType; + typedef std::unique_ptr ReturnType; ReturnType produce( const SiStripBadModuleFedErrRcd& ); private: @@ -125,7 +125,7 @@ SiStripBadModuleFedErrESSource::produce(const SiStripBadModuleFedErrRcd& iRecord edm::ESHandle cabling; iRecord.getRecord().get(cabling); - std::shared_ptr quality{new SiStripQuality}; + auto quality = std::make_unique(); DQMStore* dqmStore = edm::Service().operator->(); if ( m_readFlag ) { // open requested file diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc index 6b79826f57b51..2363d8b84cbe2 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc @@ -33,10 +33,10 @@ SiStripDelayESProducer::SiStripDelayESProducer(const edm::ParameterSet& iConfig) } -std::shared_ptr SiStripDelayESProducer::produce(const SiStripDelayRcd& iRecord) +std::unique_ptr SiStripDelayESProducer::produce(const SiStripDelayRcd& iRecord) { edm::LogInfo("SiStripDelayESProducer") << "produce called" << std::endl; - auto delay = std::make_shared(); + auto delay = std::make_unique(); delay->clear(); edm::ESHandle baseDelay; diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.h b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.h index 4ef9b2658e06b..2fce7d19e44e6 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.h +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.h @@ -22,7 +22,7 @@ class SiStripDelayESProducer : public edm::ESProducer { SiStripDelayESProducer(const edm::ParameterSet&); ~SiStripDelayESProducer() override{}; - std::shared_ptr produce(const SiStripDelayRcd&); + std::unique_ptr produce(const SiStripDelayRcd&); private: diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc index f5d564c16b7e1..ae73d4c01abf8 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc @@ -34,9 +34,9 @@ SiStripLorentzAngleDepESProducer::SiStripLorentzAngleDepESProducer(const edm::Pa } -std::shared_ptr SiStripLorentzAngleDepESProducer::produce(const SiStripLorentzAngleDepRcd& iRecord) +std::unique_ptr SiStripLorentzAngleDepESProducer::produce(const SiStripLorentzAngleDepRcd& iRecord) { - std::shared_ptr siStripLA; + std::unique_ptr siStripLA; edm::LogInfo("SiStripLorentzAngleDepESProducer") << "Producer called" << std::endl; std::string latencyRecordName = getLatency.getParameter("record"); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.h b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.h index 49cbc876a67cc..ed2ee236b02fd 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.h +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.h @@ -23,7 +23,7 @@ class SiStripLorentzAngleDepESProducer : public edm::ESProducer { SiStripLorentzAngleDepESProducer(const edm::ParameterSet&); ~SiStripLorentzAngleDepESProducer() override{}; - std::shared_ptr produce(const SiStripLorentzAngleDepRcd&); + std::unique_ptr produce(const SiStripLorentzAngleDepRcd&); private: diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc index f05240653f0f8..8c5ea0ea8c17a 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc @@ -34,9 +34,9 @@ SiStripQualityESProducer::SiStripQualityESProducer(const edm::ParameterSet& iCon } -std::shared_ptr SiStripQualityESProducer::produce(const SiStripQualityRcd& iRecord) +std::unique_ptr SiStripQualityESProducer::produce(const SiStripQualityRcd& iRecord) { - auto quality = std::make_shared(); + auto quality = std::make_unique(); edm::LogInfo("SiStripQualityESProducer") << "produce called" << std::endl; quality->clear(); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.h b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.h index 023659744aaca..853d3fd3662e3 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.h +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.h @@ -22,7 +22,7 @@ class SiStripQualityESProducer : public edm::ESProducer { SiStripQualityESProducer(const edm::ParameterSet&); ~SiStripQualityESProducer() override{}; - std::shared_ptr produce(const SiStripQualityRcd&); + std::unique_ptr produce(const SiStripQualityRcd&); private: