-
Notifications
You must be signed in to change notification settings - Fork 16
DM-8157: #242
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DM-8157: #242
Conversation
For this version I can see all DD info and get catalogs but when do image search, I got "Fail to load table. Error: edu.caltech.ipac.firefly.server.query.DataAccessException: DataAccessException:ERROR:No data is found in the search range from:unknown" for both coadd and science ccd tables. FYI: [11/19/16 at 4:10PM] |
ec3799d
to
650983f
Compare
I tested again after Lijun merged DM-8334. The image processor works fine. Give a target, select different search types, I got correct image metadata and five images from the five filters with the same patch and tract. When click one row in the table with different patch or tract, the five images are changed. The coverage map meets the requirement. (When switch from the image panel back to the coverage panel, I need to click the coverage map image in order to see the layers display. Designed like this?) Some issues in the catalog polygon search but it's not in this ticket. Good job! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
JavaScript part looks good. We talked a about the need to use URLFileInfoProcessor
instead of subclassing directly from BaseFileInfoProcessor
builder(plotId+'g', 'g', 'g'), | ||
builder(plotId+'r', 'r', 'r'), | ||
builder(plotId+'i', 'i', 'i'), | ||
builder(plotId+'z', 'z', 'z'), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the plotId should be the same for both types of plots. No reason to have different id's, it will only hold extra memory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The second parameters is the title DM-8548
is a ticket to improve it but you could just do it here. Make a base title that is scienceCcdExposureId
in the ccd case and computed deepCoaddId
in the coadd case
const url= `${baseUrl}?run=${run}&camcol=${camcol}&field=${field}&filter=${filterName}`; | ||
return makeUrlPlotRequest(url, title, plotId, rangeValues); | ||
const searchId = searchIdBase + Number(bandMap[filterName]); | ||
sr.setParam('deepCoaddId', `${searchId}`); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is a way to pass tract and patch and filter here. I think we decided to do that instead. This affects the search processor as well
…geSearchProcessor and use the tract, patch, filterId and filterName to search the image in DeepCoadd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if tract:3, filter:0 patch is 0,1 then you create a bad url. I think you are adding an extra 0 on patch
@@ -57,7 +57,7 @@ export const converters = { | |||
hasRelatedBands : true, | |||
canGrid : true, | |||
maxPlots : 12, | |||
makeRequest : makeLsstSdssPlotRequest, | |||
makeRequest : makeLsstImagePlotRequest, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should not change the name here. The right name is makeLsstSdssPlotRequest
since we are showing SDSS data using LSST services. I don't think you need to touch this file.
builder('lsst-g', titleBase+'-g', 'g'), | ||
builder('lsst-r', titleBase+'-r', 'r'), | ||
builder('lsst-i', titleBase+'-i', 'i'), | ||
builder('lsst-z', titleBase+'-z', 'z'), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lsst-sdss
is the right plot id prefix since it is sdss data using lsst
]; | ||
if (retval.standard[filterId]) retval.highlightPlotId= retval.standard[filterId].getPlotId(); | ||
} | ||
|
||
if (threeColorOps) { | ||
retval.threeColor= threeColorOps.map( (b) => b && builder('lsst-sdss-threeC', 'SDSS 3 Color', b) ); | ||
retval.threeColor= threeColorOps.map( (b) => b && builder('lsst-threeC', 'SDSS 3 Color', b) ); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here lsst-sdss-threeC
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My mistake, I thought Sdss means science CCD. I will change all related text back as they were.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Made all the requested changes. Please review again!
@@ -76,39 +93,41 @@ function makeCoaddReqBuilder(table, rowIdx) { | |||
* @param threeColorOps | |||
* @return {{}} | |||
*/ | |||
export function makeLsstSdssPlotRequest(table, row, includeSingle, includeStandard, threeColorOps) { | |||
export function makeLsstImagePlotRequest(table, row, includeSingle, includeStandard, threeColorOps) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change name back to makeLsstSdssPlotRequest
r.setTitleOptions(TitleOptions.NONE); | ||
r.setTitle(title); | ||
r.setPlotId(plotId); | ||
r.setMultiImageIdx(0); | ||
r.setPreferenceColorKey('lsst-sdss-color-pref'); | ||
r.setPreferenceColorKey('lsst-coadd-color-pref'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
start key with lsst-sdss
OK, looks good. |
1: add image search processor
2: add methods in LssSdssRequestList.js to create the WebRequest which calls the image search processor
To Test the image search processor:
9.469,-1.152
Please stop testing this one. The branch was created and tested on 11/23/16 before DM-8308 was merged. There was some merge issue to resolve.
[New}
After the DM-8334 was merged, it worked without doing any modifications. Please check it out and try it again. The previous issue was caused by merging DM-8308 without DM-8334.