tests made to pass ctb

This commit is contained in:
2019-10-24 11:32:58 +02:00
parent fa84d17a19
commit f73a15e786
7 changed files with 145 additions and 81 deletions

View File

@ -51,7 +51,7 @@ inline std::string ToString(const defs::detectorType s){
case defs::JUNGFRAU:
return std::string("Jungfrau");
case defs::CHIPTESTBOARD:
return std::string("JungfrauCTB");
return std::string("ChipTestBoard");
case defs::MOENCH:
return std::string("Moench");
case defs::MYTHEN3:
@ -367,7 +367,7 @@ inline defs::detectorType StringTo(const std::string& s){
return defs::GOTTHARD;
if (s == "Jungfrau")
return defs::JUNGFRAU;
if (s == "JungfrauCTB")
if (s == "ChipTestBoard")
return defs::CHIPTESTBOARD;
if (s == "Moench")
return defs::MOENCH;

View File

@ -4,9 +4,9 @@
#define APIRECEIVER 0x190722
#define APIGUI 0x190723
#define APIMOENCH 0x190820
#define APICTB 0x191011
#define APIMYTHEN3 0x191011
#define APIGOTTHARD2 0x191017
#define APIEIGER 0x191021
#define APIJUNGFRAU 0x191022
#define APIGOTTHARD 0x191021
#define APICTB 0x191021

View File

@ -129,7 +129,7 @@ TEST_CASE("string to detectorType"){
REQUIRE(StringTo<dt>("Eiger") == dt::EIGER);
REQUIRE(StringTo<dt>("Gotthard") == dt::GOTTHARD);
REQUIRE(StringTo<dt>("Jungfrau") == dt::JUNGFRAU);
REQUIRE(StringTo<dt>("JungfrauCTB") == dt::CHIPTESTBOARD);
REQUIRE(StringTo<dt>("ChipTestBoard") == dt::CHIPTESTBOARD);
REQUIRE(StringTo<dt>("Moench") == dt::MOENCH);
REQUIRE(StringTo<dt>("Mythen3") == dt::MYTHEN3);
REQUIRE(StringTo<dt>("Gotthard2") == dt::GOTTHARD2);