Commit e9d615bc authored by Zhang Xin's avatar Zhang Xin
Browse files

add sky unit bug

parent 627689db

survey_sim/skyField/skyMap.py

+5 −5
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class SkyMap(object): 
                coor.down_neighbour = -1

        gc.collect()



    def addSkyUnit(self, lonList=None, latList=None, idBase=100000000, obsTyp=0, targetCoverNum=2, maxCoverNum=2):

    def addSkyUnit(self, lonList=None, latList=None, idBase=100000000, obsType=0, targetCoverNum=2, maxCoverNum=2):

        if lonList is None or latList is None:

            print("Add sky unit failed!!!!!!")

            return
@@ -244,11 +244,11 @@ class SkyMap(object): 
            id = idBase+i

            coor = SkyPatchUnit(

                ecl_lat=lonlat[1], ecl_lon=lonlat[0], id=idBase+i)

            coor.obsType = obsTyp

            coor.obsType = obsType

            coor.isObserve = 1  # 0表示不可观测； 1表示可观测

            coor.targetCoverNum = targetCoverNum  # 该天区需要观测次数

            coor.maxCoverNum = maxCoverNum

            self.skymap[id] = coor

            self.isObserve = 1  # 0表示不可观测； 1表示可观测

            self.targetCoverNum = targetCoverNum  # 该天区需要观测次数

            self.maxCoverNum = maxCoverNum





# figure()

survey_sim/strategies/SurveySim_MSC_mpi.py

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
Author: Zhang Xin zhangx@bao.ac.cn

Date: 2024-09-19 15:53:27

LastEditors: Zhang Xin zhangx@bao.ac.cn

LastEditTime: 2025-07-22 15:45:23

LastEditTime: 2025-07-22 16:56:29

FilePath: /CSST_Survey/survey_sim/strategies/SurveySim_MSC.py

Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE

'''
@@ -946,7 +946,7 @@ if __name__ == '__main__': 
                   bettery_level=97200., cmgCons=None, dir=sys.argv[3], logName=sys.argv[4], outFn=sys.argv[5])



    ss.skymap.addSkyUnit(lonList=ecl_lons, latList=ecl_lats,

                         idBase=100000000, obsTyp=9, targetCoverNum=2, maxCoverNum=2)

                         idBase=100000000, obsType=9, targetCoverNum=2, maxCoverNum=2)



    t1 = time.time()

    tt = ss.do_observe_plan(jump_time_unObs=150)