Skip to content
GitLab
Commit 017cc3a4 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

debug

parent 4edebcbd
Pipeline #6429 failed with stage
in 0 seconds
Show whitespace changes
Inline Side-by-side
csst_mci_sim/csst_mci_sim.py
View file @ 017cc3a4
...@@ -69,21 +69,21 @@ import configparser as ConfigParser ...@@ -69,21 +69,21 @@ import configparser as ConfigParser
#from matplotlib import pyplot as plt #from matplotlib import pyplot as plt
from scipy import ndimage from scipy import ndimage
<<<<<<< HEAD ######################
from support import logger as lg from support import logger as lg
from support import cosmicrays from support import cosmicrays
from support import shao from support import shao
from support import sed from support import sed
from support import MCIinstrumentModel from support import MCIinstrumentModel
from mci_so import cdm03bidir from mci_so import cdm03bidir
======= # =======
from .support import logger as lg # from .support import logger as lg
from .support import cosmicrays # from .support import cosmicrays
from .support import shao # from .support import shao
from .support import sed # from .support import sed
from .support import MCIinstrumentModel # from .support import MCIinstrumentModel
from .mci_so import cdm03bidir # from .mci_so import cdm03bidir
>>>>>>> d7cf2ff1c8720245c57f8bef8a0138aaf8a9475a # >>>>>>> d7cf2ff1c8720245c57f8bef8a0138aaf8a9475a
from joblib import Parallel, delayed from joblib import Parallel, delayed
......
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