From 5e99ed9a23cf29b9f9fe520017e2f753b37e3572 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 16 Mar 2021 18:00:31 +0100
Subject: [PATCH] Fix BuildRawEvents with FairSoft nov20 and FairRoot v18.4
Add missing include statement.
Properly upcast TFolder to TObject.
---
.../digis/CbmAlgoBuildRawEvents.cxx | 17 +++++++++--------
.../digis/CbmTaskBuildRawEvents.cxx | 19 ++++++++++---------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index daf829d509..486597bb90 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -20,16 +20,17 @@
#include "TimesliceMetaData.h"
/// FAIRROOT headers
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRunOnline.h"
+#include <FairLogger.h>
+#include <FairRootManager.h>
+#include <FairRunOnline.h>
/// FAIRSOFT headers (geant, boost, ...)
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "THttpServer.h"
+#include <TCanvas.h>
+#include <TClonesArray.h>
+#include <TFolder.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <THttpServer.h>
template<>
void CbmAlgoBuildRawEvents::LoopOnSeeds<Double_t>();
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
index ce0640c011..2bd074b70a 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
@@ -10,15 +10,16 @@
#include "CbmDigiManager.h"
#include "CbmEvent.h"
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRunOnline.h"
-
-#include "TClonesArray.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "THttpServer.h"
+#include <FairLogger.h>
+#include <FairRootManager.h>
+#include <FairRunOnline.h>
+
+#include <TClonesArray.h>
#include <TFile.h>
+#include <TFolder.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <THttpServer.h>
#include <iomanip>
@@ -388,7 +389,7 @@ void CbmTaskBuildRawEvents::SaveHistos()
return;
}
FairSink* sink = FairRootManager::Instance()->GetSink();
- sink->WriteObject(fpAlgo->GetOutFolder(), nullptr);
+ sink->WriteObject(dynamic_cast<TObject*>(fpAlgo->GetOutFolder()), nullptr);
}
else {
--
GitLab