From 03825a475c1f4c746e140026d2dd0de60af0e8d9 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 9 Dec 2020 10:18:10 +0100
Subject: [PATCH] Fix macros for usage with new FairRoot versions
With FairRoot v18.4.1 the deprecated function SetInputFile was removed from
FairRunAna. Correctly use now FairFileSource in the macros.
---
macro/mcbm/mcbm_reco_event.C | 5 ++++-
macro/much/run_ana.C | 6 ++++--
macro/mvd/qa/mvd_qa4_reco.C | 5 ++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index db9e80113a..f14e1ad9fc 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -107,7 +107,10 @@ void mcbm_reco_event(Int_t nEvents = 3,
// ----- FairRunAna ---------------------------------------------------
FairRunAna* run = new FairRunAna();
- run->SetInputFile(rawFile);
+
+ FairFileSource* inputSource = new FairFileSource(rawFile);
+ run->SetSource(inputSource);
+
run->SetOutputFile(recFile);
run->SetGenerateRunInfo(kTRUE);
Bool_t hasFairMonitor = kFALSE; //Has_Fair_Monitor();
diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C
index d85a0bdb83..36195ddc68 100644
--- a/macro/much/run_ana.C
+++ b/macro/much/run_ana.C
@@ -21,8 +21,10 @@ void run_ana(Int_t nEvents = 1000,
outFile = Form("%s.ana.ANN_%1.2f.root", dataSet.Data(), ANN);
FairRunAna* run = new FairRunAna();
- run->SetInputFile(recoFile);
- run->AddFriend(traFile);
+ FairFileSource* inputSource = new FairFileSource(recoFile);
+ inputSource->AddFriend(traFile);
+ run->SetSource(inputSource);
+
run->SetOutputFile(outFile);
// run->SetGenerateRunInfo(kTRUE);
diff --git a/macro/mvd/qa/mvd_qa4_reco.C b/macro/mvd/qa/mvd_qa4_reco.C
index 24f0ef8352..93f011d2e4 100644
--- a/macro/mvd/qa/mvd_qa4_reco.C
+++ b/macro/mvd/qa/mvd_qa4_reco.C
@@ -65,7 +65,10 @@ void mvd_qa4_reco(const char* setup = "sis100_electron") {
// ----- Reconstruction run -------------------------------------------
FairRunAna* fRun = new FairRunAna();
- fRun->SetInputFile(inFile);
+
+ FairFileSource* inputSource = new FairFileSource(inFile);
+ fRun->SetSource(inputSource);
+
fRun->SetOutputFile(outFile);
Bool_t hasFairMonitor = Has_Fair_Monitor();
if (hasFairMonitor) { FairMonitor::GetMonitor()->EnableMonitor(kTRUE); }
--
GitLab