Merge pull request #1245 from Caltech-IPAC/firefly-1037-1038

robyww · web-flow · commit 67cfdbe3e79b · 2022-07-27T16:55:32.000-06:00
Firefly-1037, Firefly-1038: multiple issues
diff --git a/src/firefly/html/images/caltech-new-logo.png b/src/firefly/html/images/caltech-new-logo.png
diff --git a/src/firefly/html/images/ipac_logo-56x40.png b/src/firefly/html/images/ipac_logo-56x40.png
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/ImagePlotCreator.java b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/ImagePlotCreator.java
@@ -285,14 +285,14 @@ private static WebFitsData makeWebFitsData(ActiveFitsReadGroup frGroup, Band ban
         if (fr==null) return null;
         double dataMin= Double.NaN;
         double dataMax= Double.NaN;
-        double standardErr= 0;
+        double largeBinPercent= 0;
         if (!fr.isDeferredRead()) {
             Histogram hist= fr.getHistogram();
             dataMin= hist.getDNMin() * fr.getBscale() + fr.getBzero();
             dataMax= hist.getDNMax() * fr.getBscale() + fr.getBzero();
-            standardErr= hist.getStandardErr();
+            largeBinPercent= hist.getLargeBinPercent();
         }
-        return new WebFitsData( dataMin, dataMax, standardErr, fileLength, fr.getFluxUnits());
+        return new WebFitsData( dataMin, dataMax, largeBinPercent, fileLength, fr.getFluxUnits());
     }
 
     public record PlotInfo(PlotState state, ImagePlot plot, FileInfo fileInfo,
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/VisJsonSerializer.java b/src/firefly/java/edu/caltech/ipac/firefly/server/visualize/VisJsonSerializer.java
@@ -292,7 +292,7 @@ private static JSONObject serializeWebFitsData(WebFitsData wfData) {
         JSONObject map = new JSONObject();
         putDoubleNot0(map, "dataMin", wfData.dataMin());
         putDoubleNot0(map,"dataMax", wfData.dataMax());
-        putDoubleNot0(map,"standardErr", wfData.standardErr());
+        putDoubleNot0(map,"largeBinPercent", wfData.largeBinPercent());
         putStr(map, "fluxUnits", wfData.fluxUnits());
         putNum(map, "getFitsFileSize", wfData.fitsFileSize());
         return map;
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/visualize/WebFitsData.java b/src/firefly/java/edu/caltech/ipac/firefly/visualize/WebFitsData.java
@@ -6,5 +6,5 @@
 /**
  * @author Trey Roby
  */
-public record WebFitsData(double dataMin, double dataMax, double standardErr, long fitsFileSize, String fluxUnits) { }
+public record WebFitsData(double dataMin, double dataMax, double largeBinPercent, long fitsFileSize, String fluxUnits) { }
 
diff --git a/src/firefly/java/edu/caltech/ipac/visualize/plot/Histogram.java b/src/firefly/java/edu/caltech/ipac/visualize/plot/Histogram.java
@@ -29,7 +29,7 @@ public class Histogram implements HasSizeOf {
     private double histBinsize;
     private final double irafMin;
     private final double irafMax;
-    private final double standardErr;
+    private final double largeBinPercent;
 
 
 
@@ -152,7 +152,7 @@ else if (i>HISTSIZ2)
 
         irafMin = datamin;
         irafMax = datamax;
-        standardErr= get_sigma(1,true)/Math.sqrt(float1dArray.length);
+        largeBinPercent= computeLargeBinPercent(float1dArray.length);
     }
 
 
@@ -270,6 +270,22 @@ public double get_pct(double ra_value, boolean round_up) {
             return ((i) * histBinsize + histMin);
     }
 
+    public double computeLargeBinPercent(int dataLen) {
+       int cnt=0;
+
+       int histMax=0;
+        for (int j : hist) {
+            if (histMax < j) histMax = j;
+        }
+        int marker= (int)(histMax*.4);
+
+
+        for (int j : hist) {
+            if (j > marker) cnt++;
+        }
+       return (float)cnt/(float)hist.length;
+    }
+
     /**
      * @return A pointer to the histogram array
      */
@@ -392,5 +408,5 @@ public long getSizeOf() {
         return hist.length*4L + 32L;
     }
 
-    public double getStandardErr() { return standardErr; }
+    public double getLargeBinPercent() { return largeBinPercent; }
 }
diff --git a/src/firefly/js/ui/PopupUtil.jsx b/src/firefly/js/ui/PopupUtil.jsx
@@ -84,13 +84,14 @@ export function showOptionsPopup({content, title='Options', modal = false, show=
  * @param {string | object} content can be a string or a react component
  * @param {string} title
  * @param {boolean} [isCopyable] true or false, if undefined, then the default to true if it is a string
+ * @param [wrapperStyle]
  * @return {object}
  */
-export function showInfoPopup(content, title='Information', isCopyable=undefined) {
+export function showInfoPopup(content, title='Information', isCopyable=undefined, wrapperStyle) {
     if (isUndefined(isCopyable)) isCopyable = isString(content);
     var results= (
         <PopupPanel title={title} >
-            {makeContent(content, isCopyable)}
+            {makeContent(content, isCopyable, wrapperStyle)}
         </PopupPanel>
     );
     DialogRootContainer.defineDialog(INFO_POPUP, results);
@@ -104,10 +105,10 @@ export function hideInfoPopup() {
     dispatchHideDialog(INFO_POPUP);
 }
 
-function makeContent(content, isCopyable) {
+function makeContent(content, isCopyable, wrapperStyle={}) {
     return (
         <div style={{padding:5}}>
-            <div style={{minWidth:350, maxWidth: 400, padding:'10px 10px 15px 10px', fontSize:'120%', overflow: 'hidden'}}
+            <div style={{minWidth:350, maxWidth: 500, padding:'10px 10px 15px 10px', fontSize:'120%', overflow: 'hidden', ...wrapperStyle}}
                  className={isCopyable ? 'popup-panel-textcopyable' : ''}>
                 {content}
             </div>
diff --git a/src/firefly/js/ui/VersionInfo.jsx b/src/firefly/js/ui/VersionInfo.jsx
@@ -6,6 +6,9 @@ import {
 import {CopyToClipboard} from '../visualize/ui/MouseReadout.jsx';
 import {showInfoPopup} from './PopupUtil.jsx';
 import './VersionInfo.css';
+import IPAC_LOGO from 'images/ipac_logo-56x40.png';
+import CALTECH_LOGO from 'images/caltech-new-logo.png';
+import FFTOOLS_ICO from 'html/images/fftools-logo-offset-small-42x42.png';
 
 const VER = 'Version';
 const BUILT_ON = 'Built On';
@@ -49,28 +52,66 @@ function VersionInfoFull() {
         + (ffTag ? `\n${FF_TAG}:         ${ffTag}` : '');
 
     return (
-        <div style={{display: 'flex', justifyContent: 'space-evenly'}}>
-            <div className='Version-grid'>
-                <Entry desc={VER} value={version}/>
-                <Entry desc={BUILT_ON} value={BuildTime}/>
-                <Entry desc={COMMIT} value={BuildCommit}/>
-                {major ? <Entry desc={FF_LIB} value={getFireflyLibraryVersionStr()}/> : ''}
-                {ffCommit && <Entry desc={FF_COM} value={ffCommit}/>}
-                {ffTag && <Entry desc={FF_TAG} value={ffTag}/>}
-                {
-                    !isVersionFormalRelease() &&
-                    <div className='Version-grid-warning'>
-                        {isVersionPreRelease() ?
-                            `Warning: Early preview of Firefly ${getDevCycle()}` :
-                            `Warning: Development build of Firefly on dev cycle ${getDevCycle()}`
-                        }
+        <div style={{display: 'flex', justifyContent: 'space-evenly', flexDirection:'column'}}>
+            <div style={{display: 'flex', justifyContent: 'flex-start'}}>
+                <div style={{paddingRight:10, display: 'flex', flexDirection:'column', alignItems:'center', marginTop:-20}}>
+                    <a href='https://github.com/Caltech-IPAC/firefly' target='github-window'><img alt='Firefly' src={FFTOOLS_ICO} style={{marginTop:10}}/></a>
+                    <a href='https://www.caltech.edu' target='caltech-window'><img style={{width:70}} alt='Caltech' src={CALTECH_LOGO}/></a>
+                    <a href='https://www.ipac.caltech.edu' target='ipac-window'><img alt='IPAC' src={IPAC_LOGO}/></a>
+                </div>
+                <div style={{display: 'flex', justifyContent: 'space-evenly', marginLeft:60, alignItems:'flex-start'}}>
+                    <div className='Version-grid'>
+                        <Entry desc={VER} value={version}/>
+                        <Entry desc={BUILT_ON} value={BuildTime}/>
+                        <Entry desc={COMMIT} value={BuildCommit}/>
+                        {major ? <Entry desc={FF_LIB} value={getFireflyLibraryVersionStr()}/> : ''}
+                        {ffCommit && <Entry desc={FF_COM} value={ffCommit}/>}
+                        {ffTag && <Entry desc={FF_TAG} value={ffTag}/>}
                     </div>
-                }
+                    <CopyToClipboard style={{justifySelf: 'start', marginLeft:10}}
+                                     value={versionAsText} size={16} buttonStyle={{backgroundColor: 'unset'}}/>
+                </div>
             </div>
-            <CopyToClipboard style={{justifySelf: 'end', marginLeft: 10}}
-                             value={versionAsText} size={16} buttonStyle={{backgroundColor: 'unset'}}/>
+            {
+                !isVersionFormalRelease() &&
+                <div className='Version-grid-warning'>
+                    {isVersionPreRelease() ?
+                        `Warning: Early preview of Firefly ${getDevCycle()}` :
+                        `Warning: Development build of Firefly on dev cycle ${getDevCycle()}`
+                    }
+                </div>
+            }
+            <Acknowledgement/>
         </div>
     );
 }
 
-export const showFullVersionInfoDialog = (title = '') => showInfoPopup( <VersionInfoFull/>, `${title} Version Information`);
+
+const Acknowledgement= () => (
+    <div style={{padding:'10px 5px 3px 5px', width:600, fontSize:'smaller'}}>
+        <span>
+            Firefly development at&nbsp;
+        </span>
+        <a href='https://ipac.caltech.edu' target='ipac-window'>IPAC</a>
+        <span>
+            &nbsp;has been supported by NASA, principally through&nbsp;
+        </span>
+        <a href='https://irsa.ipac.caltech.edu' target='ipac-window'>IRSA</a>
+        <span>
+           , and by the National Science Foundation, through the&nbsp;
+        </span>
+        <a href='https://www.lsst.org/' target='rubin-window'>Vera C. Rubin Observatory</a>
+        <span>
+            . Firefly is open-source software, available on&nbsp;
+        </span>
+        <a href='https://github.com/Caltech-IPAC/firefly' target='github-window'>GitHub</a>
+        <span> and </span>
+        <a href='https://hub.docker.com/repository/docker/ipac/firefly' target='dockerhub-window'>DockerHub</a>
+        <span>.</span>
+    </div>
+
+);
+
+
+
+export const showFullVersionInfoDialog = (title = '') => showInfoPopup( <VersionInfoFull/>, `${title} Version Information`, true, {maxWidth:620});
diff --git a/src/firefly/js/visualize/WebPlot.js b/src/firefly/js/visualize/WebPlot.js
@@ -98,7 +98,7 @@ const HIPS_DATA_HEIGHT= 10000000000;
  *
  * @prop {number} dataMin
  * @prop {number} dataMax
- * @prop {number} standardErr,
+ * @prop {number} largeBinPercent,
  * @prop {number} fitsFileSize
  * @prop {number} fluxUnits
  */
diff --git a/src/firefly/js/visualize/rawData/RawDataOps.js b/src/firefly/js/visualize/rawData/RawDataOps.js
@@ -211,6 +211,10 @@ function clearLocalStretchData(plot) {
     entry.dataType= CLEARED;
 }
 
+function isNoisyImage(plot) {
+    return (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].largeBinPercent>.03);
+}
+
 /**
  * @param {WebPlot} plot
  * @param {boolean} mask
@@ -220,7 +224,7 @@ function getFirstDataCompress(plot, mask) {
     if (mask) return 'FULL';
     const {dataWidth, dataHeight}= plot;
     const size= dataWidth*dataHeight;
-    if (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].standardErr<.01) { //these type of image don't seem to compress very well
+    if (isNoisyImage(plot)) { //these type of image don't seem to compress very well
         return (size < 55*MEG) ? 'FULL' : 'QUARTER';
     }
     if (size < 6*MEG) return 'FULL';
@@ -241,7 +245,7 @@ function getNextDataCompress(firstCompress, plot) {
     const size= dataWidth*dataHeight;
     if (firstCompress!=='QUARTER' && size < MAX_FULL_DATA_SIZE) return 'FULL';
     if (size > MAX_FULL_DATA_SIZE) return 'HALF';
-    if (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].standardErr<.01) { //these type of image don't seem to compress very well
+    if (isNoisyImage(plot)) { //these type of image don't seem to compress very well
         return 'FULL';
     }
     if (size > 70*MEG && zoomFactor<.4) return 'HALF';
diff --git a/src/firefly/js/visualize/reducer/HandlePlotChange.js b/src/firefly/js/visualize/reducer/HandlePlotChange.js
@@ -2,6 +2,7 @@
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
 import {isEmpty, isUndefined, isString, isNumber} from 'lodash';
+import {Band} from '../Band.js';
 import Cntlr, {ExpandType, WcsMatchType, ActionScope} from '../ImagePlotCntlr.js';
 import {replacePlotView, replacePrimaryPlot, changePrimePlot, updatePlotViewScrollXY,
         findScrollPtToCenterImagePt, findScrollPtToPlaceOnDevPt,
@@ -20,7 +21,8 @@ import {
     primePlot, clonePvAry, clonePvAryWithPv, applyToOnePvOrAll, applyToOnePvOrOverlayGroup,
     matchPlotViewByPositionGroup, getPlotViewIdxById, getPlotGroupIdxById, findPlotGroup,
     getPlotViewById, findCurrentCenterPoint, getCenterOfProjection, getMatchingRotationAngle,
-    isRotationMatching, hasWCSProjection, isThreeColor } from '../PlotViewUtil.js';
+    isRotationMatching, hasWCSProjection, isThreeColor, isImageCube, getImageCubeIdx, getHDU
+} from '../PlotViewUtil.js';
 import Point, {parseAnyPt, makeImagePt, makeWorldPt, makeDevicePt} from '../Point.js';
 import {UserZoomTypes} from '../ZoomUtil.js';
 import PlotState, {RotateType} from '../PlotState.js';
@@ -207,7 +209,7 @@ function updateHiPSColor(state,action) {
 
 function updateImageDisplayData(state,action) {
     const {plotViewAry, mpwWcsPrimId, wcsMatchType}= state;
-    const clearLocal= action.type===Cntlr.STRETCH_CHANGE;
+    const stretchChange= action.type===Cntlr.STRETCH_CHANGE;
     const {plotId, primaryStateJson,overlayUpdateAry, rawData,bias,contrast, useRed, useGreen, useBlue, zoomLevel:newZoomFactor, colorTableId=-1}= action.payload;
     const inPv= getPlotViewById(state,plotId);
     const inPlot= primePlot(inPv);
@@ -246,7 +248,19 @@ function updateImageDisplayData(state,action) {
     }
 
     const plot= primePlot(pv); // get the updated on
-    if (clearLocal) plot.dataRequested= false;
+    if (stretchChange) {
+        plot.dataRequested= false;
+        const rv= plot.plotState.getRangeValues();
+        const hduIdx= getHDU(plot);
+        if (!isThreeColor(pv) && isImageCube(plot)) {
+            pv.plots= pv.plots.map((p) => {
+                if (getHDU(p)!==hduIdx) return p;
+                const newPlotState= p.plotState.copy();
+                newPlotState.setRangeValues(Band.NO_BAND,rv);
+                return {...p,dataRequested:false,plotState:newPlotState}
+            });
+        }
+    }
     PlotPref.putCacheColorPref(pv.plotViewCtx.preferenceColorKey, plot.plotState, plot.colorTableId);
 
     return {...state, plotViewAry : replacePlotView(plotViewAry,pv)};
diff --git a/src/firefly/js/visualize/task/PlotChangeTask.js b/src/firefly/js/visualize/task/PlotChangeTask.js
@@ -210,7 +210,7 @@ export function stretchChangeActionCreator(rawAction) {
         const doStretch= async (stretchPlot) => {
             if (!stretchPlot) return;
             const {plotId}= stretchPlot;
-            doStretchServerCall(dispatcher,getState, store,plotId,stretchData);
+            doStretchDispatch(dispatcher,getState, store,plotId,stretchData);
         };
 
 
@@ -278,7 +278,7 @@ function doCrop(dispatcher,pv,imagePt1, imagePt2, cropMultiAll, originalWcsMatch
 
 
 
-function doStretchServerCall(dispatcher,getState, store,plotId,stretchData) {
+function doStretchDispatch(dispatcher,getState, store,plotId,stretchData) {
 
     const plot= primePlot(store,plotId);
     const plotState= plot.plotState.copy();
diff --git a/src/firefly/js/visualize/ui/StretchDropDownView.jsx b/src/firefly/js/visualize/ui/StretchDropDownView.jsx

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ const HIPS_DATA_HEIGHT= 10000000000;`
`98`	`98`	`*`
`99`	`99`	`* @prop {number} dataMin`
`100`	`100`	`* @prop {number} dataMax`
`101`		`- * @prop {number} standardErr,`
	`101`	`+ * @prop {number} largeBinPercent,`
`102`	`102`	`* @prop {number} fitsFileSize`
`103`	`103`	`* @prop {number} fluxUnits`
`104`	`104`	`*/`