Commit 017cc3a4 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

debug

parent 4edebcbd

csst_mci_sim/csst_mci_sim.py

+9 −9
Original line number Diff line number Diff line
@@ -69,21 +69,21 @@ import configparser as ConfigParser 
#from matplotlib import pyplot as plt 



from scipy import ndimage

<<<<<<< HEAD

######################

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

# =======

# 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





from joblib import Parallel, delayed