diff --git a/params/operator_params.json b/params/operator_params.json index 6c63394..62ea6a7 100644 --- a/params/operator_params.json +++ b/params/operator_params.json @@ -80,20 +80,20 @@ 0.01 ], "distance_l_2": [ - 0.0325, - 0.0325, - 0.0325, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02, - 0.02 + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045, + 0.045 ], "distance_h_end1": [ 0.003, diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 0635f26..48bcbe3 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -76,15 +76,15 @@ class PassportFormer(BasePointPassportFormer): next_i = i + 1 + P1 = operator_settings["object_position"] + 0.5 * operator_settings["object_thickness"] + P2 = operator_settings["object_position"] - 0.5 * operator_settings["object_thickness"] + if next_i < point_quantity: next_operator_settings = { key: (value[next_i] if i < len(value) else value[0]) for key, value in self._params[0].items() } - P1 = operator_settings["object_position"] + 0.5*operator_settings["object_thickness"] - P2 = operator_settings["object_position"] - 0.5*operator_settings["object_thickness"] - next_P1 = next_operator_settings["object_position"] + 0.5*next_operator_settings["object_thickness"] next_P2 = next_operator_settings["object_position"] - 0.5*next_operator_settings["object_thickness"] @@ -94,6 +94,12 @@ class PassportFormer(BasePointPassportFormer): operator_settings["distance_h_end1"] -= displacement_fe operator_settings["distance_h_end2"] += displacement_me + LFEAbs = operator_settings["distance_l_1"] + LMEAbs = operator_settings["distance_l_2"] + + operator_settings["distance_l_1"] = P2 - LFEAbs + operator_settings["distance_l_2"] = LMEAbs - P1 + params_list = [operator_settings, system_settings] cache_key = self._generate_cache_key(params_list) if cache_key in self._ideal_data_cashe and False: