Skip to content

Commit 5934a6a

Browse files
committed
Fix input and exit condition of ReaderDriverSpec
1 parent 495ca6c commit 5934a6a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Detectors/GlobalTrackingWorkflow/src/ReaderDriverSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void ReadeDriverSpec::run(ProcessingContext& pc)
7575
LOGP(debug, "OUTVEC {}/{}", v.back().getMin().asString(), v.back().getMax().asString());
7676
}
7777
count++;
78-
if ((HBFINI::LastIRFrameIndex == -1 && count == mNTF) || (v.size() && v.back().isLast())) {
78+
if ((HBFINI::LastIRFrameIndex == -1 && count >= mNTF) || (v.size() && v.back().isLast())) {
7979
pc.services().get<ControlService>().endOfStream();
8080
pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
8181
}

Detectors/Raw/src/HBFUtilsInitializer.cxx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ HBFUtilsInitializer::HBFUtilsInitializer(const o2f::ConfigContext& configcontext
5858
bool helpasked = configcontext.helpOnCommandLine(); // if help is asked, don't take for granted that the ini file is there, don't produce an error if it is not!
5959
auto conf = configcontext.options().isSet(HBFConfOpt) ? configcontext.options().get<std::string>(HBFConfOpt) : "";
6060
if (!conf.empty()) {
61+
int nopts = 0;
6162
auto vopts = o2::utils::Str::tokenize(conf, ',');
6263
for (const auto& optStr : vopts) {
6364
if (optStr == UpstreamOpt) {
6465
upstream = true;
6566
continue;
6667
}
6768
HBFOpt opt = getOptType(optStr);
69+
nopts++;
6870
if ((opt == HBFOpt::INI || opt == HBFOpt::JSON) && !helpasked) {
6971
o2::conf::ConfigurableParam::updateFromFile(optStr, "HBFUtils", true); // update only those values which were not touched yet (provenance == kCODE)
7072
const auto& hbfu = o2::raw::HBFUtils::Instance();
@@ -76,8 +78,13 @@ HBFUtilsInitializer::HBFUtilsInitializer(const o2f::ConfigContext& configcontext
7678
hbfuInput = optStr;
7779
} else if (opt == HBFOpt::ROOT) {
7880
rootFileInput = optStr;
81+
} else {
82+
LOGP(fatal, "uknown hbfutils-config option {}", optStr);
7983
}
8084
}
85+
if (!nopts && !helpasked) {
86+
LOGP(fatal, "No source was provided for timing input of --hbfutils-config");
87+
}
8188
}
8289
done = true;
8390
/* RSS

0 commit comments

Comments
 (0)