Skip to content

Commit cb5f0e1

Browse files
committed
readout: change to daq start order: enable_daq_mode after mcst sequence
1 parent aaf9c7c commit cb5f0e1

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/mesytec-mvlc/mvlc_readout_worker.cc

+9-8
Original file line numberDiff line numberDiff line change
@@ -1172,14 +1172,6 @@ std::error_code ReadoutWorker::Private::startReadout()
11721172
logger->info("setup_readout_triggers() done");
11731173
}
11741174

1175-
if ((ec = enable_daq_mode(mvlc)))
1176-
{
1177-
logger->error("Error enabling MVLC DAQ mode: {}", ec.message());
1178-
throw ec; // "goto fail"
1179-
}
1180-
1181-
logger->info("enable_daq_mode done");
1182-
11831175
if (!mcstDaqStart.empty())
11841176
{
11851177
logger->info("Running MCST DAQ start commands ({} commands to run)", mcstDaqStart.commandCount());
@@ -1208,6 +1200,15 @@ std::error_code ReadoutWorker::Private::startReadout()
12081200
logger->info("Done with MCST DAQ start commands");
12091201
}
12101202
}
1203+
1204+
if ((ec = enable_daq_mode(mvlc)))
1205+
{
1206+
logger->error("Error enabling MVLC DAQ mode: {}", ec.message());
1207+
throw ec; // "goto fail"
1208+
}
1209+
1210+
logger->info("enable_daq_mode done");
1211+
12111212
}
12121213
catch (const std::error_code &)
12131214
{

0 commit comments

Comments
 (0)