DM-7784-7963

* LC image retireve use url instead of ibe for general purpose LCViewer
* Add user input image cutout size in Phase Fold Panel.

Author: wmiipac

src/firefly/js/templates/lightcurve/LcManager.js

@@ -13,11 +13,13 @@ import {dispatchPlotImage, visRoot, dispatchDeletePlotView,
         dispatchChangeActivePlotView} from '../../visualize/ImagePlotCntlr.js';
 import {getPlotViewById} from '../../visualize/PlotViewUtil.js';
 import {getMultiViewRoot, dispatchReplaceViewerItems, getViewer} from '../../visualize/MultiViewCntlr.js';
-import {WebPlotRequest} from '../../visualize/WebPlotRequest.js';
+import {WebPlotRequest,TitleOptions} from '../../visualize/WebPlotRequest.js';
 import {dispatchTableToIgnore} from '../../visualize/DrawLayerCntlr.js';
 import Catlog from '../../drawingLayers/Catalog.js';
 import {ServerRequest} from '../../data/ServerRequest.js';
 import {CHANGE_VIEWER_LAYOUT} from '../../visualize/MultiViewCntlr.js';
+import LcPFOptionsPanel, {getCutoutValue} from './LcPhaseFoldingPanel.jsx';
+import FieldGroupUtils, {revalidateFields} from '../../fieldGroup/FieldGroupUtils';
 
 export const RAW_TABLE = 'raw_table';
 export const PHASE_FOLDED = 'phase_folded';
@@ -155,6 +157,38 @@ function getWebPlotRequest(tableModel, hlrow) {
 
 }
 
+function getWebPlotRequestViaUrl(tableModel, hlrow) {
+    const ra = getCellValue(tableModel, hlrow, 'ra');
+    const dec = getCellValue(tableModel, hlrow, 'dec');
+    const frameId = getCellValue(tableModel, hlrow, 'frame_id');
+    var   wise_sexp_ibe = /(\d+)([0-9][a-z])(\w+)/g;
+    var   res = wise_sexp_ibe.exec(frameId);
+    const scan_id = res[1] + res[2];
+    const scangrp = res[2];
+    const frame_num = res[3];
+    const cutoutsize = tableModel.request.cutout_size || 0.3;
+
+    /*the following should be from reading in the url column returned from LC search
+     we are constructing the url for wise as the LC table does
+     not have the url colume yet
+     It is only for WISE, using default cutout size 0.3 deg
+    const url = `http://irsa.ipac.caltech.edu/ibe/data/wise/merge/merge_p1bm_frm/${scangrp}/${scan_id}/${frame_num}/${scan_id}${frame_num}-w1-int-1b.fits`;
+    */
+    const serverinfo = 'http://irsa.ipac.caltech.edu/ibe/data/wise/merge/merge_p1bm_frm/';
+    const centerandsize = `?center=${ra},${dec}&size=${cutoutsize}&gzip=false`;
+    const url = `${serverinfo}${scangrp}/${scan_id}/${frame_num}/${scan_id}${frame_num}-w1-int-1b.fits${centerandsize}`;
+    const plot_desc = `WISE-${frameId}`;
+    const reqParams = WebPlotRequest.makeURLPlotRequest(url, plot_desc);
+    reqParams.setTitle('WISE-'+ frameId + ' size: '+ cutoutsize +'(deg)');
+    reqParams.setTitleOptions(TitleOptions.NONE);
+    reqParams.setGroupLocked(true);
+    reqParams.setPlotGroupId('LightCurveGroup');
+    reqParams.setPreferenceColorKey('light-curve-color-pref');
+    return reqParams;
+
+
+
+}
 
 function setupImages(tbl_id) {
     const viewer=  getViewer(getMultiViewRoot(),IMG_VIEWER_ID);
@@ -169,7 +203,7 @@ function setupImages(tbl_id) {
     newPlotIdAry.forEach( (plotId) => {
         if (!getPlotViewById(vr,plotId)) {
             const rowNum= Number(plotId.substring(plotIdRoot.length));
-            const webPlotReq = getWebPlotRequest(tableModel,rowNum );
+            const webPlotReq = getWebPlotRequestViaUrl(tableModel,rowNum);
             dispatchPlotImage({plotId, wpRequest:webPlotReq,
                                        setNewPlotAsActive:false,
                                        holdWcsMatch:true,

src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx

@@ -228,36 +228,47 @@ export function LcPFOptionsPanel ({fields}) {
                     <br/>
                     <ValidationField fieldKey='flux'
                          initialState= {{
-                                  fieldKey: 'flux',
-                                  value: '2.0',
-                                  validator: Validate.floatRange.bind(null, 2.0, 5.5, 3,'Flux Column'),
-                                  tooltip: 'Flux Column, value between 2.0 to 5.5',
-                                  label : 'Flux Column:',
-                                  labelWidth : 100
+                                fieldKey: 'flux',
+                                value: '2.0',
+                                validator: Validate.floatRange.bind(null, 2.0, 5.5, 3,'Flux Column'),
+                                tooltip: 'Flux Column, value between 2.0 to 5.5',
+                                label : 'Flux Column:',
+                                labelWidth : 100
                           }} />
 
                     <br/>
 
                     <ValidationField fieldKey='fluxerror'
                          initialState= {{
-                                  fieldKey: 'fluxerror',
-                                  value: '0.02',
-                                  validator: Validate.floatRange.bind(null, 0.01, 0.5, 3,'Flux Error'),
-                                  tooltip: 'Flux Error, value is between 0.01 to 0.5',
-                                  label : 'Flux Error:',
-                                  labelWidth : 100
+                                fieldKey: 'fluxerror',
+                                value: '0.02',
+                                validator: Validate.floatRange.bind(null, 0.01, 0.5, 3,'Flux Error'),
+                                tooltip: 'Flux Error, value is between 0.01 to 0.5',
+                                label : 'Flux Error:',
+                                labelWidth : 100
                          }} />
                     <br/>
 
                     <ValidationField fieldKey='period'
-                                     initialState= {{
+                         initialState= {{
                                 fieldKey: 'period',
                                 value: '1.0',
                                 //validator: Validate.floatRange.bind(null, 0.5, 1.5, 3,'period'),
                                 tooltip: 'Period',
                                 label : 'Period:',
                                 labelWidth : 100
                     }} />
+                    <br/>
+
+                    <ValidationField fieldKey='cutoutSize'
+                        initialState= {{
+                               fieldKey: 'cutoutSize',
+                               value: '0.3',
+                               //validator: Validate.floatRange.bind(null, 0.1, 1, 3,'cutoutsize'),
+                               tooltip: 'Cutout Size',
+                               label : 'Cutout Size:',
+                               labelWidth : 100
+                       }} />
 
 
                     <br/> <br/>
@@ -388,6 +399,8 @@ function doPhaseFolding(fields) {
 
     var tReq = makeTblRequest('PhaseFoldedProcessor', PHASE_FOLDED, {
         'period_days': fields.period.value,
+        'cutout_size': fields.cutoutSize.value,
+        'flux': fields.flux.value,
         'table_name': 'folded_table',
         'time_col_name':fields.timeCol.value,
         'original_table': tbl.tableMeta.tblFilePath