Skip to content

Commit 56280b1

Browse files
committed
esthetic changes in QC
1 parent aed5203 commit 56280b1

6 files changed

Lines changed: 12 additions & 20 deletions

File tree

example-default.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ taskDefinition=taskDefinition_1
1313
taskDefinition=taskDefinition_1
1414

1515
[taskDefinition_1]
16-
className=AliceO2::QualityControlModules::Example::ExampleTask
16+
className=AliceO2::QualityControlModules::Template::TemplateTask
17+
;className=AliceO2::QualityControlModules::Example::ExampleTask
1718
moduleName=QcExample
1819
cycleDurationSeconds=10
1920
numberHistos=1000
2021
numberChecks=10
21-
typeOfChecks=AliceO2::QualityControlModules::Example::FakeCheck
22+
;typeOfChecks=AliceO2::QualityControlModules::Example::FakeCheck
23+
typeOfChecks=AliceO2::QualityControlModules::Template::TemplateCheck
2224
; set to -1 for no maximum or remove the line
2325
maxNumberCycles=-1
2426
;exampleTaskOutput=0

include/QualityControl/SpyDevice.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ class SpyDevice: public FairMQDevice
3737

3838
~SpyDevice() override;
3939

40-
static void CustomCleanup(void *data, void* hint);
41-
void stop();
40+
void stopSpy();
4241
void displayObject(std::string objectName);
4342

4443
void setFrame(SpyMainFrame *frame);

src/Checker.cxx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,16 @@
55

66
#include "QualityControl/Checker.h"
77

8-
// std
9-
#include <iostream>
10-
#include <chrono>
11-
#include <algorithm>
128
// ROOT
139
#include <TMessage.h>
1410
#include <TSystem.h>
1511
#include <TClass.h>
1612
// FairRoot
17-
#include <FairMQPoller.h>
18-
#include <Configuration/ConfigurationInterface.h>
1913
#include <Configuration/ConfigurationFactory.h>
2014
// O2
2115
#include "Common/Exceptions.h"
2216
// QC
23-
#include "QualityControl/CheckInterface.h"
2417
#include "QualityControl/DatabaseFactory.h"
25-
#include "QualityControl/CheckerConfig.h"
2618

2719
using namespace AliceO2::Common;
2820
using namespace AliceO2::Configuration;

src/SpyDevice.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ void SpyDevice::setFrame(SpyMainFrame *frame)
3434
mFrame = frame;
3535
}
3636

37-
void SpyDevice::stop()
37+
void SpyDevice::stopSpy()
3838
{
39-
// TODO if current state is running {
39+
// TODO if current state is running { CheckCurrentState(RUNNING)?
4040
ChangeState("STOP"); // synchronous
4141
ChangeState("RESET_TASK");
4242
WaitForEndOfState("RESET_TASK");

src/SpyMainFrame.cxx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void SpyMainFrame::constructWindow()
155155
void SpyMainFrame::closeWindow()
156156
{
157157
// Got close message for this MainFrame. Terminates the application.
158-
mController->stop();
158+
mController->stopSpy();
159159
gApplication->Terminate();
160160
}
161161

@@ -266,7 +266,7 @@ void SpyMainFrame::stop()
266266
mDbRunning = false;
267267
} else {
268268
// toggle buttons and remove list
269-
if(!mSourceFairmq->IsEnabled()) {
269+
if (!mSourceFairmq->IsEnabled()) {
270270
mSourceFairmq->SetEnabled(true);
271271
mSourceDb->SetEnabled(true);
272272
mSourceLabel->Disable(false);
@@ -300,9 +300,9 @@ void SpyMainFrame::dbRun()
300300
void SpyMainFrame::dbDisplayObject(string objectName)
301301
{
302302
string taskName = objectName.substr(0, objectName.find("/"));
303-
string objectNameOnly = objectName.substr(objectName.find("/")+1);
304-
AliceO2::QualityControl::Core::MonitorObject* mo = mDbInterface->retrieve(taskName, objectNameOnly);
305-
if(mo) {
303+
string objectNameOnly = objectName.substr(objectName.find("/") + 1);
304+
AliceO2::QualityControl::Core::MonitorObject *mo = mDbInterface->retrieve(taskName, objectNameOnly);
305+
if (mo) {
306306
displayObject(mo->getObject());
307307
delete mo;
308308
} else {

src/TaskDevice.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <QualityControl/QcInfoLogger.h>
1111
#include <QualityControl/TaskFactory.h>
1212
#include <TMessage.h>
13-
#include "Monitoring/Collector.h"
1413
#include <TClass.h>
1514
#include "DataSampling/SamplerFactory.h"
1615

0 commit comments

Comments
 (0)