|
1 | 1 | import pytest |
2 | | -from sorcha.utilities.sorchaArguments import sorchaArguments |
3 | | -from sorcha.utilities.dataUtilitiesForTests import get_demo_filepath |
4 | | -from sorcha.lightcurves.lightcurve_registration import LC_METHODS |
| 2 | + |
5 | 3 | from sorcha.activity.activity_registration import CA_METHODS |
6 | | -from sorcha.utilities.sorchaConfigs import ( |
7 | | - sorchaConfigs, |
8 | | - inputConfigs, |
9 | | - simulationConfigs, |
10 | | - filtersConfigs, |
11 | | - saturationConfigs, |
12 | | - phasecurvesConfigs, |
13 | | - fovConfigs, |
14 | | - fadingfunctionConfigs, |
15 | | - linkingfilterConfigs, |
16 | | - outputConfigs, |
17 | | - lightcurveConfigs, |
18 | | - activityConfigs, |
19 | | - expertConfigs, |
20 | | - auxiliaryConfigs, |
21 | | -) |
| 4 | +from sorcha.lightcurves.lightcurve_registration import LC_METHODS |
| 5 | +from sorcha.utilities.dataUtilitiesForTests import get_demo_filepath |
| 6 | +from sorcha.utilities.sorchaArguments import sorchaArguments |
| 7 | +from sorcha.utilities.sorchaConfigs import (activityConfigs, auxiliaryConfigs, |
| 8 | + expertConfigs, |
| 9 | + fadingfunctionConfigs, |
| 10 | + filtersConfigs, fovConfigs, |
| 11 | + inputConfigs, lightcurveConfigs, |
| 12 | + linkingfilterConfigs, |
| 13 | + outputConfigs, phasecurvesConfigs, |
| 14 | + saturationConfigs, |
| 15 | + simulationConfigs, sorchaConfigs) |
22 | 16 |
|
23 | 17 | # these are the results we expect from sorcha_config_demo.ini |
24 | 18 | correct_inputs = { |
|
105 | 99 | "randomization_on": True, |
106 | 100 | "vignetting_on": True, |
107 | 101 | "brute_force": True, |
| 102 | + "ar_use_integrate": False, |
108 | 103 | } |
109 | 104 |
|
110 | 105 | correct_auxciliary_URLs = { |
@@ -1072,11 +1067,12 @@ def test_auxiliary_config_making_url_none(file): |
1072 | 1067 |
|
1073 | 1068 |
|
1074 | 1069 | def test_PrintConfigsToLog(tmp_path): |
| 1070 | + import glob |
| 1071 | + import os |
| 1072 | + |
1075 | 1073 | from sorcha.modules.PPGetLogger import PPGetLogger |
1076 | | - from sorcha.utilities.sorchaConfigs import PrintConfigsToLog |
1077 | 1074 | from sorcha.utilities.dataUtilitiesForTests import get_test_filepath |
1078 | | - import os |
1079 | | - import glob |
| 1075 | + from sorcha.utilities.sorchaConfigs import PrintConfigsToLog |
1080 | 1076 |
|
1081 | 1077 | test_path = os.path.dirname(get_test_filepath("test_input_fullobs.csv")) |
1082 | 1078 | config_file_location = get_test_filepath("test_PPConfig.ini") |
|
0 commit comments