Updating troublesome path behaviour in old make data helpers.

Author: Cameron-Van-Eck

RMtools_1D/mk_test_ascii_data.py

@@ -50,6 +50,7 @@
 import os
 import shutil
 import sys
+from pathlib import Path
 
 import numpy as np
 
@@ -306,20 +307,24 @@ def create_IQU_ascii_data(
     # Create the output directory path
     dataPath = dataPath.rstrip("/")
     print("Creating test dataset in '%s/'" % dataPath)
-    dirs = dataPath.split("/")
-    for i in range(1, len(dirs)):
-        dirStr = "/".join(dirs[:i])
-        if not os.path.exists(dirStr):
-            os.mkdir(dirStr)
-    if os.path.exists(dataPath):
-        print("\n ", end=" ")
-        print("*** WARNING ***" * 5)
-        print("  About to delete existing data directory!", end=" ")
-        print("Previous results will be deleted.\n")
-        print("Press <RETURN> to continue ...", end=" ")
-        input()
-        shutil.rmtree(dataPath, True)
-    os.mkdir(dataPath)
+    if not Path(dataPath).exists():
+        Path(dataPath).mkdir(parents=True)
+
+    # dirs = dataPath.split("/")
+    # print(dirs)
+    # for i in range(1, len(dirs)):
+    #     dirStr = "/".join(dirs[:i])
+    #     if not os.path.exists(dirStr):
+    #         os.mkdir(dirStr)
+    # if os.path.exists(dataPath):
+    #     print("\n ", end=" ")
+    #     print("*** WARNING ***" * 5)
+    #     print("  About to delete existing data directory!", end=" ")
+    #     print("Previous results will be deleted.\n")
+    #     print("Press <RETURN> to continue ...", end=" ")
+    #     input()
+    #     shutil.rmtree(dataPath, True)
+    # os.mkdir(dataPath)
 
     # Loop through the sources, calculate the spectra and save to disk
     successCount = 0

RMtools_3D/mk_test_cube_data.py

@@ -79,6 +79,7 @@
 import os
 import shutil
 import sys
+from pathlib import Path
 
 import astropy.wcs.wcs as pw
 import numpy as np
@@ -312,22 +313,24 @@ def create_IQU_cube_data(
         sys.exit()
     catInLst = csv_read_to_list(inCatFile, doFloat=True)
     print("Found %d entries in the catalogue." % len(catInLst))
-
-    # Create the output directory path
-    dirs = dataPath.rstrip("/").split("/")
-    for i in range(1, len(dirs)):
-        dirStr = "/".join(dirs[:i])
-        if not os.path.exists(dirStr):
-            os.mkdir(dirStr)
-    if os.path.exists(dataPath):
-        print("\n ", end=" ")
-        print("*** WARNING ***" * 5)
-        print("  About to delete existing data directory!", end=" ")
-        print("Previous results will be deleted.\n")
-        print("Press <RETURN> to continue ...", end=" ")
-        input()
-        shutil.rmtree(dataPath, True)
-    os.mkdir(dataPath)
+    if not Path(dataPath).exists():
+        Path(dataPath).mkdir(parents=True)
+
+    # # Create the output directory path
+    # dirs = dataPath.rstrip("/").split("/")
+    # for i in range(1, len(dirs)):
+    #     dirStr = "/".join(dirs[:i])
+    #     if not os.path.exists(dirStr):
+    #         os.mkdir(dirStr)
+    # if os.path.exists(dataPath):
+    #     print("\n ", end=" ")
+    #     print("*** WARNING ***" * 5)
+    #     print("  About to delete existing data directory!", end=" ")
+    #     print("Previous results will be deleted.\n")
+    #     print("Press <RETURN> to continue ...", end=" ")
+    #     input()
+    #     shutil.rmtree(dataPath, True)
+    # os.mkdir(dataPath)
 
     # Create simple HDUs in memmory
     print("Creating test data in memory.")

tests/helper_test.py

@@ -112,11 +112,12 @@ def setUp(self):
 
     def test_testdata3D(self):
         """Test that rmtools_testdata3D runs and outputs."""
+
         res = subprocess.run(
             [
                 "rmtools_testdata3D",
                 f"{TEST_PATH}/../RMtools_3D/catalogue.csv",
-                "./simdata/3D",
+                f"{THREED_PATH}",
             ]
         )
         self.assertEqual(res.returncode, 0, "testdata3D fails to run to completion.")
@@ -128,24 +129,31 @@ def test_testdata3D(self):
 
     def test_testdata1D(self):
         """Test that rmtools_testdata1D runs and outputs."""
+
         res = subprocess.run(
             [
                 "rmtools_testdata1D",
                 f"{TEST_PATH}/../RMtools_3D/catalogue.csv",
-                "./simdata/1D",
+                f"{ONED_PATH}",
             ]
         )
         self.assertEqual(res.returncode, 0, "testdata1D fails to run to completion.")
 
         self.assertTrue(
-            (TEST_PATH / "simdata/1D/Source8.dat").exists(),
+            (ONED_PATH / "Source8.dat").exists(),
             "testdata1D not outputting files as expected.",
         )
 
     def test_calcRMSF(self):
         """Test that rmtools_calcRMSF runs as expected."""
+
+        if not ONED_PATH.exists():
+            ONED_PATH.mkdir(parents=True)
+
         res = subprocess.run(
-            shlex.split("rmtools_calcRMSF -f 800e6 1088e6 1e6 -s ./simdata/rmsf.png"),
+            shlex.split(
+                f"rmtools_calcRMSF -f 800e6 1088e6 1e6 -s {TEST_PATH}/rmsf.png"
+            ),
             capture_output=True,
             text=True,
         )