Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Detectors/CPV/simulation/src/RawCreator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int main(int argc, const char** argv)
add_option("help,h", "Print this help message");
add_option("verbose,v", bpo::value<uint32_t>()->default_value(0), "Select verbosity level [0 = no output]");
add_option("input-file,i", bpo::value<std::string>()->default_value("cpvdigits.root"), "Specifies digit input file.");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,cruendpoint,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
add_option("debug,d", bpo::value<uint32_t>()->default_value(0), "Select debug output level [0 = no debug output]");
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
Expand Down Expand Up @@ -97,7 +97,7 @@ int main(int argc, const char** argv)
TTreeReaderValue<std::vector<o2::cpv::TriggerRecord>> triggerbranch(*treereader, "CPVDigitTrigRecords");

o2::cpv::RawWriter::FileFor_t granularity = o2::cpv::RawWriter::FileFor_t::kFullDet;
if ((filefor == "all") || (filefor == "cru")) { // CPV has only 1 cru so "all" is identical to "cru"
if ((filefor == "all") || (filefor == "cruendpoint")) { // CPV has only 1 cru so "all" is identical to "cruendpoint"
granularity = o2::cpv::RawWriter::FileFor_t::kFullDet;
} else if (filefor == "link") {
granularity = o2::cpv::RawWriter::FileFor_t::kLink;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/CTP/simulation/src/digi2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int main(int argc, char** argv)
add_option("verbosity,v", bpo::value<int>()->default_value(0), "verbosity level");
// add_option("input-file,i", bpo::value<std::string>()->default_value(o2::base::NameConf::getDigitsFileName(o2::detectors::DetID::CTP)),"input CTP digits file"); // why not used?
add_option("input-file,i", bpo::value<std::string>()->default_value("ctpdigits.root"), "input CTP digits file");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,link,cru");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,link,cruendpoint");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/FDD/simulation/src/digit2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int main(int argc, char** argv)
// add_option("input-file,i", bpo::value<std::string>()->default_value(o2::base::NameConf::getDigitsFileName(o2::detectors::DetID::FDD)),"input FDD digits file"); // why not used?
add_option("input-file,i", bpo::value<std::string>()->default_value("fdddigits.root"), "input FDD digits file");
add_option("flp-name", bpo::value<std::string>()->default_value("alio2-cr1-flp201"), "single file per: all,flp,cru,link"); // temporary, beacause FIT deployed only on one node
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cruendpoint,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/FT0/simulation/src/digit2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int main(int argc, char** argv)
// add_option("input-file,i", bpo::value<std::string>()->default_value(o2::base::NameConf::getDigitsFileName(o2::detectors::DetID::FT0)),"input FT0 digits file"); // why not used?
add_option("input-file,i", bpo::value<std::string>()->default_value("ft0digits.root"), "input FT0 digits file");
add_option("flp-name", bpo::value<std::string>()->default_value("alio2-cr1-flp200"), "single file per: all,flp,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cruendpoint,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/FV0/simulation/src/digit2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int main(int argc, char** argv)
add_option("verbosity,v", bpo::value<int>()->default_value(0), "verbosity level");
// add_option("input-file,i", bpo::value<std::string>()->default_value(o2::base::NameConf::getDigitsFileName(o2::detectors::DetID::FV0)),"input FV0 digits file"); // why not used?
add_option("input-file,i", bpo::value<std::string>()->default_value("fv0digits.root"), "input FV0 digits file");
add_option("flp-name", bpo::value<std::string>()->default_value("alio2-cr1-flp180"), "single file per: all,flp,cru,link");
add_option("flp-name", bpo::value<std::string>()->default_value("alio2-cr1-flp180"), "single file per: all,flp,cruendpoint,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cru,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/raw/include/FITRaw/RawWriterFIT.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class RawWriterFIT
maskName += fmt::format("_{}", mFlpName);
if (mFileFor != "flp") {
maskName += fmt::format("_cru{}_{}", RDHUtils::getCRUID(rdh), RDHUtils::getEndPointID(rdh));
if (mFileFor != "cru") {
if (mFileFor != "cruendpoint") {
maskName += fmt::format("_lnk{}_feeid{}", RDHUtils::getLinkID(rdh), RDHUtils::getFEEID(rdh));
if (mFileFor != "link") {
throw std::runtime_error("invalid option provided for file grouping");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/HMPID/simulation/src/HmpidCoder2.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void HmpidCoder2::openOutputStream(const std::string& outputFileName, const std:
outfname = fmt::format("{}_{}.raw", outputFileName, ReadOut::FlpHostName(eq));
} else if (fileFor == "all") {
outfname = fmt::format("{}.raw", outputFileName);
} else if (fileFor == "cru") {
} else if (fileFor == "crorcendpoint") {
outfname = fmt::format("{}_{}_crorc{}_{}.raw", outputFileName, ReadOut::FlpHostName(eq), int(rdh.cruID), int(rdh.linkID));
} else {
throw std::runtime_error(fmt::format("unknown raw file grouping option {}", fileFor));
Expand Down
2 changes: 1 addition & 1 deletion Detectors/HMPID/workflow/src/DigitsToRawSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ o2::framework::DataProcessorSpec getDigitsToRawSpec()
outputs,
AlgorithmSpec{adaptFromTask<DigitsToRawSpec>()},
Options{{"outdir", VariantType::String, "./", {"base dir for output file"}},
{"file-for", VariantType::String, "all", {"single file per: all,flp,link,cru"}},
{"file-for", VariantType::String, "all", {"single file per: all,flp,link,crorcendpoint"}},
{"outfile", VariantType::String, "HMP", {"base name for output file"}},
{"in-file", VariantType::String, "hmpiddigits.root", {"name of the input sim root file"}},
{"dump-digits", VariantType::Bool, false, {"out the digits file in /tmp/hmpDumpDigits.dat"}},
Expand Down
4 changes: 2 additions & 2 deletions Detectors/ITSMFT/ITS/simulation/src/digi2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int main(int argc, char** argv)
add_option("help,h", "Print this help message");
add_option("verbosity,v", bpo::value<uint32_t>()->default_value(0), "verbosity level [0 = no output]");
add_option("input-file,i", bpo::value<std::string>()->default_value("itsdigits.root"), "input ITS digits file");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,flp,cruendpoint,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(DefRDHVersion), "RDH version to use");
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
Expand Down Expand Up @@ -446,7 +446,7 @@ void setupLinks(o2::itsmft::MC2RawEncoder<MAP>& m2r, std::string_view outDir, st
outFileLink += fmt::format("_{}", ruhw.flp);
if (fileFor != "flp") {
outFileLink += fmt::format("_cru{}_{}", ruhw.cruHWID, link->endPointID);
if (fileFor != "cru") {
if (fileFor != "cruendpoint") {
outFileLink += fmt::format("_lnk{}_feeid{}", link->idInCRU, link->feeID);
if (fileFor != "link") {
throw std::runtime_error("invalid option provided for file grouping");
Expand Down
4 changes: 2 additions & 2 deletions Detectors/ITSMFT/MFT/simulation/src/digi2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int main(int argc, char** argv)
add_option("help,h", "Print this help message");
add_option("verbosity,v", bpo::value<uint32_t>()->default_value(0), "verbosity level [0 = no output]");
add_option("input-file,i", bpo::value<std::string>()->default_value("mftdigits.root"), "input digits file");
add_option("file-for,f", bpo::value<std::string>()->default_value("layer"), "single file per: all,layer,cru,link");
add_option("file-for,f", bpo::value<std::string>()->default_value("layer"), "single file per: all,layer,cruendpoint,link");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
add_option("rdh-version,r", bpo::value<uint32_t>()->default_value(defRDH), "RDH version to use");
Expand Down Expand Up @@ -310,7 +310,7 @@ void setupLinks(o2::itsmft::MC2RawEncoder<MAP>& m2r, std::string_view outDir, st
outFileLink += fmt::format("_{}", mftHWMap[ruID].flp);
if (fileFor != "flp") {
outFileLink += fmt::format("_cru{}_{}", mftHWMap[ruID].cruHWID, link->endPointID);
if (fileFor != "cru") {
if (fileFor != "cruendpoint") {
outFileLink += fmt::format("_lnk{}_feeid{}", link->idInCRU, link->feeID);
if (fileFor != "link") {
throw std::runtime_error("invalid option provided for file grouping");
Expand Down
4 changes: 2 additions & 2 deletions Detectors/MUON/MCH/Raw/Encoder/Digit/digits-to-raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(int argc, char* argv[])
("userLogic,u",po::bool_switch()->default_value(true),"user logic format")
("dummy-elecmap,d",po::bool_switch()->default_value(false),"use a dummy electronic mapping (for testing only, to be removed at some point)")
("output-dir,o",po::value<std::string>()->default_value("./"),"output directory for file(s)")
("file-for,f", po::value<std::string>()->default_value("all"), "output one file (file-for=all), per link (file-for=link) or per cru end point (file-for=cru)")
("file-for,f", po::value<std::string>()->default_value("all"), "output one file (file-for=all), per link (file-for=link) or per cru end point (file-for=cruendpoint)")
("input-file,i",po::value<std::string>(&input)->default_value("mchdigits.root"),"input file name")
("configKeyValues", po::value<std::string>()->default_value(""), "comma-separated configKeyValues")
("no-empty-hbf,e", po::value<bool>()->default_value(false), "do not create empty HBF pages (except for HBF starting TF)")
Expand Down Expand Up @@ -108,7 +108,7 @@ int main(int argc, char* argv[])
auto fileFor = vm["file-for"].as<std::string>();
if (fileFor == "link") {
opts.splitMode = OutputSplit::PerLink;
} else if (fileFor == "cru") {
} else if (fileFor == "cruendpoint") {
opts.splitMode = OutputSplit::PerCruEndpoint;
} else if (fileFor == "all") {
opts.splitMode = OutputSplit::None;
Expand Down
2 changes: 1 addition & 1 deletion Detectors/MUON/MID/Raw/src/Encoder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void Encoder::init(std::string_view outDir, std::string_view fileFor, int verbos
outFileLink += "_alio2-cr1-flp159";
if (fileFor != "flp") {
outFileLink += fmt::format("_cru{}_{}", cruId, epId);
if (fileFor != "cru") {
if (fileFor != "cruendpoint") {
outFileLink += fmt::format("_lnk{}_feeid{}", raw::sUserLogicLinkID, feeId);
if (fileFor != "link") {
throw std::runtime_error("invalid option provided for file grouping");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/MUON/MID/Workflow/src/RawWriterSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ framework::DataProcessorSpec getRawWriterSpec()
of::AlgorithmSpec{of::adaptFromTask<o2::mid::RawWriterDeviceDPL>()},
of::Options{
{"mid-raw-outdir", of::VariantType::String, ".", {"Raw file output directory"}},
{"file-for", of::VariantType::String, "all", {"single file per: all,flp,cru,link"}},
{"file-for", of::VariantType::String, "all", {"single file per: all,flp,cruendpoint,link"}},
{"mid-raw-header-offset", of::VariantType::Bool, false, {"Header offset in bytes"}}}};
}
} // namespace mid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Encoder
Encoder();
~Encoder() = default;

bool open(const std::string& name, const std::string& path = ".", const std::string& fileFor = "cru");
bool open(const std::string& name, const std::string& path = ".", const std::string& fileFor = "cruendpoint");
bool alloc(long size);

bool encode(std::vector<std::vector<o2::tof::Digit>> digitWindow, int tofwindow = 0);
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TOF/reconstruction/src/Encoder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bool Encoder::open(const std::string& name, const std::string& path, const std::
if (mCrateOn[crateid]) {
if (fileFor == "all") { // single file for all links
outFileLink = o2::utils::Str::concat_string(path, "/TOF.raw");
} else if (fileFor == "cru") {
} else if (fileFor == "cruendpoint") {
outFileLink = o2::utils::Str::concat_string(path, "/", "TOF_alio2-cr1-flp", std::to_string(Geo::getFLPid(crateid)), "_cru", std::to_string(Geo::getCRUid(crateid)), "_", std::to_string(Geo::getCRUendpoint(crateid)), ".raw");
} else if (fileFor == "link") {
outFileLink = o2::utils::Str::concat_string(path, "/", "TOF_alio2-cr1-flp", std::to_string(Geo::getFLPid(crateid)), "_cru", std::to_string(Geo::getCRUid(crateid)), "_", std::to_string(Geo::getCRUendpoint(crateid)), "_link", std::to_string(RDHUtils::getLinkID(rdh)), ".raw");
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TOF/workflowIO/src/TOFRawWriterSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ DataProcessorSpec getTOFRawWriterSpec()
Options{
{"tof-raw-outfile", VariantType::String, "tof.raw", {"Name of the output file"}},
{"tof-raw-outdir", VariantType::String, ".", {"Name of the output dir"}},
{"file-for", VariantType::String, "cru", {"Single file per: all,cru,link"}}}};
{"file-for", VariantType::String, "cruendpoint", {"Single file per: all,cruendpoint,link"}}}};
}
} // namespace tof
} // namespace o2
4 changes: 2 additions & 2 deletions Detectors/TPC/workflow/src/convertDigitsToRawZS.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void convertDigitsToZSfinal(std::string_view digitsFile, std::string_view output
outfname = fmt::format("{}tpc_all.raw", outDir);
} else if (fileFor == "sector") {
outfname = i == NSectors ? fmt::format("{}tpc_iac.raw", outDir) : fmt::format("{}tpc_sector{}.raw", outDir, i);
} else if (fileFor == "link" || fileFor == "cru") {
} else if (fileFor == "link" || fileFor == "cruendpoint") {
outfname = fmt::format("{}TPC_{}_cru{}_{}.raw", outDir, CRU_FLPS[cruID], cruID, j & 1);
} else {
throw std::runtime_error("invalid option provided for file grouping");
Expand Down Expand Up @@ -257,7 +257,7 @@ int main(int argc, char** argv)
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "Specify output directory");
add_option("no-parent-directories,n", "Do not create parent directories recursively");
add_option("sector-by-sector,s", bpo::value<bool>()->default_value(false)->implicit_value(true), "Run one TPC sector after another");
add_option("file-for,f", bpo::value<std::string>()->default_value("sector"), "single file per: link,sector,cru,all");
add_option("file-for,f", bpo::value<std::string>()->default_value("sector"), "single file per: link,sector,cruendpoint,all");
add_option("stop-page,p", bpo::value<bool>()->default_value(false)->implicit_value(true), "HBF stop on separate CRU page");
add_option("padding", bpo::value<bool>()->default_value(false)->implicit_value(true), "Pad all pages to 8kb");
uint32_t defRDH = o2::raw::RDHUtils::getVersion<o2::header::RAWDataHeader>();
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TRD/simulation/src/Trap2CRU.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ void Trap2CRU::readTrapData()
ss << std::setw(2) << std::setfill('0') << sm;
std::string supermodule = ss.str();
outFileLink = o2::utils::Str::concat_string(mOutputDir, "/", outPrefix, "_sm_", supermodule, outSuffix);
} else if (mFilePer == "fullcru") {
} else if (mFilePer == "cru") {
// one file per CRU (both end points combined)
outFileLink = o2::utils::Str::concat_string(mOutputDir, "/", outPrefix, std::to_string(flpid), "_cru", std::to_string(cruhwid), outSuffix);
} else if (mFilePer == "cru") {
} else if (mFilePer == "cruendpoint") {
// one file per CRU end point
outFileLink = o2::utils::Str::concat_string(mOutputDir, "/", outPrefix, std::to_string(flpid), "_cru", std::to_string(cruhwid), "_", std::to_string(mEndPointID), outSuffix);
} else {
Expand Down
4 changes: 2 additions & 2 deletions Detectors/TRD/simulation/src/trap2raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main(int argc, char** argv)
add_option("verbosity,v", bpo::value<int>()->default_value(0), "verbosity level");
add_option("input-file-digits,d", bpo::value<std::string>()->default_value("trddigits.root"), "input Trapsim digits file");
add_option("input-file-tracklets,t", bpo::value<std::string>()->default_value("trdtracklets.root"), "input Trapsim tracklets file");
add_option("file-per,l", bpo::value<std::string>()->default_value("halfcru"), "all : raw file(false), halfcru : cru end point, cru : one file per cru, sm: one file per supermodule");
add_option("file-for,l", bpo::value<std::string>()->default_value("cruendpoint"), "all : raw file(false), cruendpoint : cru end point, cru : one file per cru, sm: one file per supermodule");
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
add_option("tracklethcheader,x", bpo::value<int>()->default_value(2), "include tracklet half chamber header (for run3). 0 never, 1 if there is tracklet data, 2 always");
add_option("no-empty-hbf,e", bpo::value<bool>()->default_value(false)->implicit_value(true), "do not create empty HBF pages (except for HBF starting TF)");
Expand Down Expand Up @@ -91,7 +91,7 @@ int main(int argc, char** argv)

const auto& hbfu = o2::raw::HBFUtils::Instance(); // we need the creation time for the link mapping from CCDB

trap2raw(vm["input-file-digits"].as<std::string>(), vm["input-file-tracklets"].as<std::string>(), vm["output-dir"].as<std::string>(), vm["verbosity"].as<int>(), vm["file-per"].as<std::string>(), vm["rdh-version"].as<uint32_t>(), vm["no-empty-hbf"].as<bool>(), vm["tracklethcheader"].as<int>(), 1024 * 1024, hbfu.startTime);
trap2raw(vm["input-file-digits"].as<std::string>(), vm["input-file-tracklets"].as<std::string>(), vm["output-dir"].as<std::string>(), vm["verbosity"].as<int>(), vm["file-for"].as<std::string>(), vm["rdh-version"].as<uint32_t>(), vm["no-empty-hbf"].as<bool>(), vm["tracklethcheader"].as<int>(), 1024 * 1024, hbfu.startTime);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ZDC/simulation/src/Digits2Raw.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void Digits2Raw::processDigits(const std::string& outDir, const std::string& fil
outFileLink += fmt::format("_{}", mFLP);
if (mFileFor != "flp") {
outFileLink += fmt::format("_cru{}_{}", mCruID, mEndPointID);
if (mFileFor != "cru") {
if (mFileFor != "cruendpoint") {
outFileLink += fmt::format("_lnk{}_feeid{}", ilink, FeeID);
if (mFileFor != "link") {
LOG(fatal) << "Not supported output file splitting: " << mFileFor;
Expand Down
Loading