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

fix some bug find by Nielaoshi

parent 66d65488
run: python genSurveyDFSByPointing.py pointinglistFileName outputDFSPointingFile data_set_name run: python genSurveyDFSByPointing.py pointinglistFileName outputDFSPointingFile data_set_name {obs_group submode}
obs_group 和 submod 是两个可选的参数,如果不输入就是默认值
example: python genSurveyDFSByPointing.py pointing_50_5_n.dat pointing_50_5_.json csst-msc-c9-25sqdeg-v4 example: python genSurveyDFSByPointing.py pointing_50_5_n.dat pointing_50_5_.json csst-msc-c9-25sqdeg-v4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Author: Zhang Xin zhangx@bao.ac.cn Author: Zhang Xin zhangx@bao.ac.cn
Date: 2025-04-21 09:53:28 Date: 2025-04-21 09:53:28
LastEditors: Zhang Xin zhangx@bao.ac.cn LastEditors: Zhang Xin zhangx@bao.ac.cn
LastEditTime: 2025-05-27 15:55:30 LastEditTime: 2025-09-03 16:56:04
FilePath: /CSST_Survey/Users/zhangxin/Work/SurveyPlan/point/pointing_c9/genSurveyDFSByPointing.py FilePath: /CSST_Survey/Users/zhangxin/Work/SurveyPlan/point/pointing_c9/genSurveyDFSByPointing.py
Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
''' '''
...@@ -79,7 +79,7 @@ def dataInit(): ...@@ -79,7 +79,7 @@ def dataInit():
"cover": 0, "cover": 0,
"gainlvl": "", "gainlvl": "",
"shutter": "F", "shutter": "F",
"submode": "", "submode": "OM1-1",
"ledflag": "", "ledflag": "",
"ledstat": "", "ledstat": "",
"ledt01": 0.0, "ledt01": 0.0,
...@@ -101,7 +101,7 @@ def dataInit(): ...@@ -101,7 +101,7 @@ def dataInit():
"pa_obj": 25.0, "pa_obj": 25.0,
"guide_window": 1, "guide_window": 1,
"guide_duration": 10, "guide_duration": 10,
"guide_pos": [1.0,2.0], "guide_pos": [1.0, 2.0],
}, },
"simresult": { "simresult": {
...@@ -128,7 +128,7 @@ def dataInit(): ...@@ -128,7 +128,7 @@ def dataInit():
"charge": 97200.0, "charge": 97200.0,
"between_angle": 16.2831689171475, "between_angle": 16.2831689171475,
"saa_sec": 0.0, "saa_sec": 0.0,
"skyid": 309072.0, "skyid": 309072,
"board_angle": 25.0, "board_angle": 25.0,
"quad_0": 0.999859206659046, "quad_0": 0.999859206659046,
"quad_i": 0.00671061788580071, "quad_i": 0.00671061788580071,
...@@ -136,7 +136,7 @@ def dataInit(): ...@@ -136,7 +136,7 @@ def dataInit():
"quad_k": -0.0133193208638005, "quad_k": -0.0133193208638005,
"sky_type": 1.0, "sky_type": 1.0,
"id": 0, "id": 0,
"sat_vx": -7.104108, "sat_vx": -7.104108,
"sat_vy": 2.912855, "sat_vy": 2.912855,
"sat_vz": 0.332436, "sat_vz": 0.332436,
"fov_lt_dec": 20.4566929133858, "fov_lt_dec": 20.4566929133858,
...@@ -155,7 +155,13 @@ def dataInit(): ...@@ -155,7 +155,13 @@ def dataInit():
if __name__ == "__main__": if __name__ == "__main__":
if len(sys.argv) < 4: if len(sys.argv) < 4:
print('input_file_name output_file_name datasec') print('input_file_name output_file_name datasec')
obs_group = "None"
if len(sys.argv) == 5:
obs_group = sys.argv[4]
subMod = "OM1-1"
if len(sys.argv) == 6:
obs_group = sys.argv[4]
subMod = sys.argv[5]
fn1 = 'E17.5_b17.5_beta_11.6_opt_transtime_1_CMG_1_dp_2_0.25_da_10_Texp_1.5_DEC60_500_0.1_800_1000_+5deg.obsid.csv' fn1 = 'E17.5_b17.5_beta_11.6_opt_transtime_1_CMG_1_dp_2_0.25_da_10_Texp_1.5_DEC60_500_0.1_800_1000_+5deg.obsid.csv'
# fn2 = 'pointing_50_5_n.dat' # fn2 = 'pointing_50_5_n.dat'
fn2 = sys.argv[1] fn2 = sys.argv[1]
...@@ -178,11 +184,12 @@ if __name__ == "__main__": ...@@ -178,11 +184,12 @@ if __name__ == "__main__":
data['obs_id'] = d1['obs_id'] data['obs_id'] = d1['obs_id']
data['opid'] = (str(d1['obs_id'])[0:3]+'0'+str(d1['obs_id'])[3:]) data['opid'] = (str(d1['obs_id'])[0:3]+'0'+str(d1['obs_id'])[3:])
data['instrument'] = 'MSC' data['instrument'] = 'MSC'
data['obs_group'] = obs_group
# data['file_type'] = 'SCI' # data['file_type'] = 'SCI'
if d1['sky_type'] == 1: if d1['sky_type'] == 2:
data['obs_type'] = 'WIDE'
else:
data['obs_type'] = 'DEEP' data['obs_type'] = 'DEEP'
else:
data['obs_type'] = 'WIDE'
data['object'] = d1['skyid'] data['object'] = d1['skyid']
data['dataset'] = sys.argv[3] data['dataset'] = sys.argv[3]
data['starttime'] = JDTimeToBeijingTime( data['starttime'] = JDTimeToBeijingTime(
...@@ -201,7 +208,7 @@ if __name__ == "__main__": ...@@ -201,7 +208,7 @@ if __name__ == "__main__":
data['params']['expstart'] = data['params']['t0'] data['params']['expstart'] = data['params']['t0']
data['params']['cover'] = 1 data['params']['cover'] = 1
data['params']['shutter'] = "T" data['params']['shutter'] = "T"
data['params']['submode'] = subMod
# simresult # simresult
data['simresult']['jd'] = d1['jd'] data['simresult']['jd'] = d1['jd']
...@@ -218,21 +225,21 @@ if __name__ == "__main__": ...@@ -218,21 +225,21 @@ if __name__ == "__main__":
data['simresult']['moon_z'] = d1['moon_z_1'] data['simresult']['moon_z'] = d1['moon_z_1']
data['simresult']['deep_area'] = d1['deepArea'] data['simresult']['deep_area'] = d1['deepArea']
data['simresult']['very_deep_area'] = d1['veryDeepArea'] data['simresult']['very_deep_area'] = d1['veryDeepArea']
data['simresult']['ca'] = d1['ca'] data['simresult']['ca'] = float(d1['ca'])
data['simresult']['cb'] = d1['cb'] data['simresult']['cb'] = float(d1['cb'])
data['simresult']['exptime'] = d1['exposure'] data['simresult']['exptime'] = d1['exposure']
data['simresult']['turn_angle'] = d1['turnAngle'] data['simresult']['turn_angle'] = d1['turnAngle']
data['simresult']['is_in_sun'] = d1['isInSun'] data['simresult']['is_in_sun'] = d1['isInSun']
data['simresult']['cmg'] = d1['cmg'] data['simresult']['cmg'] = d1['cmg']
data['simresult']['charge'] = d1['charge'] data['simresult']['charge'] = d1['charge']
data['simresult']['skyid'] = d1['skyid'] data['simresult']['skyid'] = int(d1['skyid'])
data['simresult']['board_angle'] = d1['boardAngle'] data['simresult']['board_angle'] = d1['boardAngle']
data['simresult']['quad_0'] = d1['quad_0'] data['simresult']['quad_0'] = d1['quad_0']
data['simresult']['quad_i'] = d1['quad_i'] data['simresult']['quad_i'] = d1['quad_i']
data['simresult']['quad_j'] = d1['quad_j'] data['simresult']['quad_j'] = d1['quad_j']
data['simresult']['quad_k'] = d1['quad_k'] data['simresult']['quad_k'] = d1['quad_k']
data['simresult']['sky_type'] = d1['sky_type'] data['simresult']['sky_type'] = float(d1['sky_type'])
data['simresult']['id'] = d1['id'] data['simresult']['id'] = int(d1['id'])
data['simresult']['sat_vx'] = d1['sat_vx'] data['simresult']['sat_vx'] = d1['sat_vx']
data['simresult']['sat_vy'] = d1['sat_vy'] data['simresult']['sat_vy'] = d1['sat_vy']
data['simresult']['sat_vz'] = d1['sat_vz'] data['simresult']['sat_vz'] = d1['sat_vz']
......
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