Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solvers-acuk-m
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Takhir Fakhrutdinov
solvers-acuk-m
Commits
b3f51337
Commit
b3f51337
authored
Oct 26, 2022
by
Takhir Fakhrutdinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Косяк в frames.json
parent
800154ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
fileFactory.py
fte/lib/libpy/fileFactory.py
+6
-5
lczFile.py
fte/lib/libpy/lczFile.py
+1
-0
No files found.
fte/lib/libpy/fileFactory.py
View file @
b3f51337
...
...
@@ -384,9 +384,7 @@ frame = {
"type"
:
"object"
,
"required"
:
[
"siteid"
,
"nightid"
,
"filename"
,
"exp_num"
,
"obstime"
,
"crops"
,
"ast_ra_j2000"
,
"ast_dec_j2000"
,
"ast_rms_ra"
,
"ast_rms_dec"
,
"ast_orientation"
,
"limmag"
,
"limmag_error"
,
"phot_zero_error"
,
"phot_zero"
,
"sky_level"
,
"seeing"
"ra_j2000"
,
"dec_j2000"
,
"orientation"
],
"properties"
:
{
"siteid"
:
{
"$ref"
:
"#/$defs/integer"
},
...
...
@@ -397,9 +395,12 @@ frame = {
"crops"
:
{
"$ref"
:
"#/$defs/base64"
},
"ast_ra_j2000"
:
{
"$ref"
:
"#/$defs/number"
},
"ast_dec_j2000"
:
{
"$ref"
:
"#/$defs/number"
},
"ast_orientation"
:
{
"$ref"
:
"#/$defs/number"
},
"ast_rms_ra"
:
{
"$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_error"
:
{
"$ref"
:
"#/$defs/number"
},
"phot_zero_error"
:
{
"$ref"
:
"#/$defs/number"
},
...
...
@@ -418,7 +419,7 @@ frame = {
"$defs"
:
{
"datetime"
:
{
"type"
:
"string"
,
"pattern"
:
"^
\\
d{2}
\\
/
\\
d{2}
\\
/
\\
d{4}
\\
s
\\
d{2}
\\
:
\\
d{2}
\\
:
\\
d{2}(
\\
.
\\
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}$"
}
}
}
...
...
fte/lib/libpy/lczFile.py
View file @
b3f51337
...
...
@@ -33,6 +33,7 @@ class lczFile(baseFile):
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
,}
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
,
"limmag"
:
real
,
"limmag_error"
:
real
,
"phot_zero_error"
:
real
,
"phot_zero"
:
real
,
"sky_level"
:
real
,
"seeing"
:
real
,
"exp_num"
:
int
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment