autogaita 0.2.0__tar.gz → 0.2.1__tar.gz

{autogaita-0.2.0 → autogaita-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autogaita
-Version: 0.2.0
+Version: 0.2.1
 Summary: Automatic Gait Analysis in Python
 Home-page: https://github.com/mahan-hosseini/AutoGaitA/
 Author: Mahan Hosseini

{autogaita-0.2.0 → autogaita-0.2.1}/autogaita/autogaita_dlc.py

@@ -333,20 +333,40 @@ def some_prep(info, folderinfo, cfg):
 
 def move_data_to_folders(info, folderinfo):
     """Find files, copy data, video, beamdata & beamvideo to new results_dir"""
+    # unpack
+    results_dir = info["results_dir"]
+    postmouse_string = folderinfo["postmouse_string"]
+    postrun_string = folderinfo["postrun_string"]
+    os.makedirs(results_dir)  # important to do this outside of loop!
+    # check if user inputted "_" & "-" for postmouse & postrun strings - if not do it
+    # for them
+    for candidate_postmouse_string in [postmouse_string, "_" + postmouse_string]:
+        for candidate_postrun_string in [postrun_string, "-" + postrun_string]:
+            found_it = check_this_filename_configuration(
+                info,
+                folderinfo,
+                candidate_postmouse_string,
+                candidate_postrun_string,
+                results_dir,
+            )
+            if found_it:  # if our search was successful, stop searching and continue
+                break
+
+
+def check_this_filename_configuration(
+    info, folderinfo, postmouse_string, postrun_string, results_dir
+):
     # unpack
     name = info["name"]
     mouse_num = info["mouse_num"]
     run_num = info["run_num"]
-    results_dir = info["results_dir"]
     root_dir = folderinfo["root_dir"]
     data_string = folderinfo["data_string"]
     beam_string = folderinfo["beam_string"]
     premouse_string = folderinfo["premouse_string"]
-    postmouse_string = folderinfo["postmouse_string"]
     prerun_string = folderinfo["prerun_string"]
-    postrun_string = folderinfo["postrun_string"]
-    os.makedirs(results_dir)  # important to do this outside of loop!
     whichvideo = ""  # initialise
+    found_it = False
     for filename in os.listdir(root_dir):
         # the following condition is True for data & beam csv
         if (
@@ -354,6 +374,7 @@ def move_data_to_folders(info, folderinfo):
             and (prerun_string + str(run_num) + postrun_string in filename)
             and (filename.endswith(".csv"))
         ):
+            found_it = True
             # Copy the Excel file to the new subfolder
             shutil.copy2(
                 os.path.join(root_dir, filename), os.path.join(results_dir, filename)
@@ -378,6 +399,7 @@ def move_data_to_folders(info, folderinfo):
                 )
                 print(this_message)
                 write_issues_to_textfile(this_message, info)
+    return found_it
 
 
 def check_and_expand_cfg(data, cfg, info):

{autogaita-0.2.0 → autogaita-0.2.1}/autogaita/batchrun_scripts/autogaita_dlc_multirun.py

@@ -18,9 +18,9 @@ def dlc_multirun():
     folderinfo["data_string"] = "SIMINewOct"
     folderinfo["beam_string"] = "BeamTraining"
     folderinfo["premouse_string"] = "Mouse"
-    folderinfo["postmouse_string"] = "_25mm"
+    folderinfo["postmouse_string"] = "25mm"
     folderinfo["prerun_string"] = "run"
-    folderinfo["postrun_string"] = "-6DLC"
+    folderinfo["postrun_string"] = "6DLC"
     # cfg
     cfg = {}
     cfg["sampling_rate"] = 100  # base cfg

{autogaita-0.2.0 → autogaita-0.2.1}/autogaita/batchrun_scripts/autogaita_dlc_singlerun.py

@@ -16,9 +16,9 @@ def dlc_singlerun():
     folderinfo["data_string"] = "SIMINewOct"
     folderinfo["beam_string"] = "BeamTraining"
     folderinfo["premouse_string"] = "Mouse"
-    folderinfo["postmouse_string"] = "_25mm"
+    folderinfo["postmouse_string"] = "25mm"
     folderinfo["prerun_string"] = "run"
-    folderinfo["postrun_string"] = "-6DLC"
+    folderinfo["postrun_string"] = "6DLC"
     # cfg
     cfg = {}
     cfg["sampling_rate"] = 100  # base cfg

{autogaita-0.2.0 → autogaita-0.2.1}/autogaita.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autogaita
-Version: 0.2.0
+Version: 0.2.1
 Summary: Automatic Gait Analysis in Python
 Home-page: https://github.com/mahan-hosseini/AutoGaitA/
 Author: Mahan Hosseini

{autogaita-0.2.0 → autogaita-0.2.1}/setup.py

@@ -25,7 +25,7 @@ if platform.system() == "Darwin":
 setup(
     name="autogaita",
     python_requires=">=3.10",
-    version="0.2.0",  # rc == release candidate (before release is finished)
+    version="0.2.1",  # rc == release candidate (before release is finished)
     author="Mahan Hosseini",
     description="Automatic Gait Analysis in Python",
     packages=["autogaita", "autogaita.batchrun_scripts"],