Skip to content

S
solvers-acuk-m
Commit b3f51337 authored by Takhir Fakhrutdinov's avatar Takhir Fakhrutdinov
Browse files
Options

Косяк в frames.json

parent 800154ce
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
fte/lib/libpy/fileFactory.py
View file @ b3f51337
...@@ -384,9 +384,7 @@ frame = { ...@@ -384,9 +384,7 @@ frame = {
"type": "object", "type": "object",
"required": [ "required": [
"siteid","nightid","filename","exp_num","obstime","crops", "siteid","nightid","filename","exp_num","obstime","crops",
"ast_ra_j2000","ast_dec_j2000","ast_rms_ra","ast_rms_dec","ast_orientation", "ra_j2000","dec_j2000","orientation"
"limmag","limmag_error","phot_zero_error",
"phot_zero","sky_level","seeing"
], ],
"properties": { "properties": {
"siteid": { "$ref": "#/$defs/integer"}, "siteid": { "$ref": "#/$defs/integer"},
...@@ -397,9 +395,12 @@ frame = { ...@@ -397,9 +395,12 @@ frame = {
"crops": {"$ref": "#/$defs/base64"}, "crops": {"$ref": "#/$defs/base64"},
"ast_ra_j2000": {"$ref": "#/$defs/number"}, "ast_ra_j2000": {"$ref": "#/$defs/number"},
"ast_dec_j2000": {"$ref": "#/$defs/number"}, "ast_dec_j2000": {"$ref": "#/$defs/number"},
"ast_orientation": {"$ref": "#/$defs/number"},
"ast_rms_ra": {"$ref": "#/$defs/number"}, "ast_rms_ra": {"$ref": "#/$defs/number"},
"ast_rms_dec": {"$ref": "#/$defs/number"}, "ast_rms_dec": {"$ref": "#/$defs/number"},
"ast_orientation": {"$ref": "#/$defs/number"}, "ra_j2000": {"$ref": "#/$defs/number"},
"dec_j2000": {"$ref": "#/$defs/number"},
"orientation": {"$ref": "#/$defs/number"},
"limmag": {"$ref": "#/$defs/number"}, "limmag": {"$ref": "#/$defs/number"},
"limmag_error": {"$ref": "#/$defs/number"}, "limmag_error": {"$ref": "#/$defs/number"},
"phot_zero_error": {"$ref": "#/$defs/number"}, "phot_zero_error": {"$ref": "#/$defs/number"},
...@@ -418,7 +419,7 @@ frame = { ...@@ -418,7 +419,7 @@ frame = {
"$defs": { "$defs": {
"datetime": {"type":"string","pattern":"^\\d{2}\\/\\d{2}\\/\\d{4}\\s\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d+)?$"}, "datetime": {"type":"string","pattern":"^\\d{2}\\/\\d{2}\\/\\d{4}\\s\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d+)?$"},
"integer": {"type":"string","pattern":"^[-+]?\\d+$"}, "integer": {"type":"string","pattern":"^[-+]?\\d+$"},
"number": {"type":"string","pattern":"^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$"}, "number": {"anyOf":[{"type":"string","pattern":"^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$"},{"type":"number"}]},
"base64": {"type":"string","pattern":"^(?=(.{4})*$)[A-Za-z0-9+\\/]*={0,2}$"} "base64": {"type":"string","pattern":"^(?=(.{4})*$)[A-Za-z0-9+\\/]*={0,2}$"}
} }
} }
......
fte/lib/libpy/lczFile.py
View file @ b3f51337
...@@ -33,6 +33,7 @@ class lczFile(baseFile): ...@@ -33,6 +33,7 @@ class lczFile(baseFile):
timestamp = lambda x: datetime.strptime(x,'%d/%m/%Y %H:%M:%S.%f') timestamp = lambda x: datetime.strptime(x,'%d/%m/%Y %H:%M:%S.%f')
rec_list = { "siteid":int,"nightid":nighttime,"filename":str,"obstime":timestamp,"crops":str,} rec_list = { "siteid":int,"nightid":nighttime,"filename":str,"obstime":timestamp,"crops":str,}
frame_list = { frame_list = {
"ra_j2000":real,"dec_j2000":real,"orientation":real,
"ast_ra_j2000":real,"ast_dec_j2000":real,"ast_rms_ra":real,"ast_rms_dec":real,"ast_orientation":real, "ast_ra_j2000":real,"ast_dec_j2000":real,"ast_rms_ra":real,"ast_rms_dec":real,"ast_orientation":real,
"limmag":real,"limmag_error":real,"phot_zero_error":real, "limmag":real,"limmag_error":real,"phot_zero_error":real,
"phot_zero":real,"sky_level":real,"seeing":real,"exp_num":int, "phot_zero":real,"sky_level":real,"seeing":real,"exp_num":int,
......
Markdown is supported
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