Skip to content

Commit

Permalink
Remove empty data directory
Browse files Browse the repository at this point in the history 
Remove empty data directory
  • Loading branch information
@mschwamb
mschwamb committed Dec 15, 2023
1 parent 2acacb7 commit 88f802a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions demo/bench_LCA.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"oifoutput": f"./{args.object_type}_sample_1000_eph.csv",
"configfile": "./OIFconfig_benchmark.ini",
"pointing_database": "./baseline_v2.0_1yr.db",
"outpath": "../data/out",
"outpath": "../tests/out",
"makeTemporaryEphemerisDatabase": False,
"readTemporaryEphemerisDatabase": False,
"deleteTemporaryEphemerisDatabase": False,
Expand All @@ -31,7 +31,7 @@

configs = PPConfigFileParser("./OIFconfig_benchmark.ini", "LSST")

cProfile.run("runLSSTSimulation(cmd_args_dict, configs)", "../data/out/restats")
cProfile.run("runLSSTSimulation(cmd_args_dict, configs)", "../tests/out/restats")

p = pstats.Stats("../data/out/restats")
p = pstats.Stats("../tests/out/restats")
p.strip_dirs().sort_stats(SortKey.CUMULATIVE).print_stats()
6 changes: 3 additions & 3 deletions demo/test_bench.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"output_ephemeris_file": "ephemeris_output.csv",
"configfile": "./demo/test_bench_config.ini",
"pointing_database": "./demo/baseline_v2.0_1yr.db",
"outpath": "./data/out",
"outpath": "./tests/out",
"makeTemporaryEphemerisDatabase": False,
"readTemporaryEphemerisDatabase": False,
"deleteTemporaryEphemerisDatabase": False,
Expand All @@ -36,7 +36,7 @@
if debug:
runLSSTSimulation(cmd_args_dict, configs)
else: # benchmark
cProfile.run("runLSSTSimulation(cmd_args_dict, configs)", "./data/out/restats")
cProfile.run("runLSSTSimulation(cmd_args_dict, configs)", "./tests/out/restats")

p = pstats.Stats("./data/out/restats")
p = pstats.Stats("./tests/out/restats")
p.strip_dirs().sort_stats(SortKey.CUMULATIVE).print_stats(100)
2 changes: 1 addition & 1 deletion docs/configfiles.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ They are described as follows:
+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --brightlimit BRIGHTLIMIT, -brtlim BRIGHTLIMIT | Limit of brightness: detections brighter than this are omitted assuming saturation. Expects a float. Default is 16.0. |
+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --outpath OUTPATH, -out OUTPATH | Path to output. Default is "./data/out". |
| --outpath OUTPATH, -out OUTPATH | Path to output. Default is "./". |
+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| --outfilestem OUTFILESTEM, -outstem OUTFILESTEM | Output file name stem. Default is "hundredcomets" |
+------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
Expand Down
4 changes: 2 additions & 2 deletions src/sorcha/utilities/dataUtilitiesForTests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def get_demo_filepath(filename):


def get_data_out_filepath(filename):
"""Return the full path to a test file in the ``.../data/out`` directory.
"""Return the full path to a test file in the ``.../tests/out`` directory.
Parameters
----------
Expand All @@ -76,4 +76,4 @@ def get_data_out_filepath(filename):
THIS_DIR = Path(__file__).parent.parent.parent.parent

# Returned path: `<base_directory>/tests/data/filename`
return os.path.join(THIS_DIR, "data/out", filename)
return os.path.join(THIS_DIR, "tests/out", filename)
0 data/out/.gitkeep → tests/out/.gitkeep
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/sorcha/test_sorchaArguments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"orbinfile": get_demo_filepath("sspp_testset_orbits.des"),
"oifoutput": get_demo_filepath("example_oif_output.txt"),
"configfile": get_demo_filepath("PPConfig_test.ini"),
"outpath": "./data/out",
"outpath": "./tests/out",
"surveyname": "LSST",
"outfilestem": f"out_end2end",
"verbose": False,
Expand Down

0 comments on commit 88f802a

Please sign in to comment.