Implementation of multiple baseline-correction masks

ppernot · Nov 19, 2019 · 8bbd49c · 8bbd49c
1 parent 5fc6d2c
commit 8bbd49c
Show file tree

Hide file tree

Showing 7 changed files with 760 additions and 248 deletions.
diff --git a/data/data_ABC_IRF (copie).csv b/data/data_ABC_IRF (copie).csv
diff --git a/global.R b/global.R
@@ -25,7 +25,7 @@ for (lib in libs) {
       dependencies = TRUE,
       repos = "https://cran.univ-paris1.fr"
     )
-    library(lib, quietly = TRUE)
+    library(lib, character.only = TRUE, quietly = TRUE)
   }
 }
 

diff --git a/server.R b/server.R
@@ -16,6 +16,7 @@ function(input, output, session) {
   projConfig <- NULL
   S0_in <- NULL
   RawData <- NULL
+  masksBaseline <- c()
   masksDl <- c()
   masksWl <- c()
   Inputs <- reactiveValues()
@@ -30,6 +31,7 @@ function(input, output, session) {
     Inputs$wavlOrig = NULL
     Inputs$delayOrig = NULL
     Inputs$dlScaleFacOrig = NULL
+    Inputs$baselineMask = NA
     Inputs$delayMask = NA
     Inputs$wavlMask = NA
     Inputs$maskSpExp = NA

diff --git a/server_files/ALS.R b/server_files/ALS.R
@@ -1210,21 +1210,20 @@ output$alsOpt <- renderUI({
   }
 })
 
-output$alsResid1 <- renderPlot(
-  {
+output$alsResid1 <- renderPlot({
   if (is.null(alsOut <- doALS())) {
     return(NULL)
   }
 
   CS <- reshapeCS(alsOut$C, alsOut$S, ncol(alsOut$C))
 
-  if (isolate(input$useFiltered)) { # Choose SVD filtered matrix
+  if (isolate(input$useFiltered)) {
+    # Choose SVD filtered matrix
     s <- doSVD()
     CS1 <- reshapeCS(s$u, s$v, input$nSV)
     mat <- matrix(0,
                   nrow = length(Inputs$delay),
-                  ncol = length(Inputs$wavl)
-    )
+                  ncol = length(Inputs$wavl))
     for (ic in 1:input$nSV)
       mat <- mat + CS1$C[, ic] %o% CS1$S[, ic] * s$d[ic]
 
@@ -1235,27 +1234,24 @@ output$alsResid1 <- renderPlot(
   }
   plotDatavsMod(Inputs$delay, Inputs$wavl, mat,
                 CS$C, CS$S,
-                main = main
-  )
+                main = main)
 },
-height = plotHeight
-)
+height = plotHeight)
 
-output$alsResid3 <- renderPlot(
-  {
+output$alsResid3 <- renderPlot({
   if (is.null(alsOut <- doALS())) {
     return(NULL)
   }
 
   CS <- reshapeCS(alsOut$C, alsOut$S, ncol(alsOut$C))
 
-  if (isolate(input$useFiltered)) { # Choose SVD filtered matrix
+  if (isolate(input$useFiltered)) {
+    # Choose SVD filtered matrix
     s <- doSVD()
     CS1 <- reshapeCS(s$u, s$v, input$nSV)
     mat <- matrix(0,
                   nrow = length(Inputs$delay),
-                  ncol = length(Inputs$wavl)
-    )
+                  ncol = length(Inputs$wavl))
     for (ic in 1:input$nSV)
       mat <- mat + CS1$C[, ic] %o% CS1$S[, ic] * s$d[ic]
 
@@ -1266,27 +1262,24 @@ output$alsResid3 <- renderPlot(
   }
   plotResid(Inputs$delay, Inputs$wavl, mat,
             CS$C, CS$S,
-            main = main
-  )
+            main = main)
 },
-height = plotHeight
-)
+height = plotHeight)
 
-output$alsResid2 <- renderPlot(
-  {
+output$alsResid2 <- renderPlot({
   if (is.null(alsOut <- doALS())) {
     return(NULL)
   }
 
   CS <- reshapeCS(alsOut$C, alsOut$S, ncol(alsOut$C))
 
-  if (isolate(input$useFiltered)) { # Choose SVD filtered matrix
+  if (isolate(input$useFiltered)) {
+    # Choose SVD filtered matrix
     s <- doSVD()
     CS1 <- reshapeCS(s$u, s$v, input$nSV)
     mat <- matrix(0,
                   nrow = length(Inputs$delay),
-                  ncol = length(Inputs$wavl)
-    )
+                  ncol = length(Inputs$wavl))
     for (ic in 1:input$nSV)
       mat <- mat + CS1$C[, ic] %o% CS1$S[, ic] * s$d[ic]
 
@@ -1297,11 +1290,9 @@ output$alsResid2 <- renderPlot(
   }
   plotResidAna(Inputs$delay, Inputs$wavl, mat,
                CS$C, CS$S,
-               main = main
-  )
+               main = main)
 },
-height = plotHeight
-)
+height = plotHeight)
 
 rangesAlsKin <- reactiveValues(x = NULL, y = NULL)