DM-43255: Update analysis code and refactor #93
Conversation
| @@ -50,6 +54,29 @@ | |||
| "plotSourcesOnImage", | |||
| ) | |||
|
|
|||
| KNOWN_CAMERAS = ("regular", "wide", "fast") | |||
There was a problem hiding this comment.
Not narrow? Shouldn't this be KNOWN_CAMERA_TYPES then, if you plan to have another camera with cameraType="regular"?
There was a problem hiding this comment.
I don't think the KNOWN_CAMERAS needs renaming as they're physical cameras, not types, but yeah, this comment and all the others are absolutely right that I got part way through renaming regular to narrow but missed loads of places.
| doSmoothPlot: bool | ||
|
|
||
|
|
||
| narrowCam = StarTrackerCamera("regular", "", "", True, 102, 5, 25, 0.95, 5, True) |
There was a problem hiding this comment.
Again I find it slightly confusing to have regular/narrow but I assume there is a reason for it.
There was a problem hiding this comment.
No no, you're right, this was also supposed to be renamed everywhere.
| # streaming filenames are like GC103_O_20240304_000007_0001316.fits | ||
| # which is <camNum>_O_<dayObs>_<seqNum>_<streamSeqNum>.fits | ||
| # so 5 sections means streaming, 4 means normal | ||
| return len(os.path.basename(filename).split("_")) == 5 |
There was a problem hiding this comment.
You can also do os.path.basename(filename).count("_") == 5, FYI.
There was a problem hiding this comment.
Nice, thanks, I do prefer that actually. Note the fence-post error there though - needs to be os.path.basename(filename).count("_") == 4 for the same behaviour!
| sources = list(sourceDict.values()) | ||
|
|
||
| allDayObs = set([s.dayObs for s in sources]) |
There was a problem hiding this comment.
You can drop the list [] since it'll work fine with a generator, FYI.
There was a problem hiding this comment.
Ah thanks, I always forget that for some reason!
|
|
||
| narrowCam = StarTrackerCamera("regular", "", "", True, 102, 5, 25, 0.95, 5, True) | ||
| wideCam = StarTrackerCamera("wide", "_wide", " wide", True, 101, 5, 25, 0.8, 5, True) | ||
| fastCam = StarTrackerCamera("fast", "_fast", " fast", True, 103, 2.5, 10, 0.95, 60, False) |
There was a problem hiding this comment.
I strongly advise initializing dataclasses with kwargs (and ideally using kw_only=True) because chances are putting ten or more args in a row will bite you one day (and even if doesn't, it's hard to read).
There was a problem hiding this comment.
Yeah, totally agree, and I usually do use that. I'm also not using slots here either, which is a really bad combination! This was because it was all growing very organically and in quite a panic a year ago when we first went on sky. Will tidy that up now 🙏
No description provided.