Skip to content

Commit 838fb5a

Browse files
mconcassawenzel
authored andcommitted
Fix protection for run3 configuration
1 parent fbbd7b0 commit 838fb5a

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

Common/SimConfig/src/SimConfig.cxx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,29 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
7474
if (activeModules[0] != "all") {
7575
if (isUpgrade) {
7676
for (int i = 0; i < activeModules.size(); ++i) {
77-
if (activeModules[i] != "IT3" && activeModules[i] != "TRK" && activeModules[i] != "FT3" && activeModules[i] != "FCT" && activeModules[i] != "A3IP" && activeModules[i] != "TF3" && activeModules[i] != "RCH" && activeModules[i] != "MI3" && activeModules[i] != "ECL") {
77+
if (activeModules[i] != "A3IP" &&
78+
activeModules[i] != "IT3" &&
79+
activeModules[i] != "TRK" &&
80+
activeModules[i] != "FT3" &&
81+
activeModules[i] != "FCT" &&
82+
activeModules[i] != "TF3" &&
83+
activeModules[i] != "RCH" &&
84+
activeModules[i] != "MI3" &&
85+
activeModules[i] != "ECL") {
7886
LOGP(fatal, "List of active modules contains {}, which is not a module from the upgrades.", activeModules[i]);
7987
}
8088
}
8189
}
8290
if (!isUpgrade) {
8391
for (int i = 0; i < activeModules.size(); ++i) {
84-
if (activeModules[i] == "TRK" || activeModules[i] == "FT3" || activeModules[i] == "FCT" || activeModules[i] == "A3IP" && activeModules[i] == "TF3" && activeModules[i] == "RCH" && activeModules[i] == "MI3" && activeModules[i] == "ECL") {
92+
if (activeModules[i] == "A3IP" ||
93+
activeModules[i] == "TRK" ||
94+
activeModules[i] == "FT3" ||
95+
activeModules[i] == "FCT" ||
96+
activeModules[i] == "TF3" ||
97+
activeModules[i] == "RCH" ||
98+
activeModules[i] == "MI3" ||
99+
activeModules[i] == "ECL") {
85100
LOGP(fatal, "List of active modules contains {}, which is not a run 3 module", activeModules[i]);
86101
}
87102
}

0 commit comments

Comments
 (0)