Skip to content

Commit b9dff1f

Browse files
committed
Rename SC to SWT for roc-config
1 parent 79f3836 commit b9dff1f

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The Parameters that affect the configuration of the CRU and their possible value
135135

136136
`GbtMode (GBT | WB)`
137137

138-
`GbtMux (TTC | DDG | SC)`
138+
`GbtMux (TTC | DDG | SWT)`
139139

140140
`LinkLoopbackEnabled (true | false)`
141141

@@ -204,12 +204,12 @@ The configuration file separates the parameter into three groups.
204204
2. `[links]`
205205

206206
This part refers to all the links. Configuration that goes in this group will be applied to all links, unless specifically
207-
setting parameters for individual links in the next section. For example to enable all links with SC MUX by default:
207+
setting parameters for individual links in the next section. For example to enable all links with SWT MUX by default:
208208

209209
```
210210
[links]
211211
enabled=true
212-
gbtmux=sc
212+
gbtmux=swt
213213
```
214214
215215
3. `[link*]`

include/ReadoutCard/Cru.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static constexpr uint32_t DATA_MIDTRG(0x2);
3131

3232
static constexpr uint32_t GBT_MUX_TTC(0x0);
3333
static constexpr uint32_t GBT_MUX_DDG(0x1);
34-
static constexpr uint32_t GBT_MUX_SC(0x2);
34+
static constexpr uint32_t GBT_MUX_SWT(0x2);
3535

3636
static constexpr uint32_t GBT_MODE_GBT(0x0);
3737
static constexpr uint32_t GBT_MODE_WB(0x1);

include/ReadoutCard/ParameterTypes/GbtMux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct GbtMux
2929
{
3030
Ttc = Cru::GBT_MUX_TTC,
3131
Ddg = Cru::GBT_MUX_DDG,
32-
Sc = Cru::GBT_MUX_SC,
32+
Swt = Cru::GBT_MUX_SWT,
3333
};
3434

3535
/// Converts a GbtMux to an int

roc_example.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ onuaddress=0x0badcafe
4545
# [true | false]
4646
enabled=true
4747

48-
# [TTC | DDG | SC]
48+
# [TTC | DDG | SWT]
4949
gbtmux=TTC
5050

5151
#############################################
@@ -65,7 +65,7 @@ gbtmux=ttc
6565

6666
[link2]
6767
enabled=true
68-
gbtmux=SC
68+
gbtmux=SWT
6969

7070
[link3]
7171
enabled=false
@@ -77,4 +77,4 @@ gbtmux=ddg
7777

7878
[link21]
7979
enabled=true
80-
gbtmux=sc
80+
gbtmux=swt

src/CommandLineUtilities/ProgramStatus.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class ProgramStatus: public Program
102102
gbtMux = "TTC:" + downstreamData;
103103
} else if (link.gbtMux == Cru::GBT_MUX_DDG) {
104104
gbtMux = "DDG";
105-
} else if (link.gbtMux == Cru::GBT_MUX_SC) {
106-
gbtMux = "SC";
105+
} else if (link.gbtMux == Cru::GBT_MUX_SWT) {
106+
gbtMux = "SWT";
107107
}
108108

109109
std::string datapathMode;

src/Cru/Gbt.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ void Gbt::getGbtMuxes()
107107
link.gbtMux = GbtMux::type::Ttc;
108108
} else if (txMux == Cru::GBT_MUX_DDG) {
109109
link.gbtMux = GbtMux::type::Ddg;
110-
} else if (txMux == Cru::GBT_MUX_SC) {
111-
link.gbtMux = GbtMux::type::Sc;
110+
} else if (txMux == Cru::GBT_MUX_SWT) {
111+
link.gbtMux = GbtMux::type::Swt;
112112
}
113113
}
114114
}

src/ParameterTypes/GbtMux.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace {
2323
static const auto converter = Utilities::makeEnumConverter<GbtMux::type>("GbtMux", {
2424
{ GbtMux::Ttc, "Ttc" },
2525
{ GbtMux::Ddg, "Ddg" },
26-
{ GbtMux::Sc, "Sc" },
26+
{ GbtMux::Swt, "Swt" },
2727
});
2828

2929
} // Anonymous namespace

0 commit comments

Comments
 (0)