Change traits included in csv

talmolab · Aug 31, 2023 · 9c5b5e0 · 9c5b5e0
1 parent 709c0d9
commit 9c5b5e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sleap_roots/trait_pipelines.py b/sleap_roots/trait_pipelines.py
@@ -456,7 +456,7 @@ def define_traits(self) -> List[TraitDef]:
                 fn=get_root_widths_left_bases,
                 input_traits=["root_widths_package"],
                 scalar=False,
-                include_in_csv=True,
+                include_in_csv=False,
                 kwargs={},
                 description="Returns the left bases of matched roots used to calculate"
                 "the root widths.",
@@ -466,7 +466,7 @@ def define_traits(self) -> List[TraitDef]:
                 fn=get_root_widths_right_bases,
                 input_traits=["root_widths_package"],
                 scalar=False,
-                include_in_csv=True,
+                include_in_csv=False,
                 kwargs={},
                 description="Returns the right bases of matched roots used to calculate"
                 "the root widths.",
@@ -737,7 +737,7 @@ def define_traits(self) -> List[TraitDef]:
                 fn=get_network_length,
                 input_traits=["primary_length", "lateral_lengths"],
                 scalar=True,
-                include_in_csv=False,
+                include_in_csv=True,
                 kwargs={"monocots": False},
                 description="Scalar of all roots network length.",
             ),
@@ -755,7 +755,7 @@ def define_traits(self) -> List[TraitDef]:
                 fn=get_tip_ys,
                 input_traits=["primary_tip_pt"],
                 scalar=True,
-                include_in_csv=False,
+                include_in_csv=True,
                 kwargs={},
                 description="Y-coordinate of the primary root tip node.",
             ),

diff --git a/tests/test_trait_pipelines.py b/tests/test_trait_pipelines.py
@@ -15,6 +15,6 @@ def test_dicot_pipeline(canola_h5, soy_h5):
     soy_traits = pipeline.compute_plant_traits(soy)
     all_traits = pipeline.compute_batch_traits([canola, soy])
 
-    assert canola_traits.shape == (72, 133)
-    assert soy_traits.shape == (72, 133)
-    assert all_traits.shape == (2, 1180)
+    assert canola_traits.shape == (72, 117)
+    assert soy_traits.shape == (72, 117)
+    assert all_traits.shape == (2, 1036)