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

48
src/addRun.cpp
View File

@@ -536,8 +536,8 @@ int main(int argc, char *argv[])
// read startup file
char startup_path_name[128];
std::unique_ptr<TSAXParser> saxParser = std::unique_ptr<TSAXParser>(new TSAXParser());
std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
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 << ">> addRun **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
std::cerr << std::endl;
@@ -627,14 +627,7 @@ int main(int argc, char *argv[])
Bool_t isGood{true};
for (UInt_t i=0; i<runDataHandler.size(); i++) {
if (startupHandler != nullptr) {
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(addRunInfo[i].fPathFileName, addRunInfo[i].fFileFormat, startupHandler->GetDataPathList()));
if (runDataHandler[i] == nullptr) {
isGood = false;
std::cerr << std::endl;
std::cerr << "**ERROR** couldn't invoke PRunDataHandler (i=" << i << ")." << std::endl;
std::cerr << std::endl;
break;
}
runDataHandler[i] = std::make_unique<PRunDataHandler>(addRunInfo[i].fPathFileName, addRunInfo[i].fFileFormat, startupHandler->GetDataPathList());
runDataHandler[i]->ReadData();
if (!runDataHandler[i]->IsAllDataAvailable()) {
isGood = false;
@@ -644,14 +637,7 @@ int main(int argc, char *argv[])
break;
}
} else {
runDataHandler[i] = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(addRunInfo[i].fPathFileName, addRunInfo[i].fFileFormat));
if (runDataHandler[i] == nullptr) {
isGood = false;
std::cerr << std::endl;
std::cerr << "**ERROR** couldn't invoke PRunDataHandler (i=" << i << ")." << std::endl;
std::cerr << std::endl;
break;
}
runDataHandler[i] = std::make_unique<PRunDataHandler>(addRunInfo[i].fPathFileName, addRunInfo[i].fFileFormat);
runDataHandler[i]->ReadData();
if (!runDataHandler[i]->IsAllDataAvailable()) {
isGood = false;
@@ -678,13 +664,7 @@ int main(int argc, char *argv[])
break;
}
}
info = std::unique_ptr<PAny2ManyInfo>(new PAny2ManyInfo());
if (info == nullptr) {
std::cerr << std::endl;
std::cerr << "**ERROR** couldn't invoke PAny2ManyInfo." << std::endl;
std::cerr << std::endl;
isGood = false;
}
info = std::make_unique<PAny2ManyInfo>();
}
if (isGood) {
@@ -692,13 +672,7 @@ int main(int argc, char *argv[])
info->outFormat = format;
info->year = year;
info->outFileName = flnOut;
dataOut = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(info.get()));
if (dataOut == nullptr) {
std::cerr << std::endl;
std::cerr << "**ERROR** couldn't invoke PRunDataHandler for the output file." << std::endl;
std::cerr << std::endl;
isGood = false;
}
dataOut = std::make_unique<PRunDataHandler>(info.get());
}
if (isGood) {
@@ -795,8 +769,12 @@ int main(int argc, char *argv[])
}
// feed all the necessary information for the data file
std::unique_ptr<PRawRunData> rawRunData = std::unique_ptr<PRawRunData>(new PRawRunData());
rawRunData = std::unique_ptr<PRawRunData>(runDataHandler[0]->GetRunData()); // copy all
PRawRunData *rawRunData = nullptr;
rawRunData = runDataHandler[0]->GetRunData(); // copy all
if (rawRunData == nullptr) {
std::cerr << ">> addRun: **ERROR** couldn't obtain PRawRunData object." << std::endl;
return PMUSR_MSR_ALLOCATION_ERROR;
}
rawRunData->SetGenerator("addRun");
// overwrite the t0 values with the new ones
for (UInt_t i=0; i<rawRunData->GetNoOfHistos(); i++) {
@@ -808,7 +786,7 @@ int main(int argc, char *argv[])
}
// feed run data handler with new data
if (dataOut->SetRunData(rawRunData.get())) {
if (dataOut->SetRunData(rawRunData)) {
// write output file
dataOut->WriteData();
}