From ea2a87ed4d086446e64179ed2df6ddb037f7acf5 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 9 Feb 2020 19:43:58 +0000 Subject: [PATCH 1/2] ATLASRECTS-5296 replace auto_ptr with unique_ptr --- .../src/DetailedIDNtupleTool.cxx | 4 ++-- .../PixelCoralClientUtils/src/CoralClient.cc | 4 ++-- .../src/TRT_Monitoring_Tool.cxx | 6 ++--- .../IDStandardPerformance.h | 2 +- .../src/IDStandardPerformance.cxx | 23 ++++++++----------- .../src/EventShapeStoreCnv.cxx | 2 +- .../src/RecoTimingObjCnv.cxx | 2 +- .../src/TrackParticleTruthCollectionCnv.cxx | 2 +- .../src/eflowObjectContainerCnv.cxx | 10 ++++---- .../src/PRD_MultiTruthCollectionCnv.cxx | 2 +- .../src/TrackTruthCollectionCnv.cxx | 2 +- .../TrkTruthToTrack/src/TruthToTrack.cxx | 4 ++-- .../src/TruthTrackRecordToTrack.cxx | 4 ++-- 13 files changed, 32 insertions(+), 35 deletions(-) diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx index 51332cca895..bf386d99b7b 100644 --- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx +++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/DetailedIDNtupleTool.cxx @@ -308,7 +308,7 @@ namespace InDet { } if (originalPerigeeAtRef) { - std::auto_ptr originalMeasPerAtRef(originalPerigeeAtRef); + std::unique_ptr originalMeasPerAtRef(originalPerigeeAtRef); m_original_toRef_d0 = originalMeasPerAtRef->parameters()[Trk::d0]; m_original_toRef_z0 = originalMeasPerAtRef->parameters()[Trk::z0]; m_original_toRef_phi0 = originalMeasPerAtRef->parameters()[Trk::phi0]; @@ -328,7 +328,7 @@ namespace InDet { //post-eigen, can simply use the TrackParameters * returned by m_extrapolator->extrapolate? if (PerigeeAtRef) { - std::auto_ptr MeasPerAtRef((PerigeeAtRef)); + std::unique_ptr MeasPerAtRef((PerigeeAtRef)); m_toRef_d0 = MeasPerAtRef->parameters()[Trk::d0]; m_toRef_z0 = MeasPerAtRef->parameters()[Trk::z0]; m_toRef_phi0 = MeasPerAtRef->parameters()[Trk::phi0]; diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc index cb19d1873aa..931b9a33667 100644 --- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc +++ b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc @@ -1000,7 +1000,7 @@ void PixCoralClient::getAnalysisResultsFromDB(std::vector a } // now define output columns - std::auto_ptr query( m_session->nominalSchema().newQuery() ); + std::unique_ptr query( m_session->nominalSchema().newQuery() ); if (!query.get()) { std::cerr << "ERROR [CoralClient::getAnalysisResultsFromDB] Failed to create queries for table " << *tName << "."<< std::endl; continue; @@ -1227,7 +1227,7 @@ int PixCoralClient::fillTable(long long fk, CAN::AnalysisResultList_t *results){ // pixel_row_2.extend("VALUE"); extendAttributeList(pixel_row_2); { - std::auto_ptr pixel_bulk_2(pixel_editor_2.bulkInsert(pixel_row_2,iter->second.size())); + std::unique_ptr pixel_bulk_2(pixel_editor_2.bulkInsert(pixel_row_2,iter->second.size())); for (typename std::map::const_iterator val_iter=iter->second.begin(); val_iter != iter->second.end(); val_iter ++) { diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx index b06d5cc75cf..db8da97f61f 100644 --- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx +++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/TRT_Monitoring_Tool.cxx @@ -2462,7 +2462,7 @@ StatusCode TRT_Monitoring_Tool::fillTRTTracks(const TrackCollection& trackCollec } for (; p_trk != trackCollection.end(); ++p_trk) { - const std::auto_ptr summary(m_TrackSummaryTool->createSummary(*(*p_trk))); + const std::unique_ptr summary(m_TrackSummaryTool->createSummary(*(*p_trk))); int nTRTHits = summary->get(Trk::numberOfTRTHits); if (nTRTHits < m_minTRThits) continue; @@ -3590,7 +3590,7 @@ StatusCode TRT_Monitoring_Tool::fillTRTEfficiency(const TrackCollection& combTra continue; } - const std::auto_ptr summary(m_TrackSummaryTool->createSummary(*(*track))); + const std::unique_ptr summary(m_TrackSummaryTool->createSummary(*(*track))); int n_trt_hits = summary->get(Trk::numberOfTRTHits); int n_sct_hits = summary->get(Trk::numberOfSCTHits); int n_pixel_hits = summary->get(Trk::numberOfPixelHits); @@ -3868,7 +3868,7 @@ StatusCode TRT_Monitoring_Tool::fillTRTHighThreshold(const TrackCollection& trac DataVector::const_iterator TSOSItBegin = trackStates->begin(); DataVector::const_iterator TSOSItEnd = trackStates->end(); - const std::auto_ptr summary(m_TrackSummaryTool->createSummary(*(*p_trk))); + const std::unique_ptr summary(m_TrackSummaryTool->createSummary(*(*p_trk))); int trt_hits = summary->get(Trk::numberOfTRTHits); int sct_hits = summary->get(Trk::numberOfSCTHits); int pixel_hits = summary->get(Trk::numberOfPixelHits); diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/InDetPerformanceRTT/IDStandardPerformance.h b/InnerDetector/InDetValidation/InDetPerformanceRTT/InDetPerformanceRTT/IDStandardPerformance.h index c2c139e16e9..f7cbf5b2cd3 100755 --- a/InnerDetector/InDetValidation/InDetPerformanceRTT/InDetPerformanceRTT/IDStandardPerformance.h +++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/InDetPerformanceRTT/IDStandardPerformance.h @@ -802,7 +802,7 @@ class IDStandardPerformance : public ManagedMonitorToolBase void fillPixelTrackPullHistos(const Identifier& elementID , const Trk::TrackStateOnSurface* trackState - , const std::auto_ptr& trackPull + , const std::unique_ptr& trackPull , const InDetDD::SiDetectorElementCollection* elements); diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx index 733a58f56d3..487f2fb1d13 100755 --- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx +++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx @@ -63,7 +63,7 @@ #include "EventPrimitives/EventPrimitivesHelpers.h" #include "GeoPrimitives/GeoPrimitivesHelpers.h" -using std::auto_ptr; +using std::unique_ptr; using std::string; #define STR(s) STR_EXP(s) @@ -2136,9 +2136,6 @@ IDStandardPerformance::MakeTrackPlots(const DataVector* trks, continue; } const Trk::TrackParameters* generatedTrackPerigee = m_truthToTrack->makePerigeeParameters(particle); - // auto_ptr generatedTrackPerigee(m_truthToTrack->makePerigeeParameters(particle)); - // if (!generatedTrackPerigee.get()) msg(MSG::DEBUG) << "Unable to extrapolate genparticle to perigee!" << endmsg; - // else { if (generatedTrackPerigee){ zVertex+=generatedTrackPerigee->parameters()[Trk::z0]; nPrimaries++; @@ -3015,7 +3012,7 @@ IDStandardPerformance::MakeTrackPlots(const DataVector* trks, // V47: Create generated track perigee to cut on truth tracks float track_truth_d0 = 999.; float track_truth_phi = 999.; - auto_ptr generatedTrackPerigee(m_truthToTrack->makePerigeeParameters(particle)); + unique_ptr generatedTrackPerigee(m_truthToTrack->makePerigeeParameters(particle)); if (!generatedTrackPerigee.get()) msg(MSG::DEBUG) << "Unable to extrapolate genparticle to perigee!" << endmsg; else { track_truth_d0 = generatedTrackPerigee->parameters()[Trk::d0]; @@ -3648,7 +3645,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ //Trk::Track& nonConstTrack = const_cast(**trksItr); //m_trkSummaryTool->updateTrack(nonConstTrack); //Trk::TrackSummary* summary = new Trk::TrackSummary(*(nonConstTrack.trackSummary())); - auto_ptr summary(m_trkSummaryTool->createSummary(**trksItr)); + unique_ptr summary(m_trkSummaryTool->createSummary(**trksItr)); if (msgLvl(MSG::VERBOSE)) { msg() << "Analyze Hit Content using TrackSummary object" << endmsg; @@ -3732,7 +3729,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ // to avoid crashes that sometimes occur for low pt tracks for the hole search tool if (msgLvl(MSG::VERBOSE)) msg() << "Calculate hit efficiencies and residuals for track : pT = " << trkpt << " eta = " << trketa<0.8) { - auto_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**trksItr)); + unique_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**trksItr)); // Loop over all hits on track DataVector::const_iterator TSOSItr = trackWithHoles->trackStateOnSurfaces()->begin(); @@ -4064,7 +4061,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ Trk::ResidualPull::ResidualType resType = m_isUnbiased ? Trk::ResidualPull::Unbiased : Trk::ResidualPull::Biased; - const auto_ptr residualPull(m_residualPullCalculator->residualPull(hit, + const std::unique_ptr residualPull(m_residualPullCalculator->residualPull(hit, trackParameters, resType)); if (m_idHelper->is_pixel(surfaceID)) { @@ -4205,7 +4202,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ //get pixel hits for (; PixtrksItr != PixtrksItrE; ++PixtrksItr) { - auto_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**PixtrksItr)); + unique_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**PixtrksItr)); DataVector::const_iterator TSOSItr = trackWithHoles->trackStateOnSurfaces()->begin(); Identifier SurfaceID; @@ -4296,7 +4293,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ //get SCT tracks for (; SCTtrksItr != SCTtrksItrE; ++SCTtrksItr) { - auto_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**SCTtrksItr)); + unique_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**SCTtrksItr)); DataVector::const_iterator TSOSItr = trackWithHoles->trackStateOnSurfaces()->begin(); Identifier SurfaceID; @@ -4392,7 +4389,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ //get TRT tracks for (; TRTtrksItr != TRTtrksItrE; ++TRTtrksItr) { - auto_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**TRTtrksItr)); + unique_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**TRTtrksItr)); DataVector::const_iterator TSOSItr = trackWithHoles->trackStateOnSurfaces()->begin(); Identifier SurfaceID; @@ -4518,7 +4515,7 @@ void IDStandardPerformance::MakeHitPlots(const DataVector* trks){ - auto_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**trksItr)); + unique_ptr trackWithHoles(m_holeSearchTool->getTrackWithHoles(**trksItr)); DataVector::const_iterator TSOSItr = trackWithHoles->trackStateOnSurfaces()->begin(); Identifier SurfaceID; const Trk::Perigee* startPerigee = (*trksItr)->perigeeParameters(); @@ -4808,7 +4805,7 @@ void IDStandardPerformance::SetSafeMinimumMaximum(TH1* h, float min, float max) void IDStandardPerformance::fillPixelTrackPullHistos(const Identifier& elementID , const Trk::TrackStateOnSurface* trackState - , const auto_ptr& trackPull + , const std::unique_ptr& trackPull , const InDetDD::SiDetectorElementCollection* elements) { if (not m_idHelper->is_pixel(elementID)) { diff --git a/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.cxx b/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.cxx index 16898ba5348..918f3f92ad4 100644 --- a/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.cxx +++ b/Reconstruction/EventShapes/EventShapeAthenaPool/src/EventShapeStoreCnv.cxx @@ -24,7 +24,7 @@ EventShapeStore* EventShapeStoreCnv::createTransient() { EventShapeStoreCnv_p1 TPconverter; // using auto_ptr ensures deletion of the persistent object - std::auto_ptr shapestore( poolReadObject< EventShapeStore_p1 >() ); + std::unique_ptr shapestore( poolReadObject< EventShapeStore_p1 >() ); MsgStream report( msgSvc(), "EventShapeStoreCnv" ); report << MSG::INFO << "Reading EventShapeStore_p1" << endmsg; return TPconverter.createTransient( shapestore.get(), report ); diff --git a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx index 35b14133d51..57c56bb5e95 100755 --- a/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx +++ b/Reconstruction/RecEventAthenaPool/src/RecoTimingObjCnv.cxx @@ -39,7 +39,7 @@ RecoTimingObj* RecoTimingObjCnv::createTransient() if ( compareClassGuid(p1_guid) ) { // using auto_ptr ensures deletion of the persistent object - std::auto_ptr persObj( poolReadObject() ); + std::unique_ptr persObj( poolReadObject() ); RecoTimingObjCnv_p1 cnv; transObj = cnv.createTransient( persObj.get(), *m_msg ); } else { diff --git a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.cxx b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.cxx index d09a9d01bf1..3213c0c69fe 100755 --- a/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.cxx +++ b/Reconstruction/TrackParticleTruthAthenaPool/src/TrackParticleTruthCollectionCnv.cxx @@ -42,7 +42,7 @@ TrackParticleTruthCollectionPERS* TrackParticleTruthCollectionCnv::createPersist //================================================================ TrackParticleTruthCollection* TrackParticleTruthCollectionCnv::createTransient() { MsgStream log(msgSvc(), "TrackParticleTruthCollectionCnv" ); - std::auto_ptr trans(new TrackParticleTruthCollection()); + std::unique_ptr trans(new TrackParticleTruthCollection()); if (compareClassGuid(s_p2_guid)) { log< trans(new PRD_MultiTruthCollection()); + std::unique_ptr trans(new PRD_MultiTruthCollection()); if (compareClassGuid(s_p3_guid)) { log< trans(new TrackTruthCollection()); + std::unique_ptr trans(new TrackTruthCollection()); if (compareClassGuid(s_p2_guid)) { log<