Fix trait definitions

talmolab · Sep 13, 2023 · 0feee0b · 0feee0b
1 parent 8a14f61
commit 0feee0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sleap_roots/trait_pipelines.py b/sleap_roots/trait_pipelines.py
@@ -1182,7 +1182,7 @@ def define_traits(self) -> List[TraitDef]:
                 name="main_base_tip_dists",
                 fn=get_base_tip_dist,
                 input_traits=["main_base_pts", "main_tip_pts"],
-                scalar=True,
+                scalar=False,
                 include_in_csv=True,
                 kwargs={},
                 description="Straight-line distance(s) from the base(s) to the"
@@ -1192,7 +1192,7 @@ def define_traits(self) -> List[TraitDef]:
                 name="main_grav_indices",
                 fn=get_base_tip_dist,
                 input_traits=["main_base_pts", "main_tip_pts"],
-                scalar=True,
+                scalar=False,
                 include_in_csv=True,
                 kwargs={},
                 description="Straight-line distance(s) from the base(s) to the"

diff --git a/tests/test_trait_pipelines.py b/tests/test_trait_pipelines.py
@@ -36,5 +36,5 @@ def test_younger_monocot_pipeline(rice_h5, rice_folder):
     rice_traits = pipeline.compute_plant_traits(rice)
     all_traits = pipeline.compute_batch_traits(series_all)
 
-    assert rice_traits.shape == (72, 117)
-    assert all_traits.shape == (2, 1036)
+    assert rice_traits.shape == (72, 104)
+    assert all_traits.shape == (2, 919)