From 3e31e0293b728d10c40d843487118eedf3d376d8 Mon Sep 17 00:00:00 2001
From: Zhang Xin <zhangx@bao.ac.cn>
Date: Fri, 19 Dec 2025 10:46:54 +0800
Subject: [PATCH] modify aquireMultiTargeObsTimePoint output formate

---
 survey_sim/surveyTools/aquireTargetObsTime.py | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/survey_sim/surveyTools/aquireTargetObsTime.py b/survey_sim/surveyTools/aquireTargetObsTime.py
index 7e06e56..744fe62 100644
--- a/survey_sim/surveyTools/aquireTargetObsTime.py
+++ b/survey_sim/surveyTools/aquireTargetObsTime.py
@@ -280,7 +280,7 @@ def aquireMultiTargeObsTimePoint(
     stTime=2459766.0, endTime=2459767.1, pointting=np.array([40, -60]), searchInterval=60, orbitDat=None, constraint=None
 ):
 
-    all_Obstime_tar = {}
+    # all_Obstime_tar = {}
 
     pi_180 = math.pi / 180.0
     sCons = constraint
@@ -306,6 +306,9 @@ def aquireMultiTargeObsTimePoint(
     if pointting.ndim == 1:
         pointting = np.array([pointting])
 
+    arrayResult = np.zeros([len(searchTimes), len(pointting)+1])
+    arrayResult[:, 0] = searchTimes
+
     for i, p in enumerate(pointting):
 
         ra = p[0]
@@ -316,42 +319,51 @@ def aquireMultiTargeObsTimePoint(
             math.sin(dec * pi_180),
         ]
 
-        obsTimeList = []
-        unObsTimeList = []
-
-        for t, sunPos, mPos, satPos, sat_subPoint in zip(searchTimes, all_sunPos, all_moonPos, all_satPos, all_Subpoint):
+        # obsTimeList = []
+        # unObsTimeList = []
+        for j, val in enumerate(zip(searchTimes, all_sunPos, all_moonPos, all_satPos, all_Subpoint)):
+            t = val[0]
+            sunPos = val[1]
+            mPos = val[2]
+            satPos = val[3]
+            sat_subPoint = val[4]
             rdTime = t
-
             saaCons = saa_constraint.IsInSAA(uderStarPoint=sat_subPoint)
             if saaCons == 1:
-                unObsTimeList.append([rdTime, 0, 1, 0, 0, 0])
+                # unObsTimeList.append([rdTime, 0, 1, 0, 0, 0])
+                arrayResult[j, i + 1] = -1
+                continue
 
             sunCons = obscure_constraint.isObscureBySun(
                 sun=sunPos, p=pointing_car, constr=sCons
             )
             if sunCons > 1:
-                unObsTimeList.append([rdTime, 0, 0, 1, 0, 0])
+                # unObsTimeList.append([rdTime, 0, 0, 1, 0, 0])
+                arrayResult[j, i + 1] = -2
                 continue
             moonCons = obscure_constraint.IsObscureByMoon(
                 moon=mPos, p=pointing_car, constr=sCons
             )
             if moonCons > 1:
-                unObsTimeList.append([rdTime, 0, 0, 0, 1, 0])
+                # unObsTimeList.append([rdTime, 0, 0, 0, 1, 0])
+                arrayResult[j, i + 1] = -3
                 continue
             earthCons = obscure_constraint.IsObscureByEarth(
                 sat=satPos, sun=sunPos, p=pointing_car, constr=sCons
             )
             if earthCons[0] == 1:
-                unObsTimeList.append([rdTime, 0, 0, 0, 0, 1])
+                # unObsTimeList.append([rdTime, 0, 0, 0, 0, 1])
+                arrayResult[j, i + 1] = -4
                 continue
 
-            obsTimeList.append(rdTime)
+            # obsTimeList.append(rdTime)
+            arrayResult[j, i + 1] = 1
         # all_Obstime_tar[i] = np.array(
         #     obsTimeList), deltTime, np.array(unObsTimeList)
-        all_Obstime_tar[i] = np.array(
-            obsTimeList)
+        # all_Obstime_tar[i] = np.array(
+        #     obsTimeList)
 
-    return all_Obstime_tar
+    return arrayResult
 
 
 def aquireMultiTargetsObsTime_useTLE(
-- 
GitLab