created issue #1036 to work on merge code, this push works without th…

…e merge code
NOAA-GSL · Aug 3, 2023 · 0d632ce · 0d632ce
1 parent 9785030
commit 0d632ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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