Commit e1825085 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update

parent 017cc3a4
Pipeline #6974 failed with stage
in 0 seconds
...@@ -70,22 +70,23 @@ import configparser as ConfigParser ...@@ -70,22 +70,23 @@ import configparser as ConfigParser
from scipy import ndimage from scipy import ndimage
###################### ######################
from support import logger as lg try:
from support import cosmicrays from support import logger as lg
from support import shao from support import cosmicrays
from support import sed from support import shao
from support import MCIinstrumentModel from support import sed
from mci_so import cdm03bidir from support import MCIinstrumentModel
# ======= from mci_so import cdm03bidir
# from .support import logger as lg
# from .support import cosmicrays except:
# from .support import shao from .support import logger as lg
# from .support import sed from .support import cosmicrays
# from .support import MCIinstrumentModel from .support import shao
# from .mci_so import cdm03bidir from .support import sed
# >>>>>>> d7cf2ff1c8720245c57f8bef8a0138aaf8a9475a from .support import MCIinstrumentModel
from .mci_so import cdm03bidir
####################################################
from joblib import Parallel, delayed from joblib import Parallel, delayed
from astropy.coordinates import SkyCoord from astropy.coordinates import SkyCoord
from scipy import interpolate from scipy import interpolate
......
...@@ -3,6 +3,6 @@ scipy==1.9.2 ...@@ -3,6 +3,6 @@ scipy==1.9.2
setuptools==65.6.3 setuptools==65.6.3
pandas==1.5.3 pandas==1.5.3
julian==0.14 julian==0.14
astropy==5.1 astropy==6.0.0
tqdm==4.64.1 tqdm==4.64.1
galsim==2.4.9 galsim==2.4.9
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment