Fix.

cubids/tests/test_bond.py

@@ -538,14 +538,8 @@ def test_tsv_merge_changes(tmp_path):
 
         res = row["RenameEntitySet"]
         if isinstance(res, str) and (res != "nan") and (res not in new_keys):
-            print("HI")
-            print(res)
-            print("DONE")
             renamed = False
 
-        print("\n".join(new_keys))
-        print("DONE2")
-
     assert renamed, orig["RenameEntitySet"].tolist()
 
     # will no longer be equal because of auto rename!
@@ -555,16 +549,16 @@ def test_tsv_merge_changes(tmp_path):
     summary_df = pd.read_table(original_summary_tsv)
     (fa_nan_dwi_row,) = np.flatnonzero(
         np.isnan(summary_df.FlipAngle)
-        & summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        & summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
     )
     # Find the dwi with and EchoTime ==
     (complete_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime > 0.05)
     )
     (cant_merge_echotime_dwi_row,) = np.flatnonzero(
-        summary_df.EntitySet.str.fullmatch("acquisition-HASC55AP_datatype-dwi_suffix-dwi")
+        summary_df.EntitySet.str.fullmatch("datatype-dwi_suffix-dwi_acquisition-HASC55AP")
         & (summary_df.FlipAngle == 90.0)
         & (summary_df.EchoTime < 0.05)
     )

cubids/tests/test_variants.py

@@ -49,8 +49,8 @@ def test_assign_variants_with_cluster_values(base_df):
     result = assign_variants(base_df, ["EchoTime"])
 
     # Check that variant names include cluster values
-    assert "acquisition-VARIANTEchoTimeC2_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTEchoTimeC3_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC2")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC3")
 
 
 def test_assign_variants_mixed_parameters(base_df):
@@ -64,8 +64,8 @@ def test_assign_variants_mixed_parameters(base_df):
     result = assign_variants(base_df, ["EchoTime", "FlipAngle"])
 
     # Check variant names include both cluster values and actual values
-    assert "acquisition-VARIANTEchoTimeC2FlipAngle75_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTEchoTimeC3FlipAngle60_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC2FlipAngle75")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTEchoTimeC3FlipAngle60")
 
 
 def test_assign_variants_special_parameters(base_df):
@@ -78,6 +78,6 @@ def test_assign_variants_special_parameters(base_df):
     result = assign_variants(base_df, ["HasFieldmap", "UsedAsFieldmap"])
 
     # Check special parameter handling
-    assert "acquisition-VARIANTOther_" in result.loc[0, "RenameEntitySet"]
-    assert "acquisition-VARIANTNoFmapIsUsed_" in result.loc[1, "RenameEntitySet"]
-    assert "acquisition-VARIANTNoFmap_" in result.loc[2, "RenameEntitySet"]
+    assert result.loc[0, "RenameEntitySet"].endswith("acquisition-VARIANTOther")
+    assert result.loc[1, "RenameEntitySet"].endswith("acquisition-VARIANTNoFmapIsUsed")
+    assert result.loc[2, "RenameEntitySet"].endswith("acquisition-VARIANTNoFmap")

cubids/utils.py

@@ -1011,7 +1011,7 @@ def assign_variants(summary, rename_cols):
                 )
             else:
                 acq = f"acquisition-{acq_str}"
-                new_name = acq + "_" + summary.loc[row, "EntitySet"]
+                new_name = summary.loc[row, "EntitySet"] + "_" + acq
 
             summary.at[row, "RenameEntitySet"] = new_name