more work to get rid of raw pointers.

src/addRun.cpp

@@ -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<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
+  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()));
+      runDataHandler[i] = std::make_unique<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]->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));
+      runDataHandler[i] = std::make_unique<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]->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());
+    info = std::make_unique<PAny2ManyInfo>();
-    if (info == nullptr) {
-      std::cerr << std::endl;
-      std::cerr << "**ERROR** couldn't invoke PAny2ManyInfo." << std::endl;
-      std::cerr << std::endl;
-      isGood = false;
-    }
   }
 
   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()));
+    dataOut = std::make_unique<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;
-    }
   }
 
   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());
+    PRawRunData *rawRunData = nullptr;
-    rawRunData = std::unique_ptr<PRawRunData>(runDataHandler[0]->GetRunData()); // copy all
+    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();
     }

src/any2many.cpp

@@ -494,8 +494,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<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
   if (!startupHandler->StartupFileFound()) {
     std::cerr << std::endl << ">> any2many **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
     std::cerr << std::endl;
@@ -516,9 +516,9 @@ int main(int argc, char *argv[])
   // read all the necessary runs (raw data)
   std::unique_ptr<PRunDataHandler> dataHandler;
   if (startupHandler)
-    dataHandler = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(&info, startupHandler->GetDataPathList()));
+    dataHandler = std::make_unique<PRunDataHandler>(&info, startupHandler->GetDataPathList());
   else
-    dataHandler = std::unique_ptr<PRunDataHandler>(new PRunDataHandler(&info));
+    dataHandler = std::make_unique<PRunDataHandler>(&info);
 
   // read and convert all data
   dataHandler->ConvertData();

src/dump_header.cpp

@@ -200,13 +200,7 @@ int dump_header_root(const std::string fileName, const bool summary, const bool
     std::cout << std::endl << "-------------------" << std::endl << std::endl;
   } else { // MusrRoot
     // invoke the MusrRoot header object
-    header = std::unique_ptr<TMusrRunHeader>(new TMusrRunHeader(fileName.c_str(), true)); // read quite
+    header = std::make_unique<TMusrRunHeader>(fileName.c_str(), true); // read quite
-    if (header == nullptr) {
-      std::cerr << std::endl << "**ERROR** Couldn't invoke MusrRoot RunHeader in file:" << fileName;
-      std::cerr << std::endl;
-      f.Close();
-      return 1;
-    }
 
     // try to populate the MusrRoot header object
     if (!header->ExtractAll(folder)) {
@@ -320,14 +314,7 @@ int dump_header_root(const std::string fileName, const bool summary, const bool
 int dump_header_nexus(const std::string fileName, const bool counts) {
 
 #ifdef PNEXUS_ENABLED
-  std::unique_ptr<PNeXus> nxs_file = std::unique_ptr<PNeXus>(new PNeXus(fileName.c_str()));
+  std::unique_ptr<PNeXus> nxs_file = std::make_unique<PNeXus>(fileName.c_str());
-
-  if (nxs_file == nullptr) {
-    std::cerr << std::endl;
-    std::cerr << "**ERROR** couldn't invoke NeXus file object." << std::endl;
-    std::cerr << std::endl;
-    return 1;
-  }
 
   if (nxs_file->IsValid(false)) {
     nxs_file->Dump(counts);
@@ -930,8 +917,8 @@ int main(int argc, char *argv[])
   // invoke the startup handler in order to get the default search paths to the data files
   // read startup file
   char startup_path_name[128];
-  std::unique_ptr<TSAXParser> saxParser = std::unique_ptr<TSAXParser>(new TSAXParser());
+  std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
   if (!startupHandler->StartupFileFound()) {
     std::cerr << std::endl << ">> musrfit **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
     std::cerr << std::endl;

src/msr2data.cpp

@@ -555,12 +555,7 @@ int main(int argc, char *argv[])
         run_list += arg[i] + " ";
       }
       // parse run_list string
-      std::unique_ptr<PStringNumberList> nl = std::unique_ptr<PStringNumberList>(new PStringNumberList(run_list));
+      std::unique_ptr<PStringNumberList> nl = std::make_unique<PStringNumberList>(run_list);
-      if (nl == nullptr) { // couldn't invoke object
-        std::cerr << std::endl;
-        std::cerr << ">> msr2data: **ERROR** Couldn't invoke run_list parser object! Quitting now." << std::endl;
-        return 0;
-      }
       std::string errorMsg("");
       if (!nl->Parse(errorMsg)) {
         std::cerr << std::endl;
@@ -662,12 +657,7 @@ int main(int argc, char *argv[])
     realOutput = false;
 
   // create the msr2data-object and set the run numbers according to the runTAG above
-  std::unique_ptr<PMsr2Data> msr2dataHandler = std::unique_ptr<PMsr2Data>(new PMsr2Data(msrExtension));
+  std::unique_ptr<PMsr2Data> msr2dataHandler = std::make_unique<PMsr2Data>(msrExtension);
-  if (msr2dataHandler == nullptr) {
-    std::cerr << std::endl;
-    std::cerr << ">> msr2data: **ERROR** couldn't invoke msr2dataHandler." << std::endl;
-    return -1;
-  }
 
   int status;
 
@@ -801,7 +791,7 @@ int main(int argc, char *argv[])
 
     // delete old db/data file if the "new" option is given
     if (!msr2data_useOption(arg, "new")) {
-      fileOutput = std::unique_ptr<std::fstream>(new std::fstream);
+      fileOutput = std::make_unique<std::fstream>();
       fileOutput->open(outputFile.c_str(), std::ios::in);
       if (fileOutput->is_open()) {
         std::cout << std::endl << ">> msr2data: **INFO** Deleting output file " << outputFile << std::endl;
@@ -980,7 +970,7 @@ int main(int argc, char *argv[])
   // Unfortunately, there are also problems with boost::filesystem::exists(outputFile)
   // Therefore, first try to open the file for reading and if this works, write to it - not clean but it works
   if (realOutput) {
-    fileOutput = std::unique_ptr<std::fstream>(new std::fstream);
+    fileOutput = std::make_unique<std::fstream>();
     fileOutput->open(outputFile.c_str(), std::ios::in);
     if (fileOutput->is_open()) {
       fileOutput->close();

src/musrFT.cpp

@@ -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());
+  std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  if (saxParser == nullptr) {
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
-    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;
-  }
   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));
+    msrHandler[i] = std::make_unique<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) {
@@ -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;
 }

src/musrfit.cpp

@@ -290,14 +290,14 @@ void musrfit_write_root(TFile &f, TString fln, PRunData *data, int runCounter)
 
   snprintf(name, sizeof(name),"c%d", runCounter);
 
-  std::unique_ptr<TCanvas> c = std::unique_ptr<TCanvas>(new TCanvas(name, title.Data(), 10, 10, 800, 600));
+  std::unique_ptr<TCanvas> c = std::make_unique<TCanvas>(name, title.Data(), 10, 10, 800, 600);
 
   // create histos
   Double_t diff = data->GetDataTimeStep();
   Double_t start = -diff/2.0;
   Double_t end = data->GetDataTimeStep()*data->GetValue()->size();
-  std::unique_ptr<TH1F> hdata = std::unique_ptr<TH1F>(new TH1F("hdata", "run data", data->GetValue()->size(), start, end));
+  std::unique_ptr<TH1F> hdata = std::make_unique<TH1F>("hdata", "run data", data->GetValue()->size(), start, end);
-  std::unique_ptr<TH1F> htheo = std::unique_ptr<TH1F>(new TH1F("htheo", "run theory", data->GetValue()->size(), start, end));
+  std::unique_ptr<TH1F> htheo = std::make_unique<TH1F>("htheo", "run theory", data->GetValue()->size(), start, end);
 
   // fill data
   for (unsigned int i=0; i<data->GetValue()->size(); i++) {
@@ -618,8 +618,8 @@ int main(int argc, char *argv[])
 
   // read startup file
   char startup_path_name[128];
-  std::unique_ptr<TSAXParser> saxParser(new TSAXParser());
+  std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  std::unique_ptr<PStartupHandler> startupHandler(new PStartupHandler());
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
   if (!startupHandler->StartupFileFound()) {
     std::cerr << std::endl << ">> musrfit **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
     std::cerr << std::endl;
@@ -645,9 +645,9 @@ int main(int argc, char *argv[])
   // read msr-file
   std::unique_ptr<PMsrHandler> msrHandler;
   if (startupHandler)
-    msrHandler = std::unique_ptr<PMsrHandler>(new PMsrHandler(filename, &startup_options));
+    msrHandler = std::make_unique<PMsrHandler>(filename, &startup_options);
   else
-    msrHandler = std::unique_ptr<PMsrHandler>(new PMsrHandler(filename));
+    msrHandler = std::make_unique<PMsrHandler>(filename);
   status = msrHandler->ReadMsrFile();
   if (status != PMUSR_SUCCESS) {
     switch (status) {
@@ -667,9 +667,9 @@ int main(int argc, char *argv[])
   // read all the necessary runs (raw data)
   std::unique_ptr<PRunDataHandler> dataHandler;
   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();
 
@@ -690,7 +690,7 @@ int main(int argc, char *argv[])
   std::unique_ptr<PRunListCollection> runListCollection;
   if (success) {
     // feed all the necessary histogramms for the fit   
-    runListCollection = std::unique_ptr<PRunListCollection>(new PRunListCollection(msrHandler.get(), dataHandler.get()));
+    runListCollection = std::make_unique<PRunListCollection>(msrHandler.get(), dataHandler.get());
     for (unsigned int i=0; i < msrHandler->GetMsrRunList()->size(); i++) {
       success = runListCollection->Add(i, kFit);
       if (!success) {
@@ -705,7 +705,7 @@ int main(int argc, char *argv[])
   std::unique_ptr<TThread> th;
   if (timeout_enabled) {
     pid_t musrfit_pid = getpid();
-    th = std::unique_ptr<TThread>(new TThread(musrfit_timeout, (void*)&musrfit_pid));
+    th = std::make_unique<TThread>(musrfit_timeout, (void*)&musrfit_pid);
     if (th) {
       th->Run();
     }
@@ -714,7 +714,7 @@ int main(int argc, char *argv[])
   // do fitting
   std::unique_ptr<PFitter> fitter;
   if (success) {
-    fitter = std::unique_ptr<PFitter>(new PFitter(msrHandler.get(), runListCollection.get(), chisq_only));
+    fitter = std::make_unique<PFitter>(msrHandler.get(), runListCollection.get(), chisq_only);
     if (fitter->IsValid()) {
       fitter->DoFit();
       if (!fitter->IsScanOnly())

src/musrt0.cpp

@@ -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));
+  std::unique_ptr<PMusrT0> musrT0 = std::make_unique<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;
-  }
 
   // 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());
+  std::unique_ptr<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  if (saxParser == nullptr) {
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
-    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;
-  }
   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));
+  std::unique_ptr<PMsrHandler> msrHandler = std::make_unique<PMsrHandler>(filename);
-  if (msrHandler == nullptr) {
-    std::cerr << ">> musrt0: **ERROR** couldn't invoke PMsrHandler." << std::endl;
-    return PMUSR_MSR_ALLOCATION_ERROR;
-  }
   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();
 

src/musrview.cpp

@@ -200,8 +200,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<TSAXParser> saxParser = std::make_unique<TSAXParser>();
-  std::unique_ptr<PStartupHandler> startupHandler = std::unique_ptr<PStartupHandler>(new PStartupHandler());
+  std::unique_ptr<PStartupHandler> startupHandler = std::make_unique<PStartupHandler>();
   if (!startupHandler->StartupFileFound()) {
     std::cerr << std::endl << ">> musrview **WARNING** couldn't find " << startupHandler->GetStartupFilePath().Data();
     std::cerr << std::endl;
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
   }
 
   // read msr-file
-  std::unique_ptr<PMsrHandler> msrHandler = std::unique_ptr<PMsrHandler>(new PMsrHandler(fileName));
+  std::unique_ptr<PMsrHandler> msrHandler = std::make_unique<PMsrHandler>(fileName);
   status = msrHandler->ReadMsrFile();
   if (status != PMUSR_SUCCESS) {
     switch (status) {
@@ -262,9 +262,9 @@ int main(int argc, char *argv[])
   // read all the necessary runs (raw data)
   std::unique_ptr<PRunDataHandler> dataHandler;
   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();
 
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
   std::unique_ptr<PRunListCollection> runListCollection;
   if (result == PMUSR_SUCCESS) {
     // feed all the necessary histogramms for the view
-    runListCollection = std::unique_ptr<PRunListCollection>(new PRunListCollection(msrHandler.get(), dataHandler.get(), theoAtData));
+    runListCollection = std::make_unique<PRunListCollection>(msrHandler.get(), dataHandler.get(), theoAtData);
     for (unsigned int i=0; i<msrHandler->GetMsrRunList()->size(); i++) {
       // if run is in plotList add it, otherwise go to the next
       runPresent = false;