From ce976828ad090044da9dd7e6d93c8b1550002c1d Mon Sep 17 00:00:00 2001
From: soul <soul@se51-99.jinr.ru>
Date: Wed, 8 Feb 2017 16:41:29 +0300
Subject: [PATCH] small correction of main macros for CDASH; MPDScheduler
update; correct coefficient file closing and deleting of TFile pointer in
MpdTPCpid class
---
macro/mpd/reco.C | 2 +-
macro/mpd/runMC.C | 3 +--
macro/mpd_scheduler | 2 +-
tpc/MpdTPCpid.cxx | 3 ++-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/macro/mpd/reco.C b/macro/mpd/reco.C
index 80198cb..ad0e4e0 100644
--- a/macro/mpd/reco.C
+++ b/macro/mpd/reco.C
@@ -186,7 +186,7 @@ void reco(TString inFile = "$VMCWORKDIR/macro/mpd/evetest.root", TString outFile
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
cout << endl << endl;
- cout << "Macro finished succesfully." << endl;
+ cout << "Macro finished successfully." << endl; // marker of successful execution for CDASH
cout << "Output file is " << outFile << endl;
cout << "Parameter file is " << parFile << endl;
cout << "Real time " << rtime << " s, CPU time " << ctime << " s" << endl;
diff --git a/macro/mpd/runMC.C b/macro/mpd/runMC.C
index bbfa564..c06ad8e 100644
--- a/macro/mpd/runMC.C
+++ b/macro/mpd/runMC.C
@@ -306,8 +306,7 @@ void runMC(TString inFile = "auau.09gev.mbias.98k.ftn14", TString outFile = "$VM
timer.Stop();
Double_t rtime = timer.RealTime(), ctime = timer.CpuTime();
printf("RealTime=%f seconds, CpuTime=%f seconds\n", rtime, ctime);
-
- cout << "Macro finished succesfully." << endl;
+ cout << "Macro finished successfully." << endl; // marker of successful execution for CDASH
gApplication->Terminate();
}
diff --git a/macro/mpd_scheduler b/macro/mpd_scheduler
index b125ce9..3c84fd3 160000
--- a/macro/mpd_scheduler
+++ b/macro/mpd_scheduler
@@ -1 +1 @@
-Subproject commit b125ce9650e775cbf59582e14301757c01ec0209
+Subproject commit 3c84fd363859e5a8da81d320fc578efcaa70fb11
diff --git a/tpc/MpdTPCpid.cxx b/tpc/MpdTPCpid.cxx
index f7005ab..6a3cdd1 100644
--- a/tpc/MpdTPCpid.cxx
+++ b/tpc/MpdTPCpid.cxx
@@ -42,7 +42,8 @@ fCoefficients(NULL) {
}
MpdTPCpid::~MpdTPCpid() {
- fCoefficients->Delete();
+ delete fCoefficients;
+ fCoefficients = 0;
}
Int_t MpdTPCpid::GetTpcProbs(Float_t P, Float_t dedx, Int_t nHits, Float_t& Ppi, Float_t& Pk, Float_t& Pp, Float_t& Pe, Int_t method) {
--
GitLab