v1.0.0-rc.57
This commit is contained in:
@@ -9,7 +9,8 @@ using namespace std::literals::chrono_literals;
|
||||
TEST_CASE("JFJochStateMachine_States") {
|
||||
Logger logger("JFJochStateMachine_States");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
@@ -30,7 +31,8 @@ TEST_CASE("JFJochStateMachine_States") {
|
||||
TEST_CASE("JFJochStateMachine_State_Pedestal") {
|
||||
Logger logger("JFJochStateMachine_State_Pedestal");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
@@ -48,7 +50,8 @@ TEST_CASE("JFJochStateMachine_State_Pedestal") {
|
||||
TEST_CASE("JFJochStateMachine_State_Measure") {
|
||||
Logger logger("JFJochStateMachine_State_Measure");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
@@ -69,7 +72,8 @@ TEST_CASE("JFJochStateMachine_State_Measure") {
|
||||
TEST_CASE("JFJochStateMachine_State_Error") {
|
||||
Logger logger("JFJochStateMachine_State_Error");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
state_machine.AddDetectorSetup(DetJF4M());
|
||||
|
||||
DatasetSettings setup;
|
||||
@@ -109,7 +113,8 @@ TEST_CASE("JFJochStateMachine_State_Error") {
|
||||
TEST_CASE("JFJochStateMachine_NoDetectorSetup") {
|
||||
Logger logger("JFJochStateMachine_NoDetectorSetup");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
REQUIRE_THROWS(state_machine.Initialize());
|
||||
REQUIRE_NOTHROW(state_machine.WaitTillMeasurementDone());
|
||||
}
|
||||
@@ -117,7 +122,8 @@ TEST_CASE("JFJochStateMachine_NoDetectorSetup") {
|
||||
TEST_CASE("JFJochStateMachine_AddDetectorSetup") {
|
||||
Logger logger("JFJochStateMachine_AddDetectorSetup");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
DetectorSetup setup = DetJF4M();
|
||||
state_machine.AddDetectorSetup(setup);
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
@@ -127,7 +133,8 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup") {
|
||||
TEST_CASE("JFJochStateMachine_AddDetectorSetup_Gain") {
|
||||
Logger logger("JFJochStateMachine_AddDetectorSetup_Gain");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
DetectorSetup setup = DetJF(4);
|
||||
setup.LoadGain({"../../tests/test_data/gainMaps_M049.bin",
|
||||
"../../tests/test_data/gainMaps_M049.bin",
|
||||
@@ -141,7 +148,9 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Gain") {
|
||||
TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
|
||||
Logger logger("JFJochBrokerService_StorageCells");
|
||||
JFJochServices services(logger);
|
||||
JFJochStateMachine state_machine(services, logger);
|
||||
DiffractionExperiment experiment;
|
||||
|
||||
JFJochStateMachine state_machine(experiment, services, logger);
|
||||
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"})));
|
||||
@@ -161,14 +170,14 @@ TEST_CASE("JFJochStateMachine_AddDetectorSetup_Multiple") {
|
||||
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
REQUIRE_NOTHROW(state_machine.WaitTillMeasurementDone());
|
||||
REQUIRE(state_machine.NotThreadSafe_Experiment().GetModulesNum() == 4);
|
||||
REQUIRE(state_machine.Experiment().GetModulesNum() == 4);
|
||||
REQUIRE(state_machine.GetStatus().state == JFJochState::Idle);
|
||||
|
||||
REQUIRE_THROWS(state_machine.SelectDetector(7));
|
||||
REQUIRE(state_machine.GetStatus().state == JFJochState::Idle);
|
||||
|
||||
REQUIRE_NOTHROW(state_machine.SelectDetector(2));
|
||||
REQUIRE(state_machine.NotThreadSafe_Experiment().GetModulesNum() == 1);
|
||||
REQUIRE(state_machine.NotThreadSafe_Experiment().GetDetectorDescription() == "Det3");
|
||||
REQUIRE(state_machine.Experiment().GetModulesNum() == 1);
|
||||
REQUIRE(state_machine.Experiment().GetDetectorDescription() == "Det3");
|
||||
REQUIRE(state_machine.GetStatus().state == JFJochState::Inactive);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user