LMU/musrfit
5
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 5 Activity

more work to get rid of raw pointers.

Browse Source
This commit is contained in:
suter_a
2023-10-25 09:12:10 +02:00
parent 75bb526ca3
commit f9d0d7f18f
8 changed files with 58 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/musrFT.cpp
+9 -28
View File
@@ -1053,16 +1053,8 @@ Int_t main(Int_t argc, Char_t *argv[])
PStartupOptions startup_options;
startup_options.writeExpectedChisq = false;
startup_options.estimateN0 = true;
std::unique_ptr<TSAXParser> saxParser = std::unique_ptr<TSAXParser>(new TSAXParser());
if (saxParser == nullptr) {
std::cerr << ">> musrFT: **ERROR** couldn't invoke TSAXParser object" << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
if (startupHandler == nullptr) {
std::cerr << ">> musrFT: **ERROR** couldn't invoke PStartupHandler object" << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
if (!startupHandler->StartupFileFound()) {
std::cerr << std::endl << ">> musrFT **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
std::cerr << std::endl;
@@ -1095,11 +1087,7 @@ Int_t main(Int_t argc, Char_t *argv[])
std::vector< std::unique_ptr<PMsrHandler> > msrHandler;
msrHandler.resize(startupParam.msrFln.size());
for (UInt_t i=0; i<startupParam.msrFln.size(); i++) {
msrHandler[i] = std::unique_ptr<PMsrHandler>(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;
}
msrHandler[i] = std::make_unique<PMsrHandler>(startupParam.msrFln[i].Data(), &startup_options, true);
status = msrHandler[i]->ReadMsrFile();
if (status != PMUSR_SUCCESS) {
switch (status) {
@@ -1123,12 +1111,11 @@ Int_t main(Int_t argc, Char_t *argv[])
for (UInt_t i=0; i<msrHandler.size(); i++) {
// create run data handler
if (startupHandler)
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(msrHandler[i].get(), startupHandler->GetDataPathList()));
runDataHandler[i] = std::make_unique<PRunDataHandler>(msrHandler[i].get(), startupHandler->GetDataPathList());
else
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(msrHandler[i].get()));
runDataHandler[i] = std::make_unique<PRunDataHandler>(msrHandler[i].get());
if (runDataHandler[i] == nullptr) {
std::cerr << ">> musrFT: **ERROR** couldn't invoke PRunDataHandler object" << std::endl;
std::cerr << ">> musrFT: **ERROR** couldn't allocate PRunDataHandler object." << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
}
@@ -1137,12 +1124,11 @@ Int_t main(Int_t argc, Char_t *argv[])
for (UInt_t i=msrHandler.size(); i<msrHandler.size()+startupParam.dataFln.size(); i++) {
// create run data handler
if (startupHandler)
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()], startupHandler->GetDataPathList()));
runDataHandler[i] = std::make_unique<PRunDataHandler>(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()], startupHandler->GetDataPathList());
else
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(startupParam.dataFln[i-msrHandler.size()], startupParam.dataFileFormat[i-msrHandler.size()]));
runDataHandler[i] = std::make_unique<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;
std::cerr << ">> musrFT: **ERROR** couldn't allocate PRunDataHandler object." << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
}
@@ -1564,11 +1550,6 @@ Int_t main(Int_t argc, Char_t *argv[])
delete histo[i];
histo.clear();
}
if (fourier.size() > 0) {
for (UInt_t i=0; i<fourier.size(); i++)
delete fourier[i];
fourier.clear();
}
return PMUSR_SUCCESS;
}