Skip to content

IRSA-2442 and IRSA-2742: adding ISSA and 2mass 6 degrees datasets #817

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jun 7, 2019
Merged

IRSA-2442 and IRSA-2742: adding ISSA and 2mass 6 degrees datasets #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
227e703
IRSA-2442 & 2742: adding 2mass 6 deg and start adding ISSA with full …
ejoliet May 9, 2019
ecfb92f
IRSA-2442 && IRSA-2742: master table fixed to show ISSA and Siz degre…
ejoliet May 10, 2019
daa0560
IRSA-2442: improve exception message
ejoliet May 31, 2019
c4fb609
IRSA-2442: fixing IRSA 2443
ejoliet Jun 3, 2019
bd6bc6f
IRSA-2309: allow FLS 21 cm cubes to be displayed no cutout changing i…
ejoliet Jun 5, 2019
b0b7a51
IRSA-2742: fixing getting 2mass 6deg mosaic images
ejoliet Jun 6, 2019
213b9a0
Merge branch 'IRSA-2442-add-issa-images' of https://github.com/Caltec…
ejoliet Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/firefly/java/edu/caltech/ipac/astro/ibe/datasource/TwoMassIbeDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ public class TwoMassIbeDataSource extends BaseIbeDataSource {
public static final String XDATE_KEY = "xdate";
public static final String SCAN_KEY = "scan";

public static final String XTRA_CONSTRAINT = "xtraConstraint"; // IRSA-2742

private DS ds;

public enum DS {
ASKY("asky", "allsky","allsky"),
ASKYW("askyw","full","full"),
SX("sx","sixxcat","sixxcat"),
SXW("sxw","sixxfull","sixxfull"),
//MOSAIC("mosaic", "mosaic", "sixdeg"), // not ready yet
MOSAIC("mosaic", "mosaic", "sixdeg"), // not ready yet
CAL("cal", "calibration", "calibration");

private String name;
Expand Down Expand Up @@ -109,9 +111,15 @@ public IbeDataParam makeDataParam(Map<String, String> pathInfo) {
fname = "image/" + fname;
}

// sample path
// http://<hostname>:8000/ibe/data/twomass/allsky/allsky/980623n/s076/image/hi0760126.fits.gz
dataParam.setFilePath(ordate+hemisphere+"/"+"s"+ne.format(scanno)+"/"+ fname);
if(this.ds.equals(DS.MOSAIC)){
//ex https://<hostname>/ibe/data/twomass/mosaic/sixdeg/j/01381/mosaic_6deg_j01381_1asec.fits
int seqnum = StringUtils.getInt(pathInfo.get("seqnum"));
dataParam.setFilePath( pathInfo.get("fname") );
}else {
// sample path
// http://<hostname>:8000/ibe/data/twomass/allsky/allsky/980623n/s076/image/hi0760126.fits.gz
dataParam.setFilePath(ordate + hemisphere + "/" + "s" + ne.format(scanno) + "/" + fname);
}

// check cutout params
// look for ra_obj first - moving object search
Expand Down Expand Up @@ -198,9 +206,19 @@ private String processConstraints(Map<String, String> queryInfo) {
ArrayList<String> constraints = new ArrayList<String>();
String constrStr = "";

//Add proper filter for mosaic in IBE (IRSA-2742)
String filter = queryInfo.get(XTRA_CONSTRAINT);
String filterStr = "";
String band = queryInfo.get(BAND_KEY);
if (!StringUtils.isEmpty(band)&&!band.startsWith("A")) {
constraints.add("filter=\'"+band.toLowerCase()+"\'");
if (!StringUtils.isEmpty(band) && !band.startsWith("A")) {
filterStr += "filter = \'" + band.toLowerCase() + "\'";
if (!StringUtils.isEmpty(filter)) {
filterStr += " and " + filter;
}
constraints.add(filterStr);
} else if (!StringUtils.isEmpty(filter)) {
filterStr += "filter = " + filter;
constraints.add(filterStr);
}

String hem = queryInfo.get(HEM_KEY);
Expand Down
Loading