Commit c2c404b4 authored by Volker Friese's avatar Volker Friese
Browse files

Some fixed to DigiData and DigiEvent after review. Removed empty .cxx files....

Some fixed to DigiData and DigiEvent after review. Removed empty .cxx files. Removed ClassDef macro. Refs #2261.
parent c0247be0
......@@ -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})
......
......@@ -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
......
......@@ -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
};
......
/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese [committer] */
#include "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 */
/* Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese [committer] */
#include "CbmDigiTimeslice.h"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment