merge from main

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.2"
+__version__ = "0.15.3"

fink_fat/command_line/utils_cli.py

@@ -456,11 +456,11 @@ def assig_tags(
     ... })
     >>> new_orb, new_traj = assig_tags(orb, traj, 0)
 
-    >>> orb_test = pd.read_parquet("fink_fat/test/utils_cli_test_orb.parquet")
-    >>> traj_test = pd.read_parquet("fink_fat/test/utils_cli_test_traj.parquet")
+    >>> orb_test = pd.read_parquet("fink_fat/test/utils_cli_test_orb.parquet").reset_index(drop=True)
+    >>> traj_test = pd.read_parquet("fink_fat/test/utils_cli_test_traj.parquet").reset_index(drop=True)
 
-    >>> assert_frame_equal(orb_test, new_orb)
-    >>> assert_frame_equal(traj_test, new_traj)
+    >>> assert_frame_equal(orb_test, new_orb.reset_index(drop=True))
+    >>> assert_frame_equal(traj_test, new_traj.reset_index(drop=True))
     """
     orb_df = orb_df.sort_values("ref_epoch")
 

fink_fat/others/id_tags.py

@@ -28,11 +28,11 @@ def int_to_tags(traj_id, jd):
     Examples
     --------
     >>> int_to_tags(15, 2460135.98)
-    'FF10072023aaaaaap'
+    'FF20230710aaaaaap'
     >>> int_to_tags(27, 2460135.98)
-    'FF10072023aaaaabb'
+    'FF20230710aaaaabb'
     >>> int_to_tags(652, 2460135.98)
-    'FF10072023aaaaazc'
+    'FF20230710aaaaazc'
     """
     res_tag = ""
     for _ in range(7):
@@ -43,8 +43,8 @@ def int_to_tags(traj_id, jd):
         traj_id = q
 
     discovery = Time(jd, format="jd").datetime
-    return "FF{:02d}{:02d}{}{}".format(
-        discovery.day, discovery.month, discovery.year, res_tag[::-1]
+    return "FF{:04d}{:02d}{:02d}{}".format(
+        discovery.year, discovery.month, discovery.day, res_tag[::-1]
     )
 
 
@@ -70,7 +70,7 @@ def generate_tags(begin, end, jd):
     Examples
     --------
     >>> generate_tags(3, 6, [2460135.42, 2460137.57, 2460148.72])
-    ['FF09072023aaaaaad', 'FF12072023aaaaaae', 'FF23072023aaaaaaf']
+    ['FF20230709aaaaaad', 'FF20230712aaaaaae', 'FF20230723aaaaaaf']
     """
     return [int_to_tags(i, date) for date, i in zip(jd, np.arange(begin, end))]
 

fink_fat_notebook/fink_fat_experiments/kbo_neo_issue.conf

@@ -0,0 +1,49 @@
+[TW_PARAMS]
+trajectory_keep_limit=15
+old_observation_keep_limit=2
+trajectory_2_points_keep_limit=8
+
+
+[ASSOC_PARAMS]
+intra_night_separation=145
+intra_night_magdiff_limit_same_fid=0.2
+intra_night_magdiff_limit_diff_fid=0.8
+inter_night_separation=0.3
+inter_night_magdiff_limit_same_fid=0.1
+inter_night_magdiff_limit_diff_fid=0.5
+maximum_angle=1
+use_dbscan=false
+
+
+[ASSOC_PERF]
+store_kd_tree=false
+
+[SOLVE_ORBIT_PARAMS]
+n_triplets=30
+noise_ntrials=20
+prop_epoch=None
+orbfit_verbose=3
+
+orbfit_limit=6
+cpu_count=8
+ram_dir=/media/virtuelram
+manager=
+principal=
+secret=
+role=
+exec_env='/home/roman.le-montagner'
+driver_memory=6
+executor_memory=8
+max_core=100
+executor_core=4
+orbfit_path=/opt/OrbitFit
+
+
+[ASSOC_SYSTEM]
+tracklets_with_trajectories=true
+trajectories_with_new_observations=true
+tracklets_with_old_observations=true
+new_observations_with_old_observations=true
+
+[OUTPUT]
+association_output_file=kbo_neo_issue_ff_output