Skip to content

Commit 7d0dc4f

Browse files
authored
QC-1163 Update QC flag type list to be in sync with BKP (#13092)
One exception is NotBadFlagExample, which I will remove later, once QC can use Good.
1 parent 1448ff6 commit 7d0dc4f

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"id","method","name","bad","obsolete"
2-
1,"Unknown","Unknown",1,0
3-
2,"UnknownQuality","Unknown Quality",1,0
4-
3,"CertifiedByExpert","Certified by Expert",0,0
5-
10,"NoDetectorData","No Detector Data",1,0
6-
11,"LimitedAcceptance","Limited acceptance",1,0
7-
12,"BadPID","Bad PID",1,0
8-
13,"BadTracking","Bad Tracking",1,0
9-
14,"BadHadronPID","Bad Hadron PID",1,0
10-
15,"BadElectronPID","Bad Electron PID",1,0
11-
16,"BadEMCalorimetry","Bad EM Calorimetry",1,0
12-
17,"BadPhotonCalorimetry","Bad Photon Calorimetry",1,0
13-
65500,"ObsoleteFlagExample","Obsolete flag example",1,1
14-
65501,"NotBadFlagExample","Not bad flag example",0,0
15-
65535,"Invalid","Invalid",1,0
2+
1,"UnknownQuality","Unknown Quality",1,0
3+
3,"NoDetectorData","No Detector Data",1,0
4+
4,"LimitedAcceptanceMCNotReproducible","Limited Acceptance MC Not Reproducible",1,0
5+
5,"LimitedAcceptanceMCReproducible","Limited Acceptance MC Reproducible",1,0
6+
6,"BadPID","Bad PID",1,0
7+
7,"BadTracking","Bad Tracking",1,0
8+
8,"BadHadronPID","Bad Hadron PID",1,0
9+
9,"Good","Good",0,0
10+
10,"Invalid","Invalid",1,0
11+
11,"BadElectronPID","Bad Electron PID",1,0
12+
12,"BadEMCalorimetry","Bad EM Calorimetry",1,0
13+
13,"BadPhotonCalorimetry","Bad Photon Calorimetry",1,0
14+
14,"Unknown","Unknown",1,0
15+
65501,"NotBadFlagExample","Not bad flag example",0,0

DataFormats/QualityControl/test/testFlagTypes.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ BOOST_AUTO_TEST_CASE(FlagTypes)
3333
BOOST_CHECK_EQUAL(fDefault, FlagTypeFactory::Invalid());
3434

3535
auto f1 = FlagTypeFactory::Unknown();
36-
BOOST_CHECK_EQUAL(f1.getID(), 1);
36+
BOOST_CHECK_EQUAL(f1.getID(), 14);
3737
BOOST_CHECK_EQUAL(f1.getName(), "Unknown");
3838
BOOST_CHECK_EQUAL(f1.getBad(), true);
3939

40-
std::cout << f1 << std::endl;
40+
BOOST_CHECK_NO_THROW(std::cout << f1 << std::endl);
4141

4242
auto f2 = f1;
43-
BOOST_CHECK_EQUAL(f2.getID(), 1);
43+
BOOST_CHECK_EQUAL(f2.getID(), 14);
4444
BOOST_CHECK_EQUAL(f1.getName(), f2.getName());
4545
BOOST_CHECK_EQUAL(f2.getName(), "Unknown");
4646
BOOST_CHECK_EQUAL(f2.getBad(), true);
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(FlagTypes)
5050
BOOST_CHECK(!(f1 < f2));
5151
BOOST_CHECK(!(f1 > f2));
5252

53-
auto f3 = FlagTypeFactory::LimitedAcceptance();
54-
BOOST_CHECK(f3 > f1);
55-
BOOST_CHECK(!(f3 < f1));
53+
auto f3 = FlagTypeFactory::LimitedAcceptanceMCNotReproducible();
54+
BOOST_CHECK(f3 < f1);
55+
BOOST_CHECK(!(f3 > f1));
5656
}

DataFormats/QualityControl/test/testQualityControlFlagCollection.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ BOOST_AUTO_TEST_CASE(test_QualityControlFlagCollection_Methods)
4646
QualityControlFlagCollection qcfc2{"Reco checks", "TOF"};
4747
qcfc2.insert({50, 77, FlagTypeFactory::Invalid()}); // this is a duplicate to an entry in qcfc1
4848
qcfc2.insert({51, 77, FlagTypeFactory::Invalid()});
49-
qcfc2.insert({1234, 3434, FlagTypeFactory::LimitedAcceptance()});
50-
qcfc2.insert({50, 77, FlagTypeFactory::LimitedAcceptance()});
49+
qcfc2.insert({1234, 3434, FlagTypeFactory::LimitedAcceptanceMCNotReproducible()});
50+
qcfc2.insert({50, 77, FlagTypeFactory::LimitedAcceptanceMCNotReproducible()});
5151
BOOST_CHECK_EQUAL(qcfc2.size(), 4);
5252

5353
// Try merging. Duplicate entries should be left in the 'other' objects.
@@ -97,8 +97,8 @@ BOOST_AUTO_TEST_CASE(test_QualityControlFlagCollection_IO)
9797
QualityControlFlagCollection qcfc1{"xyz", "TST"};
9898
qcfc1.insert({50, 77, FlagTypeFactory::Invalid(), "a comment", "a source"});
9999
qcfc1.insert({51, 77, FlagTypeFactory::Invalid()});
100-
qcfc1.insert({1234, 3434, FlagTypeFactory::LimitedAcceptance()});
101-
qcfc1.insert({50, 77, FlagTypeFactory::LimitedAcceptance()});
100+
qcfc1.insert({1234, 3434, FlagTypeFactory::LimitedAcceptanceMCNotReproducible()});
101+
qcfc1.insert({50, 77, FlagTypeFactory::LimitedAcceptanceMCNotReproducible()});
102102
qcfc1.insert({43434, 63421, FlagTypeFactory::NotBadFlagExample()});
103103

104104
std::stringstream store;

0 commit comments

Comments
 (0)