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

more work to get rid of raw pointers.

Browse Source
This commit is contained in:
suter_a
2023-10-17 16:35:54 +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

32
src/musrt0.cpp
View File

@@ -95,15 +95,7 @@ void musrt0_syntax()
*/
Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data, UInt_t idx, Int_t timeout)
{
std::unique_ptr<PMusrT0> musrT0 = std::unique_ptr<PMusrT0>(new PMusrT0(data));
// check if the musrT0 object could be invoked
if (musrT0 == nullptr) {
std::cerr << std::endl << ">> musrt0 **ERROR** Couldn't invoke musrT0 ...";
std::cerr << std::endl << ">> run name " << data.GetRawRunData(idx)->GetRunName()->Data();
std::cerr << std::endl;
return false;
}
std::unique_ptr<PMusrT0> musrT0 = std::make_unique<PMusrT0>(data);
// check if the musrT0 object is valid
if (!musrT0->IsValid()) {
@@ -279,16 +271,8 @@ Int_t main(Int_t argc, Char_t *argv[])
// read startup file
Char_t startup_path_name[128];
std::unique_ptr<TSAXParser> saxParser = std::unique_ptr<TSAXParser>(new TSAXParser());
if (saxParser == nullptr) {
std::cerr << ">> musrt0: **ERROR** couldn't invoke TSAXParser." << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
if (startupHandler == nullptr) {
std::cerr << ">> musrt0: **ERROR** couldn't invoke PStartupHandler." << 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 << ">> musrt0 **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
std::cerr << std::endl;
@@ -307,11 +291,7 @@ Int_t main(Int_t argc, Char_t *argv[])
}
// read msr-file
std::unique_ptr<PMsrHandler> msrHandler = std::unique_ptr<PMsrHandler>(new PMsrHandler(filename));
if (msrHandler == nullptr) {
std::cerr << ">> musrt0: **ERROR** couldn't invoke PMsrHandler." << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
std::unique_ptr<PMsrHandler> msrHandler = std::make_unique<PMsrHandler>(filename);
status = msrHandler->ReadMsrFile();
if (status != PMUSR_SUCCESS) {
switch (status) {
@@ -347,9 +327,9 @@ Int_t main(Int_t argc, Char_t *argv[])
std::unique_ptr<PRunDataHandler> dataHandler;
if (success) {
if (startupHandler)
dataHandler = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(msrHandler.get(), startupHandler->GetDataPathList()));
dataHandler = std::make_unique<PRunDataHandler>(msrHandler.get(), startupHandler->GetDataPathList());
else
dataHandler = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(msrHandler.get()));
dataHandler = std::make_unique<PRunDataHandler>(msrHandler.get());
dataHandler->ReadData();