v1.0.0-rc.36
This commit is contained in:
@@ -10,7 +10,7 @@ TEST_CASE("JFJochStateMachine_States") {
|
||||
Logger logger("JFJochStateMachine_States");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
state_machine.AddDetectorSetup(DetectorGeometry(4));
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
|
||||
@@ -31,7 +31,7 @@ TEST_CASE("JFJochStateMachine_State_Pedestal") {
|
||||
Logger logger("JFJochStateMachine_State_Pedestal");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
state_machine.AddDetectorSetup(DetectorGeometry(4));
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
|
||||
@@ -49,7 +49,7 @@ TEST_CASE("JFJochStateMachine_State_Measure") {
|
||||
Logger logger("JFJochStateMachine_State_Measure");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
state_machine.AddDetectorSetup(DetectorGeometry(4));
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
|
||||
@@ -70,7 +70,7 @@ TEST_CASE("JFJochStateMachine_State_Error") {
|
||||
Logger logger("JFJochStateMachine_State_Error");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
state_machine.AddDetectorSetup(DetectorGeometry(4));
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
|
||||
@@ -118,7 +118,7 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup") {
|
||||
Logger logger("JFJochStateMachine_AddDetectorSetup");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DetectorSetup setup = DetectorGeometry(4);
|
||||
DetectorSetup setup = DetJF4M();
|
||||
state_machine.AddDetectorSetup(setup);
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
REQUIRE_NOTHROW(state_machine.WaitTillMeasurementDone());
|
||||
@@ -128,7 +128,7 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Gain") {
|
||||
Logger logger("JFJochStateMachine_AddDetectorSetup_Gain");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DetectorSetup setup = DetectorGeometry(4);
|
||||
DetectorSetup setup = DetJF(4);
|
||||
setup.LoadGain({"../../tests/test_data/gainMaps_M049.bin",
|
||||
"../../tests/test_data/gainMaps_M049.bin",
|
||||
"../../tests/test_data/gainMaps_M049.bin",
|
||||
@@ -142,21 +142,22 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
|
||||
Logger logger("JFJochBrokerService_StorageCells");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetectorSetup(DetectorGeometry(4), DetectorType::JUNGFRAU, "Det1",
|
||||
{"mx1", "mx2", "mx3", "mx4"})));
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetectorSetup(DetectorGeometry(2), DetectorType::JUNGFRAU, "Det2",
|
||||
{"mx1", "mx2"})));
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetectorSetup(DetectorGeometry(1), DetectorType::JUNGFRAU, "Det3",
|
||||
{"mx1"})));
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetJF(4, 1, 0,0,false,"Det1", {"mx1", "mx2", "mx3", "mx4"})));
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetEIGER(2, 1, 0, 0, false, "Det2", {"mx1", "mx2", "mx3", "mx4"})));
|
||||
REQUIRE_NOTHROW(state_machine.AddDetectorSetup(DetDECTRIS(23,45, "Det3", {"mx5"})));
|
||||
|
||||
|
||||
auto dl = state_machine.GetDetectorsList();
|
||||
REQUIRE(dl.detector.size() == 3);
|
||||
REQUIRE(dl.detector[0].description == "Det1");
|
||||
REQUIRE(dl.detector[0].nmodules == 4);
|
||||
REQUIRE(dl.detector[0].detector_type == DetectorType::JUNGFRAU);
|
||||
REQUIRE(dl.detector[1].description == "Det2");
|
||||
REQUIRE(dl.detector[1].nmodules == 2);
|
||||
REQUIRE(dl.detector[1].detector_type == DetectorType::EIGER);
|
||||
REQUIRE(dl.detector[2].description == "Det3");
|
||||
REQUIRE(dl.detector[2].nmodules == 1);
|
||||
REQUIRE(dl.detector[2].detector_type == DetectorType::DECTRIS);
|
||||
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
REQUIRE_NOTHROW(state_machine.WaitTillMeasurementDone());
|
||||
|
||||
Reference in New Issue
Block a user