Merge pull request #236 from jhlegarreta/FixFloatingPointFormatting2

STYLE: Fix registration process id string floating point formatting
SlicerDMRI · Jul 6, 2024 · 8064245 · 8064245
2 parents 364c501 + fb680ec
commit 8064245
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,6 +4,7 @@ nibabel>=3.0.0
 numpy>=1.20.0,<1.21.0;python_version=="3.8"
 numpy>=1.21.0;python_version>="3.9"
 pandas<2.1.0
+pillow<10.4.0
 scipy>=1.4.0,<1.11.0;python_version=="3.8"
 scipy>=1.5.0;python_version=="3.9"
 scipy>=1.9.0;python_version>="3.10"

diff --git a/whitematteranalysis/congeal_multisubject.py b/whitematteranalysis/congeal_multisubject.py
@@ -476,7 +476,7 @@ def congeal_multisubject_inner_loop(mean, subject, initial_transform, mode, sigm
     # Set up registration objects and parameters that are specific to affine vs nonrigid
     if mode == "Affine" or mode == "Rigid":
         register = wma.register_two_subjects.RegisterTractography()
-        register.process_id_string = f"_subject_{subject_idx:05d}_iteration_{iteration_count:05d}_sigma_{sigma:03d}"
+        register.process_id_string = f"_subject_{subject_idx:05d}_iteration_{iteration_count:05d}_sigma_{int(sigma):03d}"
         if mode == "Rigid":
             register.mode = [1, 1, 0, 0] 
         # Make sure the initial iterations are performed with Cobyla.
@@ -488,7 +488,7 @@ def congeal_multisubject_inner_loop(mean, subject, initial_transform, mode, sigm
         register = wma.register_two_subjects_nonrigid_bsplines.RegisterTractographyNonrigid()
         register.nonrigid_grid_resolution = grid_resolution
         register.initialize_nonrigid_grid()
-        register.process_id_string = f"_subject_{subject_idx:05d}_iteration_{iteration_count:05d}_sigma_{sigma:03d}_grid_{grid_resolution:03d}"
+        register.process_id_string = f"_subject_{subject_idx:05d}_iteration_{iteration_count:05d}_sigma_{int(sigma):03d}_grid_{int(grid_resolution):03d}"
 
     else:
         print("ERROR: Unknown registration mode")