Skip to content

Commit

Permalink
Change file names to remove need to have separate .ruff.toml file.
Browse files Browse the repository at this point in the history
Update script file name in docs.
  • Loading branch information
jbkalmbach committed Nov 14, 2023
1 parent 4fe4b8f commit e3d3c93
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 44 deletions.
8 changes: 0 additions & 8 deletions .ruff.toml

This file was deleted.

2 changes: 1 addition & 1 deletion bin.src/imgClosedLoop.py → bin.src/img_closed_loop.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import argparse
import logging

from lsst.ts.imsim.closedLoopTask import ClosedLoopTask
from lsst.ts.imsim.closed_loop_task import ClosedLoopTask

if __name__ == "__main__":
# Set the parser
Expand Down
6 changes: 3 additions & 3 deletions doc/user-guide/user-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
User Guide
#####################

The `ts_imsim` closed loop is designed to run as an executable through the command line as `imgClosedLoop.py`.
The `ts_imsim` closed loop is designed to run as an executable through the command line as `img_closed_loop.py`.

.. _Installing_ts_imsim:

Expand Down Expand Up @@ -46,13 +46,13 @@ Using `ts_imsim`
Running the AOS Closed Loop
---------------------------

The closed loop is available from the command line after running `scons` with the command `imgClosedLoop.py`.
The closed loop is available from the command line after running `scons` with the command `img_closed_loop.py`.

A sample command to run 5 iterations of the closed loop with the lsst wavefront sensors is:

.. code-block:: python
imgClosedLoop.py --output cwfs_imsim_output/ --iter_num 5 --config_pointer_file ts_imsim/policy/config/lsstCamNoPertPointer.yaml --turn_off_atmosphere --turn_off_sky_background
img_closed_loop.py --output cwfs_imsim_output/ --iter_num 5 --config_pointer_file ts_imsim/policy/config/lsstCamNoPertPointer.yaml --turn_off_atmosphere --turn_off_sky_background
where the following minimal set of command line options are used:

Expand Down
4 changes: 3 additions & 1 deletion doc/versionHistory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ Version History
##################

-------------
0.6.4
0.7.0
-------------

* Add T&S pre-commit settings to ts_imsim.
* Change file names to snake_case.
* Move imgClosedLoop to img_closed_loop.

-------------
0.6.3
Expand Down
10 changes: 5 additions & 5 deletions python/lsst/ts/imsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from .closedLoopTask import *
from .imsimCmpt import *
from .obsMetadata import *
from .opdMetrology import *
from .skySim import *
from .closed_loop_task import *
from .imsim_cmpt import *
from .obs_metadata import *
from .opd_metrology import *
from .sky_sim import *
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
import numpy as np
from lsst.afw.cameraGeom import FIELD_ANGLE, DetectorType
from lsst.daf import butler as dafButler
from lsst.ts.imsim.imsimCmpt import ImsimCmpt
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim.opdMetrology import OpdMetrology
from lsst.ts.imsim.skySim import SkySim
from lsst.ts.imsim.imsim_cmpt import ImsimCmpt
from lsst.ts.imsim.obs_metadata import ObsMetadata
from lsst.ts.imsim.opd_metrology import OpdMetrology
from lsst.ts.imsim.sky_sim import SkySim
from lsst.ts.imsim.utils import (
SensorWavefrontError,
get_camera,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import yaml
from astropy.io import fits
from lsst.afw import cameraGeom
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim.opdMetrology import OpdMetrology
from lsst.ts.imsim.skySim import SkySim
from lsst.ts.imsim.obs_metadata import ObsMetadata
from lsst.ts.imsim.opd_metrology import OpdMetrology
from lsst.ts.imsim.sky_sim import SkySim
from lsst.ts.imsim.utils import (
ModifiedEnvironment,
SensorWavefrontError,
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import astropy
import numpy as np
from astroplan import Observer
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim.obs_metadata import ObsMetadata
from lsst.ts.imsim.utils import get_camera


Expand Down
6 changes: 3 additions & 3 deletions python/lsst/ts/imsim/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from .metroTool import *
from .plotUtil import *
from .sensorWavefrontError import *
from .metro_tool import *
from .plot_util import *
from .sensor_wavefront_error import *
from .utility import *
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
import tempfile
import unittest

from lsst.ts.imsim.closedLoopTask import ClosedLoopTask
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim import ClosedLoopTask, ObsMetadata
from lsst.ts.imsim.utils.utility import get_module_path
from lsst.ts.wep.utils import CamType, FilterType

Expand Down
8 changes: 3 additions & 5 deletions tests/test_imsimCmpt.py → tests/test_imsim_cmpt.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
import galsim
import numpy as np
import yaml
from lsst.ts.imsim.imsimCmpt import ImsimCmpt
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim.skySim import SkySim
from lsst.ts.imsim.utils.sensorWavefrontError import SensorWavefrontError
from lsst.ts.imsim.utils.utility import (
from lsst.ts.imsim import ImsimCmpt, ObsMetadata, SkySim
from lsst.ts.imsim.utils import (
SensorWavefrontError,
get_camera,
get_config_dir,
get_module_path,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_obsMetadata.py → tests/test_obs_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import unittest

from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim import ObsMetadata


class TestObsMetadata(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_opdMetrology.py → tests/test_opd_metrology.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import numpy as np
from astropy.io import fits
from lsst.afw.cameraGeom import FIELD_ANGLE
from lsst.ts.imsim.opdMetrology import OpdMetrology
from lsst.ts.imsim import OpdMetrology
from lsst.ts.imsim.utils.utility import get_module_path, get_zk_from_file


Expand Down
3 changes: 1 addition & 2 deletions tests/test_skySim.py → tests/test_sky_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@

from astroplan import FixedTarget, Observer
from astropy.time import Time
from lsst.ts.imsim.obsMetadata import ObsMetadata
from lsst.ts.imsim.skySim import SkySim
from lsst.ts.imsim import ObsMetadata, SkySim
from lsst.ts.imsim.utils.utility import get_module_path


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
import os
import unittest

from lsst.ts.imsim.utils.plotUtil import plot_fwhm_of_iters
from lsst.ts.imsim.utils.utility import get_module_path
from lsst.ts.imsim.utils import get_module_path, plot_fwhm_of_iters


class TestPlotUtil(unittest.TestCase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import unittest

import numpy as np
from lsst.ts.imsim.utils.sensorWavefrontError import SensorWavefrontError
from lsst.ts.imsim.utils import SensorWavefrontError


class TestSensorWavefrontError(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from lsst.afw import cameraGeom
from lsst.obs.lsst import LsstCam
from lsst.ts.imsim.utils.utility import (
from lsst.ts.imsim.utils import (
ModifiedEnvironment,
get_camera,
get_config_dir,
Expand Down

0 comments on commit e3d3c93

Please sign in to comment.