Skip to content

FIREFLY-106:Add more instrument footprint #816

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 1 commit into from
Jun 7, 2019
Merged

FIREFLY-106:Add more instrument footprint #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/firefly/java/edu/caltech/ipac/firefly/server/visualize/VisContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,25 @@ public static void initCounters() {
footprintMap.put("SOFIA_FORCAST_GRISMS_A", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_FORCAST_GRISMS_B", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_FLITECAM_GRISMS_ABBA", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_FLITECAM_GRISMS_AB", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_FLITECAM_IMAG", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_HAWC_BAND_A_TOTAL", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_HAWC_BAND_A_POLAR", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_HAWC_BAND_C_TOTAL", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_HAWC_BAND_C_POLAR", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_HAWC_BAND_D_TOTAL", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_HAWC_BAND_D_POLAR", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_HAWC_BAND_E_TOTAL", "footprint/Footprint_SOFIA.reg");
footprintMap.put("SOFIA_HAWC_BAND_E_POLAR", "footprint/Footprint_SOFIA.reg");

footprintMap.put("SOFIA_FPI+", "footprint/Footprint_SOFIA.reg");



}

Expand Down
27 changes: 21 additions & 6 deletions src/firefly/js/visualize/draw/FootprintFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,32 @@ const JWST_INST = new Enum(['FGS', 'MIRI', 'NIRCAM', 'NIS', 'NIRSPEC']);
const HST_INST = new Enum(['NICMOS', 'WFPC2', 'ACS/WFC', 'ACS/HRC', 'ACS/SBC', 'WFC3/UVIS', 'WFC3/IR']);
const SPITZER_INST = new Enum(['IRAC36', 'IRAC45']);

//To add a new instrument, add it in SOFIA_INST. It the new instrument has submenu, create a menu list like SOFIA_INST_FORCAST_TEXT
//and then add it to SOFIA_INSTRUMENTS
const SOFIA_INST = new Enum(['FORCAST', 'FIFI-LS']);
//To add a new Sofia instrument, add it in SOFIA_INST. If the new instrument has submenu, create a menu list like
// SOFIA_INST_FORCAST_TEXT and then add it to SOFIA_INSTRUMENTS
const SOFIA_INST = new Enum(['FORCAST', 'FIFI-LS', 'FLITECAM', 'FPI+', 'HAWC+']);
export const SOFIA_INST_FORCAST_TEXT = new Enum({FORCAST_IMAG:'FORCAST Imaging',
FORCAST_GRISMS_A: 'FORCAST Grisms a',FORCAST_GRISMS_B:'FORCAST Grisms b' });
export const SOFIA_INST_FIFILS_TEXT = new Enum({'FIFI-LS_Blue':'FIFI-LS Blue (50-120 microns)', 'FIFI-LS_Red':'FIFI-LS Red (110-200 microns)' });
export const SOFIA_INST_FLITECAM_TEXT = new Enum({FLITECAM_IMAG:'FLITECAM Imaging', FLITECAM_GRISMS_ABBA: 'FLITECAM Grisms ABBA',
FLITECAM_GRISMS_AB: 'FLITECAM Grisms AB'});
export const SOFIA_INST_HAWC_TEXT = new Enum({
HAWC_BAND_A_TOTAL: '53 microns (Band A), Total Intensity',
HAWC_BAND_A_POLAR: '53 microns (Band A), Polarization',
HAWC_BAND_C_TOTAL: '89 microns (Band C), Total Intensity',
HAWC_BAND_C_POLAR: '89 microns (Band C), Polarization',
HAWC_BAND_D_TOTAL: '154 microns (Band D) Total Intensity',
HAWC_BAND_D_POLAR: '154 microns (Band D) Polarization',
HAWC_BAND_E_TOTAL: '214 microns (Band E), Total Intensity',
HAWC_BAND_E_POLAR: '214 microns (Band E) Polarization'
});



export const SOFIA_INST_FIFILS_TEXT = new Enum({'FIFI-LS_Blue':'FIFI-LS Blue (50-120 microns)', 'FIFI-LS_Red':'FIFI-LS Red (110-200 microns)'
});
export const SOFIA_INSTRUMENTS = {
'FIFI-LS': SOFIA_INST_FIFILS_TEXT,
FLITECAM: SOFIA_INST_FLITECAM_TEXT,
FORCAST: SOFIA_INST_FORCAST_TEXT,
'FIFI-LS': SOFIA_INST_FIFILS_TEXT
'HAWC+':SOFIA_INST_HAWC_TEXT
};

export const INSTRUMENTS = {
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/js/visualize/ui/MarkerDropDownView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function MarkerDropDownView({plotView:pv}) {

}
else {
innerDropDownMenu[i]=instruments[i];
innerDropDownMenu[i]=footprintCmdJSX(instruments[i], fp, instruments[i]);
}
}

Expand Down
30 changes: 30 additions & 0 deletions src/firefly_data/footprint/Footprint_SOFIA.reg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,33 @@ image;box(0, 0, 2.4", 191", 0) # color=green tag={FORCAST_GRISMS_A}
#FORCAST_GRISMS_B
image;box(0, 0, 4.7", 191", 0) # color=green tag={FORCAST_GRISMS_B}

#FLITECAM_GRISMS_ABBA
image;box(0, 0, 1", 60", 0) # color=green tag={FLITECAM_GRISMS_ABBA}
#FLITECAM_GRISMS_AB
image;box(0, 0, 2", 60", 0) # color=green tag={FLITECAM_GRISMS_AB}
#FLITECAM_IMAGE
image;circle(0, 0, 8') # color=green tag={FLITECAM_IMAGE}

#HAWC_BAND_A_TOTAL
image;box(0, 0, 1.7', 2.8', 0) # color=green tag={HAWC_BAND_A_TOTAL}
#HAWC_BAND_A_POLAR
image;box(0, 0, 1.7', 1.4', 0) # color=green tag={HAWC_BAND_A_POLAR}

#HAWC_BAND_C_TOTAL
image;box(0, 0, 2.7', 4.2', 0) # color=green tag={HAWC_BAND_C_TOTAL}
#HAWC_BAND_C_POLAR
image;box(0, 0, 2.7', 2.1', 0) # color=green tag={HAWC_BAND_C_POLAR}

#HAWC_BAND_D_TOTAL
image;box(0, 0, 4.6', 7.4', 0) # color=green tag={HAWC_BAND_D_TOTAL}
#HAWC_BAND_D_POLAR
image;box(0, 0, 4.6', 3.7', 0) # color=green tag={HAWC_BAND_D_POLAR}

#HAWC_BAND_E_TOTAL
image;box(0, 0, 6.3', 10.0', 0) # color=green tag={HAWC_BAND_E_TOTAL}
#HAWC_BAND_E_POLAR
image;box(0, 0, 6.3', 5.0', 0) # color=green tag={HAWC_BAND_E_POLAR}
#FPI+
image;box(0, 0, 8.7', 8.7', 0) # color=green tag={FPI+}