Details
-
Type:
Story
-
Status: Done
-
Resolution: Done
-
Fix Version/s: None
-
Component/s: obs_subaru
-
Labels:
-
Story Points:6
-
Epic Link:
-
Sprint:Science Pipelines DM-S15-1, Science Pipelines DM-S15-2, Science Pipelines DM-S15-3, Science Pipelines DM-S15-4, Science Pipelines DM-S15-5, Science Pipelines DM-S15-6
-
Team:Data Release Production
Description
Reducing HSC data requires an estimate of the distortion, which is provided by the HSC package distEst. This can be pulled into obs_subaru to consolidate code and reduce dependencies.
I propose to treat distEst as legacy code, which means I will pull it into obs_subaru without major changes to the code style.
Attachments
Issue Links
- is blocked by
-
DM-245 Implement HSC camera in new camera framework
- Done
- is duplicated by
-
DM-2796 obs_subaru cannot be built due to a missing hsc header file
- Won't Fix
-
DM-2194 Ensure proper functioning of HSC distortion correction within obs_subaru
- Invalid
- relates to
-
DM-245 Implement HSC camera in new camera framework
- Done
Activity
- 59f92b: added explanation to commit message
- a2780b: we added some code on the HSC side to support using a postgresql database for the registry. I don't know if we use it, but I think that given the coming changes to the butler, we should only worry about this when the time comes to pull things back to HSC.
- 030278: added explanation to commit message
- 555767: fixed
- 111d2e:
- Aha, I discovered an off-by-one bug in my reckoning of line lengths in emacs.
- Changed the pickle to actual code.
- I think the test does demonstrate the functionality as it's intended to be used. I don't think we're supposed to instantiate HscDistortion (or other distortion classes) explicitly.
- Added some notes on the provenance of values in transformRegistry.py.
- Added the files from re-running genCameraRepository.py. Suspect an old version got in there somehow.
- I don't think we want to recreate the camera files (created by genCameraRepository.py) at build time, as this is done using "policy" files and an old package (pex_policy) that we expect will be completely removed soon.
Cleaning up, will add something to mark FITS files as binary, and then hope to merge later this afternoon.
Here's where we stand. I plan to merge this in about an hour.
price@price-laptop:~/LSST/obs/subaru (tickets/DM-1794=) $ git sub
|
commit a59f6e69b6546cafa30d48e8f7b6778c48453a31
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 19:53:55 2015 -0400
|
|
genDefectFits.py: fix instantiation of mapper
|
|
We need a root directory, and SUPRIME_DATA_DIR may not be set.
|
It doesn't really matter what root directory we use, because
|
all we really need is the camera.
|
|
bin/genDefectFits.py | 2 +-
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
commit a9604db5103714b4621673ee19e7b8441c2b0f40
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 19:54:32 2015 -0400
|
|
registryInfo.py: don't require postgresql
|
|
bin/registryInfo.py | 3 ++-
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
commit 141a34cf8d05404aff12626497aebd7f7775cc60
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 19:56:06 2015 -0400
|
|
require SWIGed module before building defects registry
|
|
This fixes race conditions in parallel builds.
|
|
hsc/SConscript | 4 +++-
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
commit 47038cc6caa09e721da545e04319c96f9913eb9b
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Tue Aug 4 15:19:25 2015 -0400
|
|
Add .gitattributes to treat FITS files as binary
|
|
.gitattributes | 1 +
|
1 file changed, 1 insertion(+)
|
|
commit 9dab8501770c9bb647f49c8dfb27c4d97d37be54
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:03:30 2015 -0400
|
|
genCameraRepository.py: convert to a plate scale of 1
|
|
LSST likes to use mm/pixels, but Subaru works in nominal pixels from the
|
boresite, or a plate scale of 1. This is true for both Suprime-Cam and
|
HSC.
|
|
This does not include updates to the camera definition files, just the
|
conversion.
|
|
bin/genCameraRepository.py | 6 ++----
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
commit 7b9d29b059bbcf002e829cfba699898479d5a458
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:07:46 2015 -0400
|
|
fix amp names
|
|
Subaru amplifiers aren't indexed in two dimensions, so no need for an
|
extra number that's always zero.
|
|
bin/genCameraRepository.py | 2 +-
|
python/lsst/obs/subaru/isr.py | 5 +----
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
commit 69fc0b11ae53e480c10147b12ace1bd915826529
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:15:35 2015 -0400
|
|
add HSC distortion model rather than using external package distEst
|
|
This implements distEst using the new cameraGeom framework, and activates
|
the new distortion model.
|
|
bin/genCameraRepository.py | 5 +-
|
hsc/camera/0_00.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_01.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_02.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_03.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_04.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_05.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_06.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_07.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_08.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_09.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_10.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_11.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_12.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_13.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_14.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_15.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_16.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_17.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_18.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_19.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_20.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_21.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_22.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_23.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_24.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_25.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_26.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_27.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_28.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_29.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_30.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_31.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_32.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_33.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_34.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_35.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_36.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_37.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_38.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_39.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_40.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_41.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_42.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_43.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_44.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_45.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_46.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_47.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_48.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_51.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_52.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_53.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_54.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_55.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_56.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/0_57.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_00.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_01.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_02.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_03.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_04.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_05.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_06.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_07.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_08.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_09.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_10.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_11.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_12.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_13.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_14.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_15.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_16.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_17.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_18.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_19.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_20.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_21.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_22.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_23.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_24.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_25.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_26.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_27.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_28.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_29.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_30.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_31.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_32.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_33.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_34.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_35.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_36.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_37.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_38.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_39.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_40.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_41.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_42.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_43.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_44.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_45.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_46.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_47.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_48.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_51.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_52.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_53.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_54.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_55.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_56.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/1_57.fits | Bin 17280 -> 17280 bytes
|
hsc/camera/camera.py | 940 +++++++++++++++++++--------------------
|
include/lsst/obs/subaru/DistEstXYTransform.h | 62 ---
|
include/lsst/obs/subaru/HscDistortion.h | 91 ++++
|
python/lsst/obs/hsc/transformRegistry.py | 281 +++++++++++-
|
python/lsst/obs/subaru/subaruLib.i | 6 +-
|
src/DistEstXYTransform.cc | 63 ---
|
src/HscDistortion.cc | 139 ++++++
|
tests/hscDistortion.py | 1238 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
ups/obs_subaru.cfg | 11 +-
|
ups/obs_subaru.table | 1 -
|
123 files changed, 2210 insertions(+), 627 deletions(-)
|
|
commit 8c0352f2c1ea86857db37d400cee15a89b79d3ab
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:16:32 2015 -0400
|
|
generate new camera definitions for Suprime-Cam
|
|
suprimecam/camera/Chihiro.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Clarisse.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Fio.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Kiki.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Nausicaa.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Ponyo.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/San.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Satsuki.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Sheeta.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/Sophie.fits | Bin 17280 -> 17280 bytes
|
suprimecam/camera/camera.py | 88 ++++++++++++++++++++++++++++++--------------------------------
|
suprimecam/mit_camera/camera.py | 90 +++++++++++++++++++++++++++++++---------------------------------
|
suprimecam/mit_camera/si001s.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/si002s.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/si005s.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/si006s.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w4c5.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w67c1.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w6c1.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w7c3.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w93c2.fits | Bin 17280 -> 17280 bytes
|
suprimecam/mit_camera/w9c2.fits | Bin 17280 -> 17280 bytes
|
22 files changed, 85 insertions(+), 93 deletions(-)
|
|
commit 7259c05d09790420c90071e763ec1bd0137d1c7f
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:16:58 2015 -0400
|
|
cleanup lib/Sconscript
|
|
lib/SConscript | 2 --
|
1 file changed, 2 deletions(-)
|
|
commit d973d1b8595e82e4e2770d327e50fe3b3fb81fb2
|
Author: Paul Price <price@astro.princeton.edu>
|
Date: Thu Jul 23 20:18:03 2015 -0400
|
|
add image of CCD positions for HSC
|
|
This is useful for debugging.
|
|
Taken from http://subarutelescope.org/Observing/Instruments/HSC/CCDPosition_20140811.png
|
|
.gitattributes | 1 +
|
hsc/CCDPosition_20140811.png | Bin 0 -> 370956 bytes
|
2 files changed, 1 insertion(+)
|
Thanks for the clarifications and explanations!
Merged to master. Hooray!
I was thinking of suggesting that we declare FITS files to be binaries in all our repos. In theory we could get clever with a diff tool (by calling fitsheader) but then we'd have to ensure that that command (or the wcsLib version) was always available.