diff --git a/bin/fink_fat_cli.py b/bin/fink_fat_cli.py index 4c2fde19..5ad83ed5 100755 --- a/bin/fink_fat_cli.py +++ b/bin/fink_fat_cli.py @@ -280,11 +280,16 @@ def fink_fat_main(arguments): # solve orbit in local mode if arguments["local"]: t_before = t.time() + prop_epoch = config["SOLVE_ORBIT_PARAMS"]["prop_epoch"] # return orbit results from local mode orbit_results = compute_df_orbit_param( traj_to_orbital, int(config["SOLVE_ORBIT_PARAMS"]["cpu_count"]), config["SOLVE_ORBIT_PARAMS"]["ram_dir"], + int(config["SOLVE_ORBIT_PARAMS"]["n_triplets"]), + int(config["SOLVE_ORBIT_PARAMS"]["noise_ntrials"]), + prop_epoch=float(prop_epoch) if prop_epoch != "None" else None, + verbose=int(config["SOLVE_ORBIT_PARAMS"]["orbfit_verbose"]) ).drop("provisional designation", axis=1) orbfit_time = t.time() - t_before @@ -1154,11 +1159,16 @@ def fink_fat_main(arguments): if arguments["local"]: t_before = t.time() + prop_epoch = config["SOLVE_ORBIT_PARAMS"]["prop_epoch"] # return orbit results from local mode orbit_results = compute_df_orbit_param( traj_to_orbital, int(config["SOLVE_ORBIT_PARAMS"]["cpu_count"]), config["SOLVE_ORBIT_PARAMS"]["ram_dir"], + int(config["SOLVE_ORBIT_PARAMS"]["n_triplets"]), + int(config["SOLVE_ORBIT_PARAMS"]["noise_ntrials"]), + prop_epoch=float(prop_epoch) if prop_epoch != "None" else None, + verbose=int(config["SOLVE_ORBIT_PARAMS"]["orbfit_verbose"]) ).drop("provisional designation", axis=1) orbfit_time = t.time() - t_before diff --git a/fink_fat/__init__.py b/fink_fat/__init__.py index a7358ab4..d871f88d 100644 --- a/fink_fat/__init__.py +++ b/fink_fat/__init__.py @@ -12,4 +12,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.15.4" +__version__ = "0.15.5" diff --git a/fink_fat/test/cli_test/fink_fat_out_test/mpc/old_obs.parquet b/fink_fat/test/cli_test/fink_fat_out_test/mpc/old_obs.parquet index 20fbf8ea..90feb372 100644 Binary files a/fink_fat/test/cli_test/fink_fat_out_test/mpc/old_obs.parquet and b/fink_fat/test/cli_test/fink_fat_out_test/mpc/old_obs.parquet differ diff --git a/fink_fat/test/cli_test/fink_fat_out_test/mpc/orbital.parquet b/fink_fat/test/cli_test/fink_fat_out_test/mpc/orbital.parquet index 96c6a221..0084e3ba 100644 Binary files a/fink_fat/test/cli_test/fink_fat_out_test/mpc/orbital.parquet and b/fink_fat/test/cli_test/fink_fat_out_test/mpc/orbital.parquet differ diff --git a/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_df.parquet b/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_df.parquet index 32162db8..84d588ab 100644 Binary files a/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_df.parquet and b/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_df.parquet differ diff --git a/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_orb.parquet b/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_orb.parquet index 77984da2..c8e1ef36 100644 Binary files a/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_orb.parquet and b/fink_fat/test/cli_test/fink_fat_out_test/mpc/trajectory_orb.parquet differ diff --git a/fink_fat/test/cli_test/test.conf b/fink_fat/test/cli_test/test.conf index 16734eb5..e4c923b5 100644 --- a/fink_fat/test/cli_test/test.conf +++ b/fink_fat/test/cli_test/test.conf @@ -19,9 +19,9 @@ use_dbscan=False store_kd_tree=false [SOLVE_ORBIT_PARAMS] -n_triplets=15 +n_triplets=10 noise_ntrials=10 -prop_epoch=2459769.02144 +prop_epoch=None orbfit_verbose=3 orbfit_limit=6 diff --git a/fink_fat/test/cli_test/test_cli.py b/fink_fat/test/cli_test/test_cli.py index 7e5189c8..c2cdbdea 100644 --- a/fink_fat/test/cli_test/test_cli.py +++ b/fink_fat/test/cli_test/test_cli.py @@ -119,27 +119,31 @@ try: assert_frame_equal( - old_obs.sort_values("candid").round(decimals=5), - old_obs_test.sort_values("candid").round(decimals=5), + old_obs.sort_values("candid").round(decimals=5).reset_index(drop=True), + old_obs_test.sort_values("candid").round(decimals=5).reset_index(drop=True), + check_like=True ) assert_frame_equal( - trajectory_df.sort_values("trajectory_id").round(decimals=5), - trajectory_df_test.sort_values("trajectory_id").round(decimals=5), + trajectory_df.sort_values("trajectory_id").round(decimals=5).reset_index(drop=True), + trajectory_df_test.sort_values("trajectory_id").round(decimals=5).reset_index(drop=True), + check_like=True ) assert_frame_equal( - obs_orb_test.sort_values("ssoCandId").round(decimals=5), - obs_orb.sort_values("ssoCandId").round(decimals=5), + obs_orb_test.sort_values("ssoCandId").round(decimals=5).reset_index(drop=True), + obs_orb.sort_values("ssoCandId").round(decimals=5).reset_index(drop=True), + check_like=True ) assert_frame_equal( orb_test[["ssoCandId", "ref_epoch", "a", "e", "i"]] .sort_values("ssoCandId") - .round(decimals=5), + .round(decimals=5).reset_index(drop=True), orb[["ssoCandId", "ref_epoch", "a", "e", "i"]] .sort_values("ssoCandId") - .round(decimals=5), + .round(decimals=5).reset_index(drop=True), + check_like=True ) shutil.rmtree("fink_fat/test/cli_test/fink_fat_out")