diff --git a/csst_mci_sim/__pycache__/csst_mci_sim.cpython-311.pyc b/csst_mci_sim/__pycache__/csst_mci_sim.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..39d737004bc21b3e5afbb3ed32058a5859b9f083 Binary files /dev/null and b/csst_mci_sim/__pycache__/csst_mci_sim.cpython-311.pyc differ diff --git a/csst_mci_sim/csst_mci_sim.py b/csst_mci_sim/csst_mci_sim.py index 05403e2bf2618639b58e20c29f254fe16e8badf6..beb89e70905748dfae4b5e0e5870a0f99d0c78d5 100644 --- a/csst_mci_sim/csst_mci_sim.py +++ b/csst_mci_sim/csst_mci_sim.py @@ -70,22 +70,23 @@ import configparser as ConfigParser from scipy import ndimage ###################### -from support import logger as lg -from support import cosmicrays -from support import shao -from support import sed -from support import MCIinstrumentModel -from mci_so import cdm03bidir -# ======= -# from .support import logger as lg -# from .support import cosmicrays -# from .support import shao -# from .support import sed -# from .support import MCIinstrumentModel -# from .mci_so import cdm03bidir -# >>>>>>> d7cf2ff1c8720245c57f8bef8a0138aaf8a9475a - +try: + from support import logger as lg + from support import cosmicrays + from support import shao + from support import sed + from support import MCIinstrumentModel + from mci_so import cdm03bidir + +except: + from .support import logger as lg + from .support import cosmicrays + from .support import shao + from .support import sed + from .support import MCIinstrumentModel + from .mci_so import cdm03bidir +#################################################### from joblib import Parallel, delayed from astropy.coordinates import SkyCoord from scipy import interpolate diff --git a/csst_mci_sim/mci_so/__pycache__/__init__.cpython-311.pyc b/csst_mci_sim/mci_so/__pycache__/__init__.cpython-311.pyc index ee21e1d4e6a56d65b280e1a4797d2e030b258fd5..d0cfa51aed7d5e0c7e2f8fe2ac372f8698db5cfe 100644 Binary files a/csst_mci_sim/mci_so/__pycache__/__init__.cpython-311.pyc and b/csst_mci_sim/mci_so/__pycache__/__init__.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/MCIinstrumentModel.cpython-311.pyc b/csst_mci_sim/support/__pycache__/MCIinstrumentModel.cpython-311.pyc index d34909d1f594354d1de22bf15b997700ec0cfdc0..032f1df938acf5327069ccacacdeb3d0449a8d30 100644 Binary files a/csst_mci_sim/support/__pycache__/MCIinstrumentModel.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/MCIinstrumentModel.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/__init__.cpython-311.pyc b/csst_mci_sim/support/__pycache__/__init__.cpython-311.pyc index 71b21f61bdb1a1a9db5f769739a1c4615ec21e6b..15e38979bd24b4bb93b9ac94441d99eae69c11fb 100644 Binary files a/csst_mci_sim/support/__pycache__/__init__.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/__init__.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/cosmicrays.cpython-311.pyc b/csst_mci_sim/support/__pycache__/cosmicrays.cpython-311.pyc index f7de180a574374496317402a0311d36d2d4c1681..dc5c6fe77de6f9462dd81a29a6c07d7d8efd9e58 100644 Binary files a/csst_mci_sim/support/__pycache__/cosmicrays.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/cosmicrays.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/logger.cpython-311.pyc b/csst_mci_sim/support/__pycache__/logger.cpython-311.pyc index 36380654cf82d1ab0b8ad24e9810738b8d53be53..31911dd0b915a22738102d66e693c21821522f7e 100644 Binary files a/csst_mci_sim/support/__pycache__/logger.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/logger.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/sed.cpython-311.pyc b/csst_mci_sim/support/__pycache__/sed.cpython-311.pyc index 817b124eb28ff644f99b716f7c2244c0a40f2aa9..f42836dabbfb927b69acfbab3bf6a45621f4e378 100644 Binary files a/csst_mci_sim/support/__pycache__/sed.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/sed.cpython-311.pyc differ diff --git a/csst_mci_sim/support/__pycache__/shao.cpython-311.pyc b/csst_mci_sim/support/__pycache__/shao.cpython-311.pyc index 40873b02fb010fdbb9de69c408974963f8663252..a3b500d33910c6f8228b70d83b6488b93f54c6a2 100644 Binary files a/csst_mci_sim/support/__pycache__/shao.cpython-311.pyc and b/csst_mci_sim/support/__pycache__/shao.cpython-311.pyc differ diff --git a/requirements.txt b/requirements.txt index 8306c6887b31449bca149b01cd041c350c7771ae..67dd489b259c8035ee53d6735a45e205728a90df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ scipy==1.9.2 setuptools==65.6.3 pandas==1.5.3 julian==0.14 -astropy==5.1 +astropy==6.0.0 tqdm==4.64.1 galsim==2.4.9