From 0d632ce06dd508dc839282cc26ab441664dfbdaf Mon Sep 17 00:00:00 2001 From: gopa-noaa Date: Thu, 3 Aug 2023 21:15:31 +0000 Subject: [PATCH] created issue #1036 to work on merge code, this push works without the merge code --- apps/cb-ceiling/server/dataFunctions/data_dieoff.js | 6 +++--- apps/cb-ceiling/server/dataFunctions/data_series.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/cb-ceiling/server/dataFunctions/data_dieoff.js b/apps/cb-ceiling/server/dataFunctions/data_dieoff.js index 21481acdbb..f5f2ac9518 100644 --- a/apps/cb-ceiling/server/dataFunctions/data_dieoff.js +++ b/apps/cb-ceiling/server/dataFunctions/data_dieoff.js @@ -200,8 +200,8 @@ dataDieoff = function (plotParams, plotFunction) { } else { // send to matsMiddle // TODO - remove orioginal MW TimeSeries - // const tss = new matsMiddleDieoff.MatsMiddleDieoff(cbPool); - const tss = new matsMiddleTsDieoff.MatsMiddleTsDieoff(cbPool); + const tss = new matsMiddleDieoff.MatsMiddleDieoff(cbPool); + // const tss = new matsMiddleTsDieoff.MatsMiddleTsDieoff(cbPool); // TODO - remove logToFile = true assignment tss.logToFile = true; @@ -212,7 +212,7 @@ dataDieoff = function (plotParams, plotFunction) { model, null, threshold, - null, + // null, fromSecs, toSecs, validTimes, diff --git a/apps/cb-ceiling/server/dataFunctions/data_series.js b/apps/cb-ceiling/server/dataFunctions/data_series.js index 93ce84dba3..a67e378093 100644 --- a/apps/cb-ceiling/server/dataFunctions/data_series.js +++ b/apps/cb-ceiling/server/dataFunctions/data_series.js @@ -166,8 +166,8 @@ dataSeries = function (plotParams, plotFunction) { } else { // send to matsMiddle // TODO - remove orioginal MW TimeSeries - const tss = new matsMiddleTsDieoff.MatsMiddleTsDieoff(cbPool); - // const tss = new matsMiddleTimeSeries.MatsMiddleTimeSeries(cbPool); + // const tss = new matsMiddleTsDieoff.MatsMiddleTsDieoff(cbPool); + const tss = new matsMiddleTimeSeries.MatsMiddleTimeSeries(cbPool); // TODO - remove logToFile = true assignment tss.logToFile = true; const rows = tss.processStationQuery( @@ -179,9 +179,9 @@ dataSeries = function (plotParams, plotFunction) { average, fromSecs, toSecs, - validTimes, - null, - null + validTimes + // null, + // null ); // send the query statement to the query function