Skip to content

Commit 954d8f6

Browse files
authored
Merge pull request #377 from art-daq/rrivera/checkpointInMC2opsTests
Checkpoint in MC2 ops tests
2 parents 39c8e92 + 58b42bd commit 954d8f6

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

otsdaq/FECore/FEVInterface.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ FEVInterface::~FEVInterface(void)
8888
void FEVInterface::PauseResumeSlowControls(__ARGS__)
8989
{
9090
slowControlsWorkLoopShouldRun_ =
91-
__GET_ARG_IN__("Pause Slow Controls (Default = false)", bool, false);
91+
!__GET_ARG_IN__("Pause Slow Controls (Default = false)", bool, false);
9292
__FE_COUTV__(slowControlsWorkLoopShouldRun_);
9393

9494
std::stringstream outss;
9595
outss << "Slow Controls workloop is "
96-
<< (slowControlsWorkLoopShouldRun_ ? "paused." : "active.");
96+
<< (slowControlsWorkLoopShouldRun_ ? "active." : "paused.");
9797

9898
__SET_ARG_OUT__("Result", outss.str());
9999
} // end PauseResumeSlowControls()
@@ -418,7 +418,14 @@ try
418418
sleep(1); // seconds
419419
++timeCounter;
420420
if(!slowControlsWorkLoopShouldRun_)
421+
{
422+
__COUTT__
423+
<< "Skipping slow controls loop... slowControlsWorkLoopShouldRun_ = "
424+
<< slowControlsWorkLoopShouldRun_ << __E__;
421425
continue;
426+
}
427+
__COUTT__ << "Starting slow controls loop... slowControlsWorkLoopShouldRun_ = "
428+
<< slowControlsWorkLoopShouldRun_ << __E__;
422429

423430
if(txBuffer.size())
424431
__FE_COUT__ << "txBuffer sz=" << txBuffer.size() << __E__;

otsdaq/GatewaySupervisor/GatewaySupervisor.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5705,6 +5705,7 @@ void GatewaySupervisor::stateConfigured(toolbox::fsm::FiniteStateMachine& /*fsm*
57055705
supervisorApplicationUID_);
57065706
if(!configLinkNode.isDisconnected())
57075707
{
5708+
__COUTV__(activeStateMachineName_);
57085709
ConfigurationTree fsmLinkNode =
57095710
configLinkNode.getNode("LinkToStateMachineTable")
57105711
.getNode(activeStateMachineName_);
@@ -5737,6 +5738,13 @@ void GatewaySupervisor::stateConfigured(toolbox::fsm::FiniteStateMachine& /*fsm*
57375738
getLastLogEntry(RunControlStateMachine::STOP_TRANSITION_NAME));
57385739
}
57395740
}
5741+
else
5742+
__COUT__ << "Gateway Supervisor configuration record not found at '"
5743+
<< ConfigurationManager::XDAQ_CONTEXT_TABLE_NAME << "/"
5744+
<< supervisorContextUID_ << "/" << supervisorApplicationUID_
5745+
<< "' - consider adding one to control configuration dumps "
5746+
"and state machine properties."
5747+
<< __E__;
57405748
}
57415749
catch(const std::runtime_error& e)
57425750
{

0 commit comments

Comments
 (0)