Skip to content

Commit 3362edb

Browse files
committed
[roc] Change namespace from AliceO2 to o2
1 parent e8da53f commit 3362edb

File tree

162 files changed

+636
-576
lines changed

Some content is hidden

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

162 files changed

+636
-576
lines changed

include/ReadoutCard/BarInterface.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313
///
1414
/// \author Pascal Boeschoten ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_BARINTERFACE_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_BARINTERFACE_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_BARINTERFACE_H_
17+
#define O2_READOUTCARD_INCLUDE_BARINTERFACE_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <cstdint>
2021
#include "ReadoutCard/CardType.h"
2122
#include "ReadoutCard/RegisterReadWriteInterface.h"
2223
#include "ReadoutCard/Parameters.h"
2324
#include "boost/optional.hpp"
2425

25-
namespace AliceO2
26+
namespace o2
2627
{
2728
namespace roc
2829
{
@@ -78,6 +79,6 @@ class BarInterface : public virtual RegisterReadWriteInterface
7879
};
7980

8081
} // namespace roc
81-
} // namespace AliceO2
82+
} // namespace o2
8283

83-
#endif // ALICEO2_INCLUDE_READOUTCARD_BARINTERFACE_H_
84+
#endif // O2_READOUTCARD_INCLUDE_BARINTERFACE_H_

include/ReadoutCard/CardConfigurator.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
///
1414
/// \author Kostas Alexopoulos ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CARDCONFIGURATOR_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_CARDCONFIGURATOR_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_CARDCONFIGURATOR_H_
17+
#define O2_READOUTCARD_INCLUDE_CARDCONFIGURATOR_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include "ReadoutCard/CardType.h"
2021
#include "ReadoutCard/Parameters.h"
2122

22-
namespace AliceO2
23+
namespace o2
2324
{
2425
namespace roc
2526
{
@@ -37,6 +38,6 @@ class CardConfigurator
3738
};
3839

3940
} // namespace roc
40-
} // namespace AliceO2
41+
} // namespace o2
4142

42-
#endif // ALICEO2_SRC_READOUTCARD_CARDCONFIGURATOR_H_
43+
#endif // O2_READOUTCARD_INCLUDE_CARDCONFIGURATOR_H_

include/ReadoutCard/CardDescriptor.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
/// \author Pascal Boeschoten ([email protected])
1515
/// \author Kostas Alexopoulos ([email protected])
1616

17-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CARDDESCRIPTOR_H_
18-
#define ALICEO2_INCLUDE_READOUTCARD_CARDDESCRIPTOR_H_
17+
#ifndef O2_READOUTCARD_INCLUDE_CARDDESCRIPTOR_H_
18+
#define O2_READOUTCARD_INCLUDE_CARDDESCRIPTOR_H_
1919

20+
#include "ReadoutCard/NamespaceAlias.h"
2021
#include <boost/optional.hpp>
2122
#include "ReadoutCard/CardType.h"
2223
#include "ReadoutCard/ParameterTypes/PciAddress.h"
2324
#include "ReadoutCard/ParameterTypes/SerialId.h"
2425
#include "ReadoutCard/PciId.h"
2526

26-
namespace AliceO2
27+
namespace o2
2728
{
2829
namespace roc
2930
{
@@ -39,6 +40,6 @@ struct CardDescriptor {
3940
};
4041

4142
} // namespace roc
42-
} // namespace AliceO2
43+
} // namespace o2
4344

44-
#endif // ALICEO2_INCLUDE_READOUTCARD_CARDDESCRIPTOR_H_
45+
#endif // O2_READOUTCARD_INCLUDE_CARDDESCRIPTOR_H_

include/ReadoutCard/CardFinder.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
///
1414
/// \author Kostas Alexopoulos ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CARDFINDER_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_CARDFINDER_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_CARDFINDER_H_
17+
#define O2_READOUTCARD_INCLUDE_CARDFINDER_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <vector>
2021

2122
#include "ReadoutCard/CardDescriptor.h"
2223
#include "ReadoutCard/Parameters.h"
2324

24-
namespace AliceO2
25+
namespace o2
2526
{
2627
namespace roc
2728
{
@@ -31,6 +32,6 @@ CardDescriptor findCard(const std::string cardId);
3132
CardDescriptor findCard(const Parameters::CardIdType& cardId);
3233

3334
} // namespace roc
34-
} // namespace AliceO2
35+
} // namespace o2
3536

36-
#endif // ALICEO2_INCLUDE_READOUTCARD_CARDFINDER_H_
37+
#endif // O2_READOUTCARD_INCLUDE_CARDFINDER_H_

include/ReadoutCard/CardType.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
///
44
/// \author Pascal Boeschoten ([email protected])
55

6-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CARDTYPE_H_
7-
#define ALICEO2_INCLUDE_READOUTCARD_CARDTYPE_H_
6+
#ifndef O2_READOUTCARD_INCLUDE_CARDTYPE_H_
7+
#define O2_READOUTCARD_INCLUDE_CARDTYPE_H_
88

9+
#include "ReadoutCard/NamespaceAlias.h"
910
#include <string>
1011

11-
namespace AliceO2
12+
namespace o2
1213
{
1314
namespace roc
1415
{
@@ -78,6 +79,6 @@ static_assert(!isValidTag<int>(), "");
7879
} // namespace CardTypeTag
7980

8081
} // namespace roc
81-
} // namespace AliceO2
82+
} // namespace o2
8283

83-
#endif // ALICEO2_INCLUDE_READOUTCARD_CARDTYPE_H_
84+
#endif // O2_READOUTCARD_INCLUDE_CARDTYPE_H_

include/ReadoutCard/ChannelFactory.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
///
1414
/// \author Pascal Boeschoten ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CHANNELFACTORY_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_CHANNELFACTORY_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_CHANNELFACTORY_H_
17+
#define O2_READOUTCARD_INCLUDE_CHANNELFACTORY_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <memory>
2021
#include <string>
2122
#include "ReadoutCard/BarInterface.h"
2223
#include "ReadoutCard/DmaChannelInterface.h"
2324
#include "ReadoutCard/Parameters.h"
2425
#include "ReadoutCard/ParameterTypes/SerialId.h"
2526

26-
namespace AliceO2
27+
namespace o2
2728
{
2829
namespace roc
2930
{
@@ -64,6 +65,6 @@ class ChannelFactory
6465
};
6566

6667
} // namespace roc
67-
} // namespace AliceO2
68+
} // namespace o2
6869

69-
#endif // ALICEO2_INCLUDE_READOUTCARD_CHANNELFACTORY_H_
70+
#endif // O2_READOUTCARD_INCLUDE_CHANNELFACTORY_H_

include/ReadoutCard/Cru.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
///
1414
/// \author Kostas Alexopoulos ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_CRU_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_CRU_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_CRU_H_
17+
#define O2_READOUTCARD_INCLUDE_CRU_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <cstdint>
2021

2122
#include "Register.h"
2223

23-
namespace AliceO2
24+
namespace o2
2425
{
2526
namespace roc
2627
{
@@ -83,6 +84,6 @@ static constexpr Register SWT_WORD_MON(0x00f00060);
8384

8485
} // namespace Cru
8586
} // namespace roc
86-
} // namespace AliceO2
87+
} // namespace o2
8788

88-
#endif // ALICEO2_INCLUDE_READOUTCARD_CRU_H_
89+
#endif // O2_READOUTCARD_INCLUDE_CRU_H_

include/ReadoutCard/DmaChannelInterface.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
///
1414
/// \author Pascal Boeschoten ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_DMACHANNELINTERFACE_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_DMACHANNELINTERFACE_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_DMACHANNELINTERFACE_H_
17+
#define O2_READOUTCARD_INCLUDE_DMACHANNELINTERFACE_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <cstdint>
2021
#include <boost/optional.hpp>
2122
#include "ReadoutCard/Parameters.h"
@@ -24,7 +25,7 @@
2425
#include "ReadoutCard/RegisterReadWriteInterface.h"
2526
#include "ReadoutCard/Superpage.h"
2627

27-
namespace AliceO2
28+
namespace o2
2829
{
2930
namespace roc
3031
{
@@ -144,6 +145,6 @@ class DmaChannelInterface
144145
};
145146

146147
} // namespace roc
147-
} // namespace AliceO2
148+
} // namespace o2
148149

149-
#endif // ALICEO2_INCLUDE_READOUTCARD_DMACHANNELINTERFACE_H_
150+
#endif // O2_READOUTCARD_INCLUDE_DMACHANNELINTERFACE_H_

include/ReadoutCard/Exception.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@
1313
///
1414
/// \author Pascal Boeschoten ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_EXCEPTION_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_EXCEPTION_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_EXCEPTION_H_
17+
#define O2_READOUTCARD_INCLUDE_EXCEPTION_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include <Common/Exceptions.h>
2021
#include <stdexcept>
2122
#include <boost/exception/exception.hpp>
2223

23-
namespace AliceO2
24+
namespace o2
2425
{
2526
namespace roc
2627
{
2728

2829
//// RORC exception definitions
29-
struct Exception : Common::Exception {
30+
struct Exception : AliceO2::Common::Exception {
3031
};
3132

3233
// General exception definitions
@@ -110,6 +111,6 @@ struct OptionRequiredException : virtual ProgramOptionException {
110111
};
111112

112113
} // namespace roc
113-
} // namespace AliceO2
114+
} // namespace o2
114115

115-
#endif // ALICEO2_INCLUDE_READOUTCARD_EXCEPTION_H_
116+
#endif // O2_READOUTCARD_INCLUDE_EXCEPTION_H_

include/ReadoutCard/FirmwareChecker.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
///
1414
/// \author Kostas Alexopoulos ([email protected])
1515

16-
#ifndef ALICEO2_INCLUDE_READOUTCARD_FIRMWARECHECKER_H_
17-
#define ALICEO2_INCLUDE_READOUTCARD_FIRMWARECHECKER_H_
16+
#ifndef O2_READOUTCARD_INCLUDE_FIRMWARECHECKER_H_
17+
#define O2_READOUTCARD_INCLUDE_FIRMWARECHECKER_H_
1818

19+
#include "ReadoutCard/NamespaceAlias.h"
1920
#include "unordered_map"
2021
#include "ReadoutCard/ChannelFactory.h"
2122
#include "ReadoutCard/Parameters.h"
2223

23-
namespace AliceO2
24+
namespace o2
2425
{
2526
namespace roc
2627
{
@@ -42,6 +43,6 @@ class FirmwareChecker
4243
};
4344

4445
} // namespace roc
45-
} // namespace AliceO2
46+
} // namespace o2
4647

47-
#endif // ALICEO2_INCLUDE_READOUTCARD_FIRMWARECHECKER_H_
48+
#endif // O2_READOUTCARD_INCLUDE_FIRMWARECHECKER_H_

0 commit comments

Comments
 (0)