Skip to content

Commit 5fa7a39

Browse files
matthiasrichterktf
matthiasrichter
authored and
ktf
committed
Changing namespace 'Header' to lower case 'header'
This is to follow the naming scheme for namespaces, keeping an alias of the old upper case name for a while until pull requests which are currently open are processed.
1 parent 47cd152 commit 5fa7a39

74 files changed

Lines changed: 424 additions & 420 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Algorithm/include/Algorithm/HeaderStack.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
/// @since 2017-09-19
1717
/// @brief Utilities for the O2 header stack
1818

19-
// the implemented functionality relies on o2::Header::get defined in
19+
// the implemented functionality relies on o2::header::get defined in
2020
// DataHeader.h; all O2 headers inherit from BaseHeader, this is required
2121
// to check the consistency of the header stack, also the next-header-flag
2222
// is part of the BaseHeader
23-
#include "Headers/DataHeader.h" // for o2::Header::get
23+
#include "Headers/DataHeader.h" // for o2::header::get
2424

2525
namespace o2 {
2626

@@ -67,7 +67,7 @@ void dispatchHeaderStackCallback(PtrType ptr,
6767
HeaderType /*dummy*/,
6868
HeaderCallbackType onHeader)
6969
{
70-
const HeaderType* h = o2::Header::get<HeaderType>(ptr, size);
70+
const HeaderType* h = o2::header::get<HeaderType>(ptr, size);
7171
if (h) {
7272
onHeader(*h);
7373
}
@@ -134,7 +134,7 @@ void parseHeaderStack(PtrType ptr,
134134
SizeType size,
135135
HeaderType & header)
136136
{
137-
const HeaderType* h = o2::Header::get<HeaderType>(ptr, size);
137+
const HeaderType* h = o2::header::get<HeaderType>(ptr, size);
138138
if (h) {
139139
header = *h;
140140
}

‎Algorithm/include/Algorithm/O2FormatParser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ int parseO2Format(const InputListT& list,
6565
HeaderStackTypes&&... stackArgs
6666
)
6767
{
68-
const o2::Header::DataHeader* dh = nullptr;
68+
const o2::header::DataHeader* dh = nullptr;
6969
for (auto & part : list) {
7070
if (!dh) {
7171
// new header - payload pair, read DataHeader
72-
dh = o2::Header::get<o2::Header::DataHeader>(getPointer(part), getSize(part));
72+
dh = o2::header::get<o2::header::DataHeader>(getPointer(part), getSize(part));
7373
if (!dh) {
7474
return -ENOMSG;
7575
}

‎Algorithm/test/headerstack.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,44 @@
2424
#include "Headers/NameHeader.h"
2525
#include "../include/Algorithm/HeaderStack.h"
2626

27-
using DataHeader = o2::Header::DataHeader;
28-
using HeaderStack = o2::Header::Stack;
27+
using DataHeader = o2::header::DataHeader;
28+
using HeaderStack = o2::header::Stack;
2929

3030
BOOST_AUTO_TEST_CASE(test_headerstack)
3131
{
3232
// make a header stack consisting of two O2 headers and extract them
3333
// via function calls using dispatchHeaderStackCallback, and through object
3434
// references using parseHeaderStack
35-
o2::Header::DataHeader dh;
36-
dh.dataDescription = o2::Header::DataDescription("SOMEDATA");
37-
dh.dataOrigin = o2::Header::DataOrigin("TST");
35+
o2::header::DataHeader dh;
36+
dh.dataDescription = o2::header::DataDescription("SOMEDATA");
37+
dh.dataOrigin = o2::header::DataOrigin("TST");
3838
dh.subSpecification = 0;
3939
dh.payloadSize = 0;
4040

41-
using Name8Header = o2::Header::NameHeader<8>;
41+
using Name8Header = o2::header::NameHeader<8>;
4242
Name8Header nh("NAMEDHDR");
4343

44-
o2::Header::Stack stack(dh, nh);
44+
o2::header::Stack stack(dh, nh);
4545

4646
// check that the call without any other arguments is compiling
4747
o2::algorithm::dispatchHeaderStackCallback(stack.buffer.get(), stack.bufferSize);
4848

4949
// lambda functor given as argument for dispatchHeaderStackCallback
5050
auto checkDataHeader = [&dh] (const auto & header) {
51-
o2::Header::hexDump("Extracted DataHeader", &header, sizeof(header));
51+
o2::header::hexDump("Extracted DataHeader", &header, sizeof(header));
5252
BOOST_CHECK(header == dh);
5353
};
5454

5555
// lambda functor given as argument for dispatchHeaderStackCallback
5656
auto checkNameHeader = [&nh] (const auto & header) {
57-
o2::Header::hexDump("Extracted NameHeader", &header, sizeof(header));
57+
o2::header::hexDump("Extracted NameHeader", &header, sizeof(header));
5858
// have to compare on byte level, no operator==
5959
BOOST_CHECK(memcmp(&header, &nh, sizeof(header)) == 0);
6060
};
6161

6262
// check extraction of headers via callbacks
6363
o2::algorithm::dispatchHeaderStackCallback(stack.buffer.get(), stack.bufferSize,
64-
o2::Header::DataHeader(),
64+
o2::header::DataHeader(),
6565
checkDataHeader,
6666
Name8Header(),
6767
checkNameHeader
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(test_headerstack)
7777
o2::algorithm::parseHeaderStack(stack.buffer.get(), stack.bufferSize);
7878

7979
// check extraction of headers via object references
80-
o2::Header::DataHeader targetDataHeader;
80+
o2::header::DataHeader targetDataHeader;
8181
Name8Header targetNameHeader;
8282
o2::algorithm::parseHeaderStack(stack.buffer.get(), stack.bufferSize,
8383
targetDataHeader,

‎Algorithm/test/o2formatparser.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
template<typename... Targs>
2727
void hexDump(Targs... Fargs) {
2828
// a simple redirect to enable/disable the hexdump printout
29-
o2::Header::hexDump(Fargs...);
29+
o2::header::hexDump(Fargs...);
3030
}
3131

3232
BOOST_AUTO_TEST_CASE(test_o2formatparser)
@@ -36,20 +36,20 @@ BOOST_AUTO_TEST_CASE(test_o2formatparser)
3636
"reconstructed data"
3737
};
3838
unsigned dataidx = 0;
39-
std::vector<o2::Header::DataHeader> dataheaders;
40-
dataheaders.emplace_back(o2::Header::DataDescription("RAWDATA"),
41-
o2::Header::DataOrigin("DET"),
39+
std::vector<o2::header::DataHeader> dataheaders;
40+
dataheaders.emplace_back(o2::header::DataDescription("RAWDATA"),
41+
o2::header::DataOrigin("DET"),
4242
0,
4343
strlen(thedata[dataidx++]));
44-
dataheaders.emplace_back(o2::Header::DataDescription("RECODATA"),
45-
o2::Header::DataOrigin("DET"),
44+
dataheaders.emplace_back(o2::header::DataDescription("RECODATA"),
45+
o2::header::DataOrigin("DET"),
4646
0,
4747
strlen(thedata[dataidx++]));
4848

4949
std::vector<std::pair<const char*, size_t>> messages;
5050
for (dataidx = 0; dataidx < thedata.size(); ++dataidx) {
5151
messages.emplace_back(reinterpret_cast<char*>(&dataheaders[dataidx]),
52-
sizeof(o2::Header::DataHeader));
52+
sizeof(o2::header::DataHeader));
5353
messages.emplace_back(thedata[dataidx],
5454
dataheaders[dataidx].payloadSize);
5555
}

‎Algorithm/test/pageparser.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ void runParserTest(const DataSetT &dataset)
176176
<< " group header(s)" << std::endl
177177
<< " pagesize " << pagesize << std::endl;
178178
auto buffer = MakeBuffer<DataSetT, PageHeaderT, GroupHeaderT, GroupHeaderPerPage>(pagesize, PageHeaderT(0), dataset);
179-
o2::Header::hexDump("pagebuffer", buffer.first.get(), buffer.second);
179+
o2::header::hexDump("pagebuffer", buffer.first.get(), buffer.second);
180180

181181
using RawParser = o2::algorithm::PageParser<PageHeader, pagesize, ClusterData, int>;
182182
const RawParser parser(buffer.first.get(), buffer.second);
183183

184184
unsigned dataidx = 0;
185185
for (auto i : parser) {
186-
o2::Header::hexDump("clusterdata", &i, sizeof(ClusterData));
186+
o2::header::hexDump("clusterdata", &i, sizeof(ClusterData));
187187
BOOST_REQUIRE( i == dataset[dataidx++]);
188188
}
189189
}
@@ -194,14 +194,14 @@ BOOST_AUTO_TEST_CASE(test_pageparser)
194194
std::vector<ClusterData> dataset;
195195
FillData(dataset, 20);
196196
auto buffer = MakeBuffer(pagesize, PageHeader(0), dataset);
197-
o2::Header::hexDump("pagebuffer", buffer.first.get(), buffer.second);
197+
o2::header::hexDump("pagebuffer", buffer.first.get(), buffer.second);
198198

199199
using RawParser = o2::algorithm::PageParser<PageHeader, pagesize, ClusterData>;
200200
const RawParser parser(buffer.first.get(), buffer.second);
201201

202202
unsigned dataidx = 0;
203203
for (auto i : parser) {
204-
o2::Header::hexDump("clusterdata", &i, sizeof(ClusterData));
204+
o2::header::hexDump("clusterdata", &i, sizeof(ClusterData));
205205
BOOST_REQUIRE( i == dataset[dataidx++]);
206206
}
207207

@@ -220,11 +220,11 @@ BOOST_AUTO_TEST_CASE(test_pageparser)
220220
xvalues.emplace_back(i.x, dataidx);
221221
++dataidx;
222222
}
223-
o2::Header::hexDump("changed buffer", buffer.first.get(), buffer.second);
223+
o2::header::hexDump("changed buffer", buffer.first.get(), buffer.second);
224224

225225
dataidx = 0;
226226
for (auto i : parser) {
227-
o2::Header::hexDump("clusterdata", &i, sizeof(ClusterData));
227+
o2::header::hexDump("clusterdata", &i, sizeof(ClusterData));
228228
BOOST_REQUIRE( i.x == xvalues[dataidx++].first);
229229
}
230230
}

‎Algorithm/test/tableview.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
#include "../include/Algorithm/Parser.h"
2727
#include "StaticSequenceAllocator.h"
2828

29-
using DataHeader = o2::Header::DataHeader;
30-
using HeartbeatHeader = o2::Header::HeartbeatHeader;
31-
using HeartbeatTrailer = o2::Header::HeartbeatTrailer;
29+
using DataHeader = o2::header::DataHeader;
30+
using HeartbeatHeader = o2::header::HeartbeatHeader;
31+
using HeartbeatTrailer = o2::header::HeartbeatTrailer;
3232

3333
template<typename... Targs>
3434
void hexDump(Targs... Fargs) {
3535
// a simple redirect to enable/disable the hexdump printout
36-
o2::Header::hexDump(Fargs...);
36+
o2::header::hexDump(Fargs...);
3737
}
3838

3939
BOOST_AUTO_TEST_CASE(test_tableview_reverse)
@@ -62,20 +62,20 @@ BOOST_AUTO_TEST_CASE(test_tableview_reverse)
6262

6363
// define the view type for DataHeader as row descriptor,
6464
// HeartbeatHeader as column descriptor and the reverse parser
65-
using ViewType = o2::algorithm::TableView<o2::Header::DataHeader,
66-
o2::Header::HeartbeatHeader,
65+
using ViewType = o2::algorithm::TableView<o2::header::DataHeader,
66+
o2::header::HeartbeatHeader,
6767
ParserT>;
6868
ViewType heartbeatview;
6969

70-
o2::Header::DataHeader dh1;
71-
dh1.dataDescription = o2::Header::DataDescription("FIRSTROW");
72-
dh1.dataOrigin = o2::Header::DataOrigin("TST");
70+
o2::header::DataHeader dh1;
71+
dh1.dataDescription = o2::header::DataDescription("FIRSTROW");
72+
dh1.dataOrigin = o2::header::DataOrigin("TST");
7373
dh1.subSpecification = 0;
7474
dh1.payloadSize = 0;
7575

76-
o2::Header::DataHeader dh2;
77-
dh2.dataDescription = o2::Header::DataDescription("SECONDROW");
78-
dh2.dataOrigin = o2::Header::DataOrigin("TST");
76+
o2::header::DataHeader dh2;
77+
dh2.dataDescription = o2::header::DataDescription("SECONDROW");
78+
dh2.dataOrigin = o2::header::DataOrigin("TST");
7979
dh2.subSpecification = 0xdeadbeef;
8080
dh2.payloadSize = 0;
8181

‎DataFormats/Headers/include/Headers/DataHeader.h‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
using byte = unsigned char;
4040

4141
namespace o2 {
42-
namespace Header {
42+
namespace header {
4343

4444
//__________________________________________________________________________________________________
4545
/// @defgroup aliceo2_dataformat_primitives Primitive data format definitions for ALICE O2
@@ -318,11 +318,11 @@ using HeaderType = Descriptor<gSizeHeaderDescriptionString>;
318318
using SerializationMethod = Descriptor<gSizeSerializationMethodString>;
319319

320320
//possible serialization types
321-
extern const o2::Header::SerializationMethod gSerializationMethodAny;
322-
extern const o2::Header::SerializationMethod gSerializationMethodInvalid;
323-
extern const o2::Header::SerializationMethod gSerializationMethodNone;
324-
extern const o2::Header::SerializationMethod gSerializationMethodROOT;
325-
extern const o2::Header::SerializationMethod gSerializationMethodFlatBuf;
321+
extern const o2::header::SerializationMethod gSerializationMethodAny;
322+
extern const o2::header::SerializationMethod gSerializationMethodInvalid;
323+
extern const o2::header::SerializationMethod gSerializationMethodNone;
324+
extern const o2::header::SerializationMethod gSerializationMethodROOT;
325+
extern const o2::header::SerializationMethod gSerializationMethodFlatBuf;
326326

327327
//__________________________________________________________________________________________________
328328
/// @struct BaseHeader
@@ -348,8 +348,8 @@ struct BaseHeader
348348
static const uint32_t sMagicString;
349349

350350
static const uint32_t sVersion;
351-
static const o2::Header::HeaderType sHeaderType;
352-
static const o2::Header::SerializationMethod sSerializationMethod;
351+
static const o2::header::HeaderType sHeaderType;
352+
static const o2::header::SerializationMethod sSerializationMethod;
353353

354354
//__the data layout:
355355

@@ -376,10 +376,10 @@ struct BaseHeader
376376
uint32_t headerVersion;
377377

378378
/// header type description, set by derived header
379-
o2::Header::HeaderType description;
379+
o2::header::HeaderType description;
380380

381381
/// header serialization method, set by derived header
382-
o2::Header::SerializationMethod serialization;
382+
o2::header::SerializationMethod serialization;
383383

384384
//___the functions:
385385

@@ -553,8 +553,8 @@ struct DataHeader : public BaseHeader
553553

554554
//static data for this header type/version
555555
static const uint32_t sVersion;
556-
static const o2::Header::HeaderType sHeaderType;
557-
static const o2::Header::SerializationMethod sSerializationMethod;
556+
static const o2::header::HeaderType sHeaderType;
557+
static const o2::header::SerializationMethod sSerializationMethod;
558558

559559
///
560560
/// data type descriptor
@@ -622,34 +622,34 @@ struct DataHeader : public BaseHeader
622622

623623
//__________________________________________________________________________________________________
624624
//possible data origins
625-
extern const o2::Header::DataOrigin gDataOriginAny;
626-
extern const o2::Header::DataOrigin gDataOriginInvalid;
627-
extern const o2::Header::DataOrigin gDataOriginFLP;
628-
extern const o2::Header::DataOrigin gDataOriginACO;
629-
extern const o2::Header::DataOrigin gDataOriginCPV;
630-
extern const o2::Header::DataOrigin gDataOriginCTP;
631-
extern const o2::Header::DataOrigin gDataOriginEMC;
632-
extern const o2::Header::DataOrigin gDataOriginFIT;
633-
extern const o2::Header::DataOrigin gDataOriginHMP;
634-
extern const o2::Header::DataOrigin gDataOriginITS;
635-
extern const o2::Header::DataOrigin gDataOriginMCH;
636-
extern const o2::Header::DataOrigin gDataOriginMFT;
637-
extern const o2::Header::DataOrigin gDataOriginMID;
638-
extern const o2::Header::DataOrigin gDataOriginPHS;
639-
extern const o2::Header::DataOrigin gDataOriginTOF;
640-
extern const o2::Header::DataOrigin gDataOriginTPC;
641-
extern const o2::Header::DataOrigin gDataOriginTRD;
642-
extern const o2::Header::DataOrigin gDataOriginZDC;
625+
extern const o2::header::DataOrigin gDataOriginAny;
626+
extern const o2::header::DataOrigin gDataOriginInvalid;
627+
extern const o2::header::DataOrigin gDataOriginFLP;
628+
extern const o2::header::DataOrigin gDataOriginACO;
629+
extern const o2::header::DataOrigin gDataOriginCPV;
630+
extern const o2::header::DataOrigin gDataOriginCTP;
631+
extern const o2::header::DataOrigin gDataOriginEMC;
632+
extern const o2::header::DataOrigin gDataOriginFIT;
633+
extern const o2::header::DataOrigin gDataOriginHMP;
634+
extern const o2::header::DataOrigin gDataOriginITS;
635+
extern const o2::header::DataOrigin gDataOriginMCH;
636+
extern const o2::header::DataOrigin gDataOriginMFT;
637+
extern const o2::header::DataOrigin gDataOriginMID;
638+
extern const o2::header::DataOrigin gDataOriginPHS;
639+
extern const o2::header::DataOrigin gDataOriginTOF;
640+
extern const o2::header::DataOrigin gDataOriginTPC;
641+
extern const o2::header::DataOrigin gDataOriginTRD;
642+
extern const o2::header::DataOrigin gDataOriginZDC;
643643

644644
//possible data types
645-
extern const o2::Header::DataDescription gDataDescriptionAny;
646-
extern const o2::Header::DataDescription gDataDescriptionInvalid;
647-
extern const o2::Header::DataDescription gDataDescriptionRawData;
648-
extern const o2::Header::DataDescription gDataDescriptionClusters;
649-
extern const o2::Header::DataDescription gDataDescriptionTracks;
650-
extern const o2::Header::DataDescription gDataDescriptionConfig;
651-
extern const o2::Header::DataDescription gDataDescriptionInfo;
652-
extern const o2::Header::DataDescription gDataDescriptionROOTStreamers;
645+
extern const o2::header::DataDescription gDataDescriptionAny;
646+
extern const o2::header::DataDescription gDataDescriptionInvalid;
647+
extern const o2::header::DataDescription gDataDescriptionRawData;
648+
extern const o2::header::DataDescription gDataDescriptionClusters;
649+
extern const o2::header::DataDescription gDataDescriptionTracks;
650+
extern const o2::header::DataDescription gDataDescriptionConfig;
651+
extern const o2::header::DataDescription gDataDescriptionInfo;
652+
extern const o2::header::DataDescription gDataDescriptionROOTStreamers;
653653
/// @} // end of doxygen group
654654

655655
//__________________________________________________________________________________________________
@@ -699,7 +699,11 @@ static_assert(sizeof(BaseHeader::sMagicString) == sizeof(BaseHeader::magicString
699699
///helper function to print a hex/ASCII dump of some memory
700700
void hexDump (const char* desc, const void* voidaddr, size_t len, size_t max=0);
701701

702-
} //namespace Header
702+
} //namespace header
703+
704+
// 2017-12-21: keep an alias for a short while after renaming the namespace
705+
// to lower case, supports pull request currently open
706+
namespace Header = header;
703707
} //namespace o2
704708

705709
#endif

0 commit comments

Comments
 (0)