From 1da4117bfa8c99848f411fba96d0707142562f2e Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Thu, 1 Aug 2024 17:30:59 +0200
Subject: [PATCH] bugfix in macros: save rtdb after the run initialization
---
macro/C2F/c2f_transport.C | 4 ++--
macro/beamtime/mcbm2022/mcbm_digievent_display.C | 5 +++--
macro/beamtime/mcbm2022/mcbm_digievent_reco.C | 4 ++--
macro/beamtime/mcbm2022/mcbm_event_reco.C | 4 ++--
macro/beamtime/mcbm2022/mcbm_reco.C | 4 ++--
macro/mcbm/eventDisplay_reco.C | 2 +-
macro/mcbm/mcbm_mc_nh.C | 4 ++--
macro/mcbm/mcbm_pribeam.C | 4 ++--
macro/mcbm/mcbm_qa_nh.C | 2 +-
macro/mcbm/mcbm_reco_dev.C | 4 ++--
macro/mcbm/mcbm_reco_gp.C | 4 ++--
macro/mcbm/mcbm_reco_nh.C | 4 ++--
macro/mcbm/sps17_mc.C | 4 ++--
macro/tutorial/run_HitProducerTaskIdeal.C | 2 +-
14 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/macro/C2F/c2f_transport.C b/macro/C2F/c2f_transport.C
index bb66f66e16..1840abb37b 100644
--- a/macro/C2F/c2f_transport.C
+++ b/macro/C2F/c2f_transport.C
@@ -240,8 +240,6 @@ void c2f_transport(Int_t nEvents = 2, const char* setupName = "sis100_electron",
FairParRootFileIo* parOut = new FairParRootFileIo(kParameterMerged);
parOut->open(parFile.Data());
rtdb->setOutput(parOut);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -253,6 +251,8 @@ void c2f_transport(Int_t nEvents = 2, const char* setupName = "sis100_electron",
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
run->CreateGeometryFile(geoFile);
timer.Stop();
Double_t rtime = timer.RealTime();
diff --git a/macro/beamtime/mcbm2022/mcbm_digievent_display.C b/macro/beamtime/mcbm2022/mcbm_digievent_display.C
index 8695ad0203..79561073fd 100644
--- a/macro/beamtime/mcbm2022/mcbm_digievent_display.C
+++ b/macro/beamtime/mcbm2022/mcbm_digievent_display.C
@@ -1293,8 +1293,6 @@ Bool_t mcbm_digievent_display(UInt_t uRunId = 2391,
parIo3->open(parFileOut.Data(), "RECREATE");
// ------------------------------------------------------------------------
rtdb->setOutput(parIo3);
- rtdb->saveOutput();
- rtdb->print();
// ----- Event display ---------------------------------------------------------------------------------------- //
std::string sXmlGeoConfig = "evt_disp_conf_mcbm_beam_2022_05_23_nickel.xml";
@@ -1340,6 +1338,9 @@ Bool_t mcbm_digievent_display(UInt_t uRunId = 2391,
ann->SetTextColor(4);
// ---------------------------------------------------------------------------------------------------------------- //
+ rtdb->saveOutput();
+ rtdb->print();
+
if (kFALSE) {
gROOT->LoadMacro("save_hst.C");
TString SaveToHstFile = "save_hst(\"" + cHstFile + "\")";
diff --git a/macro/beamtime/mcbm2022/mcbm_digievent_reco.C b/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
index f595b4d944..86dda771aa 100644
--- a/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_digievent_reco.C
@@ -637,8 +637,6 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
parIo3->open(parFileOut.Data(), "RECREATE");
// ------------------------------------------------------------------------
rtdb->setOutput(parIo3);
- rtdb->saveOutput();
- rtdb->print();
// ----- Run initialisation -------------------------------------------
std::cout << std::endl;
@@ -659,6 +657,8 @@ Bool_t mcbm_digievent_reco(UInt_t uRunId = 2365,
gInterpreter->ProcessLine(SaveToHstFile);
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
FairMonitor::GetMonitor()->Print();
Double_t rtime = timer.RealTime();
diff --git a/macro/beamtime/mcbm2022/mcbm_event_reco.C b/macro/beamtime/mcbm2022/mcbm_event_reco.C
index e893e9b8f1..cac2c468e7 100644
--- a/macro/beamtime/mcbm2022/mcbm_event_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_event_reco.C
@@ -944,8 +944,6 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
parIo3->open(parFileOut.Data(), "RECREATE");
// ------------------------------------------------------------------------
rtdb->setOutput(parIo3);
- rtdb->saveOutput();
- rtdb->print();
// ----- Run initialisation -------------------------------------------
std::cout << std::endl;
@@ -963,6 +961,8 @@ Bool_t mcbm_event_reco(UInt_t uRunId = 2391,
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
FairMonitor::GetMonitor()->Print();
Double_t rtime = timer.RealTime();
diff --git a/macro/beamtime/mcbm2022/mcbm_reco.C b/macro/beamtime/mcbm2022/mcbm_reco.C
index b4ac888013..4357665e4b 100644
--- a/macro/beamtime/mcbm2022/mcbm_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_reco.C
@@ -600,8 +600,6 @@ Bool_t mcbm_reco(UInt_t uRunId = 2391,
parIo3->open(parFileOut.Data(), "RECREATE");
// ------------------------------------------------------------------------
rtdb->setOutput(parIo3);
- rtdb->saveOutput();
- rtdb->print();
// ----- Run initialisation -------------------------------------------
std::cout << std::endl;
@@ -619,6 +617,8 @@ Bool_t mcbm_reco(UInt_t uRunId = 2391,
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
FairMonitor::GetMonitor()->Print();
Double_t rtime = timer.RealTime();
diff --git a/macro/mcbm/eventDisplay_reco.C b/macro/mcbm/eventDisplay_reco.C
index 5c76862f02..ef8ae854f9 100644
--- a/macro/mcbm/eventDisplay_reco.C
+++ b/macro/mcbm/eventDisplay_reco.C
@@ -234,7 +234,6 @@ void eventDisplay_reco(TString cSys = "lam", TString cEbeam = "2.5gev", TString
rtdb->setFirstInput(parIo1);
rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
// ------------------------------------------------------------------------
FairEventManager* fMan = new FairEventManager();
@@ -302,6 +301,7 @@ void eventDisplay_reco(TString cSys = "lam", TString cEbeam = "2.5gev", TString
}
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
diff --git a/macro/mcbm/mcbm_mc_nh.C b/macro/mcbm/mcbm_mc_nh.C
index 43b4dd9bcf..f3b7bf9890 100644
--- a/macro/mcbm/mcbm_mc_nh.C
+++ b/macro/mcbm/mcbm_mc_nh.C
@@ -330,8 +330,6 @@ void mcbm_mc_nh(Int_t nEvents = 2, Int_t iMode = 3, TString cSys = "lam", TStrin
FairParRootFileIo* parOut = new FairParRootFileIo(kParameterMerged);
parOut->open(parFile.Data());
rtdb->setOutput(parOut);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -342,6 +340,8 @@ void mcbm_mc_nh(Int_t nEvents = 2, Int_t iMode = 3, TString cSys = "lam", TStrin
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
run->CreateGeometryFile(geoFile);
timer.Stop();
Double_t rtime = timer.RealTime();
diff --git a/macro/mcbm/mcbm_pribeam.C b/macro/mcbm/mcbm_pribeam.C
index 43b7f82627..dfbda464f7 100644
--- a/macro/mcbm/mcbm_pribeam.C
+++ b/macro/mcbm/mcbm_pribeam.C
@@ -290,8 +290,6 @@ void mcbm_pribeam(Int_t nEvents = 2, const char* setupName = "sis18_mcbm", const
FairParRootFileIo* parOut = new FairParRootFileIo(kParameterMerged);
parOut->open(parFile.Data());
rtdb->setOutput(parOut);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -302,6 +300,8 @@ void mcbm_pribeam(Int_t nEvents = 2, const char* setupName = "sis18_mcbm", const
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
run->CreateGeometryFile(geoFile);
timer.Stop();
Double_t rtime = timer.RealTime();
diff --git a/macro/mcbm/mcbm_qa_nh.C b/macro/mcbm/mcbm_qa_nh.C
index 489b20b98e..d48ee02952 100644
--- a/macro/mcbm/mcbm_qa_nh.C
+++ b/macro/mcbm/mcbm_qa_nh.C
@@ -88,7 +88,6 @@ void mcbm_qa_nh(Int_t nEvents = 1000, TString cSys = "nini", TString cEbeam = "1
rtdb->setFirstInput(parIo1);
// rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
// ------------------------------------------------------------------------
@@ -99,6 +98,7 @@ void mcbm_qa_nh(Int_t nEvents = 1000, TString cSys = "nini", TString cEbeam = "1
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
diff --git a/macro/mcbm/mcbm_reco_dev.C b/macro/mcbm/mcbm_reco_dev.C
index 0a84b2d695..2cb11b19b1 100644
--- a/macro/mcbm/mcbm_reco_dev.C
+++ b/macro/mcbm/mcbm_reco_dev.C
@@ -176,8 +176,6 @@ void mcbm_reco_dev(Int_t nEvents = 2, const char* setupName = "sis18_mcbm_25deg_
rtdb->setFirstInput(parIo1);
rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -196,6 +194,8 @@ void mcbm_reco_dev(Int_t nEvents = 2, const char* setupName = "sis18_mcbm_25deg_
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
diff --git a/macro/mcbm/mcbm_reco_gp.C b/macro/mcbm/mcbm_reco_gp.C
index c056c4c8df..4c51cdac71 100644
--- a/macro/mcbm/mcbm_reco_gp.C
+++ b/macro/mcbm/mcbm_reco_gp.C
@@ -238,8 +238,6 @@ void mcbm_reco_gp(Int_t nEvents = 100, TString cSys = "nini", TString cEbeam = "
rtdb->setFirstInput(parIo1);
rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -258,6 +256,8 @@ void mcbm_reco_gp(Int_t nEvents = 100, TString cSys = "nini", TString cEbeam = "
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
diff --git a/macro/mcbm/mcbm_reco_nh.C b/macro/mcbm/mcbm_reco_nh.C
index c30822cea2..87443ba4af 100644
--- a/macro/mcbm/mcbm_reco_nh.C
+++ b/macro/mcbm/mcbm_reco_nh.C
@@ -164,8 +164,6 @@ void mcbm_reco_nh(Int_t nEvents = 1000, TString cSys = "lam", TString cEbeam = "
rtdb->setFirstInput(parIo1);
rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -182,6 +180,8 @@ void mcbm_reco_nh(Int_t nEvents = 1000, TString cSys = "lam", TString cEbeam = "
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
diff --git a/macro/mcbm/sps17_mc.C b/macro/mcbm/sps17_mc.C
index 7e2a387e26..9935de88c5 100644
--- a/macro/mcbm/sps17_mc.C
+++ b/macro/mcbm/sps17_mc.C
@@ -286,8 +286,6 @@ void sps17_mc(Int_t nEvents = 2, const char* setupName = "sps17", const char* in
FairParRootFileIo* parOut = new FairParRootFileIo(kParameterMerged);
parOut->open(parFile.Data());
rtdb->setOutput(parOut);
- rtdb->saveOutput();
- rtdb->print();
// ------------------------------------------------------------------------
@@ -298,6 +296,8 @@ void sps17_mc(Int_t nEvents = 2, const char* setupName = "sps17", const char* in
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
+ rtdb->print();
run->CreateGeometryFile(geoFile);
timer.Stop();
Double_t rtime = timer.RealTime();
diff --git a/macro/tutorial/run_HitProducerTaskIdeal.C b/macro/tutorial/run_HitProducerTaskIdeal.C
index cacc2c96a2..fa7308c707 100644
--- a/macro/tutorial/run_HitProducerTaskIdeal.C
+++ b/macro/tutorial/run_HitProducerTaskIdeal.C
@@ -79,7 +79,6 @@ void run_HitProducerTaskIdeal(Int_t nEvents = 10, TString inFile = "data/test.mc
rtdb->setFirstInput(parIo1);
rtdb->setSecondInput(parIo2);
rtdb->setOutput(parIo1);
- rtdb->saveOutput();
// ------------------------------------------------------------------------
@@ -90,6 +89,7 @@ void run_HitProducerTaskIdeal(Int_t nEvents = 10, TString inFile = "data/test.mc
// ------------------------------------------------------------------------
// ----- Finish -------------------------------------------------------
+ rtdb->saveOutput();
timer.Stop();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();
--
GitLab