Merge pull request #357 from Caltech-IPAC/DM-10149-PeriodogramIssues

DM-10149 fix the phase value range of phase folded chart
Caltech-IPAC · Apr 20, 2017 · 7bedf61 · 7bedf61
2 parents 2fba617 + e5387a7
commit 7bedf61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/firefly/html/firefly.html b/src/firefly/html/firefly.html
@@ -21,7 +21,7 @@
                 options : {
                     MenuItemKeys: {maskOverlay:true},
                     catalogSpacialOp: 'polygonWhenPlotExist',
-                    charts: {chartEngine: ''}
+                    charts: {chartEngine: 'plotly'}
                 }
             }
         };

diff --git a/src/firefly/js/templates/lightcurve/LcPeriodPlotly.jsx b/src/firefly/js/templates/lightcurve/LcPeriodPlotly.jsx
@@ -340,8 +340,8 @@ class PhaseFoldingChart extends Component {
                     //color: 'blue',
                     color: 'rgba(63, 127, 191, 0.5)'
                 },
-                x: data.map((d) => d[0]),
-                y: data.map((d) => d[1]),
+                x: data&&data.map((d) => d[0]),
+                y: data&&data.map((d) => d[1]),
                 hoverinfo: 'text'
             }],
             plotlyLayout: {

diff --git a/src/firefly/js/templates/lightcurve/LcPhaseTable.js b/src/firefly/js/templates/lightcurve/LcPhaseTable.js
@@ -75,7 +75,7 @@ export function doPFCalculate(flux, time, period, tzero) {
  */
 export function getPhase(time, timeZero, period,  dec=DEC_PHASE) {
     var q = (time - timeZero)/period;
-    var p = q >= 0  ? (q - Math.floor(q)) : (q + Math.floor(-q));
+    var p = q >= 0  ? (q - Math.floor(q)) : (q + Math.floor(-q) + 1.0);
 
     return p.toFixed(dec);
 }