From c54bc5c0dc365d201b5c8ae6de5b61c2024b0e3e Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Fri, 13 Oct 2023 22:46:01 +0200 Subject: [PATCH] replaced raw pointers by smart pointers for musrFT.cpp. --- src/musrFT.cpp | 103 ++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/src/musrFT.cpp b/src/musrFT.cpp index bae2dba9..dec466aa 100644 --- a/src/musrFT.cpp +++ b/src/musrFT.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -1052,40 +1053,30 @@ Int_t main(Int_t argc, Char_t *argv[]) PStartupOptions startup_options; startup_options.writeExpectedChisq = false; startup_options.estimateN0 = true; - TSAXParser *saxParser = new TSAXParser(); - PStartupHandler *startupHandler = new PStartupHandler(); + std::unique_ptr saxParser = std::unique_ptr(new TSAXParser()); + if (saxParser == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke TSAXParser object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } + std::unique_ptr startupHandler = std::unique_ptr(new PStartupHandler()); + if (startupHandler == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke PStartupHandler object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } if (!startupHandler->StartupFileFound()) { std::cerr << std::endl << ">> musrFT **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data(); std::cerr << std::endl; - // clean up - if (saxParser) { - delete saxParser; - saxParser = nullptr; - } - if (startupHandler) { - delete startupHandler; - startupHandler = nullptr; - } } else { strcpy(startup_path_name, startupHandler->GetStartupFilePath().Data()); - saxParser->ConnectToHandler("PStartupHandler", startupHandler); + saxParser->ConnectToHandler("PStartupHandler", startupHandler.get()); //status = saxParser->ParseFile(startup_path_name); // parsing the file as above seems to lead to problems in certain environments; // use the parseXmlFile function instead (see PStartupHandler.cpp for the definition) - status = parseXmlFile(saxParser, startup_path_name); + status = parseXmlFile(saxParser.get(), startup_path_name); // check for parse errors if (status) { // error std::cerr << std::endl << ">> musrFT **WARNING** Reading/parsing musrfit_startup.xml failed."; std::cerr << std::endl; - // clean up - if (saxParser) { - delete saxParser; - saxParser = nullptr; - } - if (startupHandler) { - delete startupHandler; - startupHandler = nullptr; - } } } @@ -1101,10 +1092,14 @@ Int_t main(Int_t argc, Char_t *argv[]) PPrepFourier data(startupParam.packing, startupParam.bkg_range, startupParam.bkg); // load msr-file(s) - std::vector msrHandler; + std::vector< std::unique_ptr > msrHandler; msrHandler.resize(startupParam.msrFln.size()); for (UInt_t i=0; i(new PMsrHandler(startupParam.msrFln[i].Data(), &startup_options, true)); + if (msrHandler[i] == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke PMsrHandler object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } status = msrHandler[i]->ReadMsrFile(); if (status != PMUSR_SUCCESS) { switch (status) { @@ -1122,24 +1117,34 @@ Int_t main(Int_t argc, Char_t *argv[]) } } - std::vector runDataHandler; + std::vector< std::unique_ptr > runDataHandler; runDataHandler.resize(startupParam.msrFln.size()+startupParam.dataFln.size()); // resize to the total number of run data provided // load data-file(s) related to msr-file for (UInt_t i=0; iGetDataPathList()); + runDataHandler[i] = std::unique_ptr(new PRunDataHandler(msrHandler[i].get(), startupHandler->GetDataPathList())); else - runDataHandler[i] = new PRunDataHandler(msrHandler[i]); + runDataHandler[i] = std::unique_ptr(new PRunDataHandler(msrHandler[i].get())); + + if (runDataHandler[i] == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke PRunDataHandler object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } } // load data-file(s) provided directly for (UInt_t i=msrHandler.size(); iGetDataPathList()); + runDataHandler[i] = std::unique_ptr(new PRunDataHandler(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()], startupHandler->GetDataPathList())); else - runDataHandler[i] = new PRunDataHandler(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()]); + runDataHandler[i] = std::unique_ptr(new PRunDataHandler(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()])); + + if (runDataHandler[i] == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke PRunDataHandler object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } } // read all the data files @@ -1318,7 +1323,7 @@ Int_t main(Int_t argc, Char_t *argv[]) // handle data set(s) // group forward histos - if (musrFT_groupHistos(runDataHandler[i], global, runs->at(runList[j]-1), rd)) { + if (musrFT_groupHistos(runDataHandler[i].get(), global, runs->at(runList[j]-1), rd)) { return PMUSR_DATA_FILE_READ_ERROR; } // keep data set @@ -1448,7 +1453,11 @@ Int_t main(Int_t argc, Char_t *argv[]) else std::cout << "info> will use DKS" << std::endl; for (UInt_t i=0; i> musrFT: **ERROR** couldn't invoke PFourier object" << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; + } } // Fourier transform data @@ -1472,7 +1481,7 @@ Int_t main(Int_t argc, Char_t *argv[]) startupParam.fourierRange[1] = fourier[0]->GetMaxFreq(); } - PFourierCanvas *fourierCanvas = nullptr; + std::unique_ptr fourierCanvas; // if Fourier dumped if whished do it now if (startupParam.dumpFln.Length() > 0) { @@ -1492,19 +1501,23 @@ Int_t main(Int_t argc, Char_t *argv[]) TApplication app("App", &argc, argv); if (startupHandler) { - fourierCanvas = new PFourierCanvas(fourier, dataSetTag, startupParam.title.Data(), + fourierCanvas = std::unique_ptr(new PFourierCanvas(fourier, dataSetTag, startupParam.title.Data(), startupParam.showAverage, startupParam.showAveragePerDataSet, fourierPlotTag, startupParam.fourierRange, startupParam.initialPhase, 10, 10, 800, 800, startupHandler->GetMarkerList(), startupHandler->GetColorList(), - batch); + batch)); } else { - fourierCanvas = new PFourierCanvas(fourier, dataSetTag, startupParam.title.Data(), + fourierCanvas = std::unique_ptr(new PFourierCanvas(fourier, dataSetTag, startupParam.title.Data(), startupParam.showAverage, startupParam.showAveragePerDataSet, fourierPlotTag, startupParam.fourierRange, startupParam.initialPhase, 10, 10, 800, 800, - batch); + batch)); + } + if (fourierCanvas == nullptr) { + std::cerr << ">> musrFT: **ERROR** couldn't invoke PFourierCanvas object." << std::endl; + return PMUSR_MSR_ALLOCATION_ERROR; } fourierCanvas->UpdateFourierPad(); @@ -1517,7 +1530,7 @@ Int_t main(Int_t argc, Char_t *argv[]) ok = false; } else { // connect signal/slot - TQObject::Connect("TCanvas", "Closed()", "PFourierCanvas", fourierCanvas, "LastCanvasClosed()"); + TQObject::Connect("TCanvas", "Closed()", "PFourierCanvas", fourierCanvas.get(), "LastCanvasClosed()"); fourierCanvas->SetTimeout(startupParam.timeout); @@ -1546,22 +1559,6 @@ Int_t main(Int_t argc, Char_t *argv[]) // cleanup - if (fourierCanvas) - delete fourierCanvas; - - if (startupHandler) - delete startupHandler; - - for (UInt_t i=0; i 0) { for (UInt_t i=0; i