Skip to content

Commit

Permalink
fix ulog reading so it is compatible with hlogs
Browse files Browse the repository at this point in the history
  • Loading branch information
@StuartLittlefair
StuartLittlefair committed May 11, 2021
1 parent 9806d89 commit e7c105d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hipercam/hlog.py
View file
Expand Up @@ -403,7 +403,7 @@ def rulog(cls, fname):
float(eym) if float(eym) > 0 else NaN,
float(counts) if float(sigma) > 0 else NaN,
float(sigma) if float(sigma) > 0 else NaN,
float(sky) if int(ssky) > 0 else NaN,
float(sky) if int(nsky) > 0 else NaN,
int(nsky),
int(nrej),
int(worst),
Expand All @@ -413,7 +413,7 @@ def rulog(cls, fname):
else:
# first time for this CCD
hlog[cnam] = bytearray()
names = ["MJD", "MJDok", "Expose", "FWHM", "beta"]
names = ["MJD", "MJDok", "Exptim", "FWHM", "beta"]
dts = ["f8", "?", "f4", "f4", "f4"]
naps[cnam] = len(arr[7:]) // 14
hlog.apnames[cnam] = [str(i) for i in range(1, naps[cnam] + 1)]
Expand Down Expand Up @@ -462,7 +462,7 @@ def rulog(cls, fname):
"i4",
"i4",
"i4",
"i4",
"u4",
]

values += [
Expand All @@ -474,7 +474,7 @@ def rulog(cls, fname):
float(eym) if float(eym) > 0 else NaN,
float(counts) if float(sigma) > 0 else NaN,
float(sigma) if float(sigma) > 0 else NaN,
float(sky) if int(ssky) > 0 else NaN,
float(sky) if int(nsky) > 0 else NaN,
int(nsky),
int(nrej),
int(worst),
Expand Down

0 comments on commit e7c105d

Please sign in to comment.