Skip to content

Commit 0dad46d

Browse files
fapfap69fapfap69
authored
Add the "cru" option in the simulation workflow. (#7035)
1 parent f7ed096 commit 0dad46d

3 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎Detectors/HMPID/base/include/HMPIDBase/Geo.h‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -141,30 +141,32 @@ class ReadOut
141141
uint8_t Cru;
142142
uint8_t Lnk;
143143
uint8_t Flp;
144+
std::string_view FlpHostName;
144145
};
145146
union Lnk {
146147
LinkAddr Id;
147148
uint32_t LinkUId;
148149
};
149-
static constexpr Lnk mEq[Geo::MAXEQUIPMENTS] = {{0, 0, 0, 160},
150-
{1, 0, 1, 160},
151-
{2, 0, 2, 160},
152-
{3, 0, 3, 160},
153-
{4, 1, 0, 160},
154-
{5, 1, 1, 160},
155-
{8, 1, 2, 160},
156-
{9, 1, 3, 160},
157-
{6, 2, 0, 161},
158-
{7, 2, 1, 161},
159-
{10, 2, 2, 161},
160-
{11, 3, 0, 161},
161-
{12, 3, 1, 161},
162-
{13, 3, 2, 161}};
150+
static constexpr Lnk mEq[Geo::MAXEQUIPMENTS] = {{0, 0, 0, 160, "alio-cr1-flp160"},
151+
{1, 0, 1, 160, "alio-cr1-flp160"},
152+
{2, 0, 2, 160, "alio-cr1-flp160"},
153+
{3, 0, 3, 160, "alio-cr1-flp160"},
154+
{4, 1, 0, 160, "alio-cr1-flp160"},
155+
{5, 1, 1, 160, "alio-cr1-flp160"},
156+
{8, 1, 2, 160, "alio-cr1-flp160"},
157+
{9, 1, 3, 160, "alio-cr1-flp160"},
158+
{6, 2, 0, 161, "alio-cr1-flp161"},
159+
{7, 2, 1, 161, "alio-cr1-flp161"},
160+
{10, 2, 2, 161, "alio-cr1-flp161"},
161+
{11, 3, 0, 161, "alio-cr1-flp161"},
162+
{12, 3, 1, 161, "alio-cr1-flp161"},
163+
{13, 3, 2, 161, "alio-cr1-flp161"}};
163164

164165
static inline int FeeId(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? -1 : mEq[idx].Id.Fee; };
165166
static inline int CruId(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? -1 : mEq[idx].Id.Cru; };
166167
static inline int LnkId(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? -1 : mEq[idx].Id.Lnk; };
167168
static inline int FlpId(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? -1 : mEq[idx].Id.Flp; };
169+
static inline std::string_view FlpHostName(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? "" : mEq[idx].Id.FlpHostName; };
168170
static inline uint32_t UniqueId(unsigned int idx) { return (idx > Geo::MAXEQUIPMENTS) ? -1 : mEq[idx].LinkUId; };
169171

170172
static unsigned int searchIdx(int FeeId)

‎Detectors/HMPID/simulation/src/HmpidCoder2.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,13 @@ void HmpidCoder2::openOutputStream(const std::string& outputFileName, const std:
248248
rdh.endPointID = 0;
249249
std::string outfname;
250250
if (fileFor == "link") {
251-
outfname = fmt::format("{}_L{}.raw", outputFileName, ReadOut::FeeId(eq));
251+
outfname = fmt::format("{}_{}_feeid{}.raw", outputFileName, ReadOut::FlpHostName(eq), ReadOut::FeeId(eq));
252252
} else if (fileFor == "flp") {
253-
outfname = fmt::format("{}_flp{}.raw", outputFileName, ReadOut::FlpId(eq));
253+
outfname = fmt::format("{}_{}.raw", outputFileName, ReadOut::FlpHostName(eq));
254254
} else if (fileFor == "all") {
255255
outfname = fmt::format("{}.raw", outputFileName);
256+
} else if (fileFor == "cru") {
257+
outfname = fmt::format("{}_{}.raw", outputFileName, ReadOut::FlpHostName(eq));
256258
} else {
257259
throw std::runtime_error(fmt::format("unknown raw file grouping option {}", fileFor));
258260
}

‎Detectors/HMPID/workflow/src/DigitsToRawSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ o2::framework::DataProcessorSpec getDigitsToRawSpec()
197197
outputs,
198198
AlgorithmSpec{adaptFromTask<DigitsToRawSpec>()},
199199
Options{{"outdir", VariantType::String, "./", {"base dir for output file"}},
200-
{"file-for", VariantType::String, "all", {"single file per: all,flp,link"}},
200+
{"file-for", VariantType::String, "all", {"single file per: all,flp,link,cru"}},
201201
{"outfile", VariantType::String, "hmpid", {"base name for output file"}},
202202
{"in-file", VariantType::String, "hmpiddigits.root", {"name of the input sim root file"}},
203203
{"dump-digits", VariantType::Bool, false, {"out the digits file in /tmp/hmpDumpDigits.dat"}},

0 commit comments

Comments
 (0)