From cd88641c770648283d98d0c3283f06f03881ccd1 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Mon, 1 Feb 2021 16:06:56 +0100
Subject: [PATCH] Create separate library with Cosy 2019 related classes
Put classes which are only needed for analysis of data recoreded during the
beam time at Cosy in 2019 into a sepatrate library.
---
fles/CMakeLists.txt | 1 +
fles/cosy2019/CMakeLists.txt | 73 +++++++++++++++++++
fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h | 16 ++++
.../monitor/CbmMcbm2018MonitorAlgoHodo.cxx | 0
.../monitor/CbmMcbm2018MonitorAlgoHodo.h | 12 ++-
.../monitor/CbmMcbm2018MonitorTaskHodo.cxx | 0
.../monitor/CbmMcbm2018MonitorTaskHodo.h | 0
.../parameter/CbmMcbm2018ContFact.cxx | 0
.../parameter/CbmMcbm2018ContFact.h | 0
.../parameter/CbmMcbm2018HodoPar.cxx | 0
.../parameter/CbmMcbm2018HodoPar.h | 0
.../unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx | 0
.../unpacker/CbmMcbm2018UnpackerAlgoHodo.h | 11 ++-
.../unpacker/CbmMcbm2018UnpackerTaskHodo.cxx | 2 +-
.../unpacker/CbmMcbm2018UnpackerTaskHodo.h | 0
fles/mcbm2018/CMakeLists.txt | 10 +--
fles/mcbm2018/CbmFlibMcbm2018LinkDef.h | 8 --
17 files changed, 102 insertions(+), 31 deletions(-)
create mode 100644 fles/cosy2019/CMakeLists.txt
create mode 100644 fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
rename fles/{mcbm2018 => cosy2019}/monitor/CbmMcbm2018MonitorAlgoHodo.cxx (100%)
rename fles/{mcbm2018 => cosy2019}/monitor/CbmMcbm2018MonitorAlgoHodo.h (99%)
rename fles/{mcbm2018 => cosy2019}/monitor/CbmMcbm2018MonitorTaskHodo.cxx (100%)
rename fles/{mcbm2018 => cosy2019}/monitor/CbmMcbm2018MonitorTaskHodo.h (100%)
rename fles/{mcbm2018 => cosy2019}/parameter/CbmMcbm2018ContFact.cxx (100%)
rename fles/{mcbm2018 => cosy2019}/parameter/CbmMcbm2018ContFact.h (100%)
rename fles/{mcbm2018 => cosy2019}/parameter/CbmMcbm2018HodoPar.cxx (100%)
rename fles/{mcbm2018 => cosy2019}/parameter/CbmMcbm2018HodoPar.h (100%)
rename fles/{mcbm2018 => cosy2019}/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx (100%)
rename fles/{mcbm2018 => cosy2019}/unpacker/CbmMcbm2018UnpackerAlgoHodo.h (99%)
rename fles/{mcbm2018 => cosy2019}/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx (99%)
rename fles/{mcbm2018 => cosy2019}/unpacker/CbmMcbm2018UnpackerTaskHodo.h (100%)
diff --git a/fles/CMakeLists.txt b/fles/CMakeLists.txt
index b1723f0e68..56808e8bb8 100644
--- a/fles/CMakeLists.txt
+++ b/fles/CMakeLists.txt
@@ -1,4 +1,5 @@
Add_Subdirectory(flestools)
Add_Subdirectory(mcbm2018)
+Add_Subdirectory(cosy2019)
Add_Subdirectory(star2019)
diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
new file mode 100644
index 0000000000..1d9ec7265c
--- /dev/null
+++ b/fles/cosy2019/CMakeLists.txt
@@ -0,0 +1,73 @@
+# Create a library called "libCbmFlibReader" which includes the source files given in
+# the array .
+# The extension is already found. Any number of sources could be listed here.
+
+Set(INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/parameter
+ ${CMAKE_CURRENT_SOURCE_DIR}/unpacker
+ ${CMAKE_CURRENT_SOURCE_DIR}/monitor
+
+ ${CBMBASE_DIR}
+
+ ${CBMDATA_DIR}
+ ${CBMDATA_DIR}/base
+ ${CBMDATA_DIR}/raw
+ ${CBMDATA_DIR}/sts
+
+ ${CBMROOT_SOURCE_DIR}/fles/flestools
+
+ ${CBMROOT_SOURCE_DIR}/fles/mcbm2018
+ ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/unpacker
+ ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/commonMQ
+
+ ${CBMDETECTORBASE_DIR}/sts
+)
+
+Set(SYSTEM_INCLUDE_DIRECTORIES
+ ${BASE_INCLUDE_DIRECTORIES}
+ ${Boost_INCLUDE_DIR}
+ ${ROOT_INCLUDE_DIR}
+ ${IPC_INCLUDE_DIRECTORY}
+)
+
+Include_Directories(${INCLUDE_DIRECTORIES})
+Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
+
+
+Set(LINK_DIRECTORIES
+ ${ROOT_LIBRARY_DIR}
+ ${FAIRROOT_LIBRARY_DIR}
+ ${Boost_LIBRARY_DIRS}
+)
+
+Link_Directories(
+ ${LINK_DIRECTORIES}
+)
+
+Set(SRCS
+
+ parameter/CbmMcbm2018HodoPar.cxx
+ parameter/CbmMcbm2018ContFact.cxx
+
+ unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
+ unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
+
+ monitor/CbmMcbm2018MonitorAlgoHodo.cxx
+ monitor/CbmMcbm2018MonitorTaskHodo.cxx
+)
+
+If(_UINT8_T_EXIST)
+ Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
+ Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
+EndIf()
+
+Set(LINKDEF CbmBeamtimeCosy2019LinkDef.h )
+Set(LIBRARY_NAME CbmBeamtimeCosy2019)
+Set(DEPENDENCIES
+ CbmFlibFlesTools CbmFlibMcbm2018
+ CbmStsBase
+ CbmData CbmBase fles_ipc Eve Base
+)
+
+GENERATE_LIBRARY()
diff --git a/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
new file mode 100644
index 0000000000..5837fd4c6a
--- /dev/null
+++ b/fles/cosy2019/CbmBeamtimeCosy2019LinkDef.h
@@ -0,0 +1,16 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class CbmMcbm2018HodoPar;
+#pragma link C++ class CbmMcbm2018ContFact;
+
+#pragma link C++ class CbmMcbm2018UnpackerAlgoHodo;
+#pragma link C++ class CbmMcbm2018UnpackerTaskHodo + ;
+
+#pragma link C++ class CbmMcbm2018MonitorAlgoHodo;
+#pragma link C++ class CbmMcbm2018MonitorTaskHodo;
+
+#endif
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.cxx
similarity index 100%
rename from fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoHodo.cxx
rename to fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.cxx
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoHodo.h b/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h
similarity index 99%
rename from fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoHodo.h
rename to fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h
index 5c2e1f958d..6ab578eda3 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoHodo.h
+++ b/fles/cosy2019/monitor/CbmMcbm2018MonitorAlgoHodo.h
@@ -17,6 +17,11 @@
// CbmRoot
+// ROOT
+#include "TCanvas.h"
+#include "TH1.h"
+#include "TH2.h"
+
// C++11
#include <chrono>
@@ -24,13 +29,6 @@
#include <map>
#include <vector>
-//class CbmMcbm2018HodoPar;
-/*
-class TCanvas;
-class THttpServer;
-*/
-class TH1;
-class TH2;
class TProfile;
class CbmMcbm2018MonitorAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.cxx
similarity index 100%
rename from fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskHodo.cxx
rename to fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.cxx
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskHodo.h b/fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.h
similarity index 100%
rename from fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskHodo.h
rename to fles/cosy2019/monitor/CbmMcbm2018MonitorTaskHodo.h
diff --git a/fles/mcbm2018/parameter/CbmMcbm2018ContFact.cxx b/fles/cosy2019/parameter/CbmMcbm2018ContFact.cxx
similarity index 100%
rename from fles/mcbm2018/parameter/CbmMcbm2018ContFact.cxx
rename to fles/cosy2019/parameter/CbmMcbm2018ContFact.cxx
diff --git a/fles/mcbm2018/parameter/CbmMcbm2018ContFact.h b/fles/cosy2019/parameter/CbmMcbm2018ContFact.h
similarity index 100%
rename from fles/mcbm2018/parameter/CbmMcbm2018ContFact.h
rename to fles/cosy2019/parameter/CbmMcbm2018ContFact.h
diff --git a/fles/mcbm2018/parameter/CbmMcbm2018HodoPar.cxx b/fles/cosy2019/parameter/CbmMcbm2018HodoPar.cxx
similarity index 100%
rename from fles/mcbm2018/parameter/CbmMcbm2018HodoPar.cxx
rename to fles/cosy2019/parameter/CbmMcbm2018HodoPar.cxx
diff --git a/fles/mcbm2018/parameter/CbmMcbm2018HodoPar.h b/fles/cosy2019/parameter/CbmMcbm2018HodoPar.h
similarity index 100%
rename from fles/mcbm2018/parameter/CbmMcbm2018HodoPar.h
rename to fles/cosy2019/parameter/CbmMcbm2018HodoPar.h
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
similarity index 100%
rename from fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
rename to fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.h b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
similarity index 99%
rename from fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
rename to fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
index 210b669c0a..0d5c0f217e 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
+++ b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerAlgoHodo.h
@@ -17,6 +17,10 @@
// CbmRoot
+// ROOT
+#include "TCanvas.h"
+#include "TH1.h"
+
// C++11
#include <chrono>
@@ -25,12 +29,7 @@
#include <vector>
class CbmMcbm2018HodoPar;
-/*
-class TCanvas;
-class THttpServer;
-*/
-class TH1;
-class TH2;
+
class TProfile;
class CbmMcbm2018UnpackerAlgoHodo : public CbmStar2019Algo<CbmStsDigi> {
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
similarity index 99%
rename from fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
rename to fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
index a9e982ad81..d68a591b7f 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018HodoPar.h"
#include "CbmMcbm2018UnpackerAlgoHodo.h"
-#include "CbmMcbm2018StsPar.h"
+//#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
#include "FairLogger.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskHodo.h b/fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.h
similarity index 100%
rename from fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskHodo.h
rename to fles/cosy2019/unpacker/CbmMcbm2018UnpackerTaskHodo.h
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index ae03e644e3..77b6297669 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -21,7 +21,7 @@ Set(INCLUDE_DIRECTORIES
${CBMROOT_SOURCE_DIR}/fles/mcbm2018
${CBMROOT_SOURCE_DIR}/fles/mcbm2018/dataforma
${CBMROOT_SOURCE_DIR}/fles/mcbm2018/commonMQ
- ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/parameter
+# ${CBMROOT_SOURCE_DIR}/fles/mcbm2018/parameter
${CBMROOT_SOURCE_DIR}/fles/mcbm2018/unpacker
${CBMROOT_SOURCE_DIR}/fles/mcbm2018/monitor
${CBMROOT_SOURCE_DIR}/fles/mcbm2018/tasks
@@ -63,9 +63,6 @@ Set(SRCS
CbmMcbm2018Source.cxx
CbmMcbm2018MsCrcCheck.cxx
- parameter/CbmMcbm2018HodoPar.cxx
- parameter/CbmMcbm2018ContFact.cxx
-
unpacker/CbmMcbm2018RawConverterSdpb.cxx
unpacker/CbmMcbm2018RawConverterGdpb.cxx
@@ -78,8 +75,6 @@ Set(SRCS
unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
unpacker/CbmMcbm2018UnpackerTaskRich.cxx
unpacker/CbmMcbm2018UnpackerUtilRich.cxx
- unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
- unpacker/CbmMcbm2018UnpackerTaskHodo.cxx
unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
@@ -109,9 +104,6 @@ Set(SRCS
monitor/CbmMcbm2018MonitorAlgoPsd.cxx
monitor/CbmMcbm2018MonitorTaskPsd.cxx
- monitor/CbmMcbm2018MonitorAlgoHodo.cxx
- monitor/CbmMcbm2018MonitorTaskHodo.cxx
-
tasks/CbmCheckDigisNbCorr.cxx
tasks/CbmCheckTiming.cxx
tasks/CbmCheckEvents.cxx
diff --git a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
index 2c9a2771bf..dcba547cbf 100644
--- a/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
+++ b/fles/mcbm2018/CbmFlibMcbm2018LinkDef.h
@@ -8,9 +8,6 @@
#pragma link C++ class CbmMcbm2018Source;
#pragma link C++ class CbmMcbm2018MsCrcCheck;
-#pragma link C++ class CbmMcbm2018HodoPar;
-#pragma link C++ class CbmMcbm2018ContFact;
-
#pragma link C++ class CbmMcbm2018RawConverterSdpb;
#pragma link C++ class CbmMcbm2018RawConverterGdpb;
@@ -22,8 +19,6 @@
#pragma link C++ class CbmMcbm2018UnpackerTaskTof + ;
#pragma link C++ class CbmMcbm2018UnpackerAlgoRich;
#pragma link C++ class CbmMcbm2018UnpackerTaskRich + ;
-#pragma link C++ class CbmMcbm2018UnpackerAlgoHodo;
-#pragma link C++ class CbmMcbm2018UnpackerTaskHodo + ;
#pragma link C++ class CbmMcbm2018UnpackerAlgoPsd;
#pragma link C++ class CbmMcbm2018UnpackerTaskPsd + ;
#pragma link C++ class CbmMcbm2018UnpackerAlgoTrdR + ;
@@ -53,9 +48,6 @@
#pragma link C++ class CbmMcbm2018MonitorAlgoPsd;
#pragma link C++ class CbmMcbm2018MonitorTaskPsd;
-#pragma link C++ class CbmMcbm2018MonitorAlgoHodo;
-#pragma link C++ class CbmMcbm2018MonitorTaskHodo;
-
#pragma link C++ class CbmCheckDigisNbCorr;
#pragma link C++ class CbmCheckTiming;
#pragma link C++ class CbmCheckEvents;
--
GitLab