diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt index c2454df911348c990a0702546de4f79290ddea93..a46b2aabad188029ddbf52c5aacf0a4b3207692d 100644 --- a/algo/data/CMakeLists.txt +++ b/algo/data/CMakeLists.txt @@ -4,8 +4,6 @@ set(SRCS ${CMAKE_SOURCE_DIR}/core/data/sts/CbmStsDigi.cxx - ${CMAKE_SOURCE_DIR}/core/data/global/CbmDigiEvent.cxx - ${CMAKE_SOURCE_DIR}/core/data/global/CbmDigiTimeslice.cxx ) add_library(OnlineData SHARED ${SRCS}) diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt index ab31041c84179db0b35acce22a3f7aec5b4a6b92..668f0ba6a3905aee6d010c07c6257ce1ed04fb98 100644 --- a/core/data/CMakeLists.txt +++ b/core/data/CMakeLists.txt @@ -114,8 +114,6 @@ set(SRCS psd/CbmPsdAddress.cxx psd/CbmPsdMCbmHit.cxx - global/CbmDigiEvent.cxx - global/CbmDigiTimeslice.cxx global/CbmGlobalTrack.cxx global/CbmVertex.cxx global/CbmTofTrack.cxx diff --git a/core/data/base/CbmDigiData.h b/core/data/base/CbmDigiData.h index 2b7732313ab83939d55642dbf264496fbc3913ce..36b96735708a838ccad50a9eeba2365409040e2d 100644 --- a/core/data/base/CbmDigiData.h +++ b/core/data/base/CbmDigiData.h @@ -12,12 +12,8 @@ #include <vector> -#ifndef NO_ROOT -#include <Rtypes.h> // for ClassDef -#endif - -/** @struct CbmDigiVector +/** @struct DigiVec ** @brief Digi collection in a std::vector ** ** This is the simplest form of a collection of detector digis. A detector-specific @@ -25,7 +21,7 @@ ** add meta-data. **/ template<class Digi> -struct CbmDigiVec { +struct DigiVec { std::vector<Digi> fDigis; friend class boost::serialization::access; template<class Archive> @@ -35,6 +31,10 @@ struct CbmDigiVec { } }; +/** Unless a detector-specific implementation for the digi data is present, the + ** simplest form (std::vector) will be used. **/ +typedef DigiVec<CbmStsDigi> StsDigiData; + /** @struct CbmDigiData ** @brief Collection of digis from all detector systems @@ -46,16 +46,12 @@ struct CbmDigiVec { **/ struct CbmDigiData { friend class boost::serialization::access; - typedef CbmDigiVec<CbmStsDigi> StsDigiData; StsDigiData fSts; template<class Archive> void serialize(Archive& ar, const unsigned int /*version*/) { ar& fSts; } -#ifndef NO_ROOT - ClassDefNV(CbmDigiData, 1); -#endif }; diff --git a/core/data/global/CbmDigiEvent.cxx b/core/data/global/CbmDigiEvent.cxx deleted file mode 100644 index ee09a0a22d7b43bc005d6f5d288d308ecfb165b4..0000000000000000000000000000000000000000 --- a/core/data/global/CbmDigiEvent.cxx +++ /dev/null @@ -1,5 +0,0 @@ -/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt - SPDX-License-Identifier: GPL-3.0-only - Authors: Volker Friese [committer] */ - -#include "CbmDigiEvent.h" diff --git a/core/data/global/CbmDigiEvent.h b/core/data/global/CbmDigiEvent.h index d116059f448633c1fad72ba2a257221ad9ad011e..5f4dfd96c85b52b6362fcadd88e8c442ed67aaf9 100644 --- a/core/data/global/CbmDigiEvent.h +++ b/core/data/global/CbmDigiEvent.h @@ -9,9 +9,6 @@ #include <boost/serialization/access.hpp> -#ifndef NO_ROOT -#include <Rtypes.h> // for ClassDef -#endif /** @struct CbmDigiEvent ** @brief Container of digis from all detectors in an event @@ -28,9 +25,6 @@ struct CbmDigiEvent { ar& fNumber; ar& fTime; } -#ifndef NO_ROOT - ClassDefNV(CbmDigiEvent, 1); -#endif }; #endif /* CBMDIGIEVENT_H */ diff --git a/core/data/global/CbmDigiTimeslice.cxx b/core/data/global/CbmDigiTimeslice.cxx deleted file mode 100644 index 5a9231250e6d3f990f8bb22ce5a7546152511ece..0000000000000000000000000000000000000000 --- a/core/data/global/CbmDigiTimeslice.cxx +++ /dev/null @@ -1,5 +0,0 @@ -/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt - SPDX-License-Identifier: GPL-3.0-only - Authors: Volker Friese [committer] */ - -#include "CbmDigiTimeslice.h"