Moving rest analyses to new g.part5_analyseSegment function #687

wadpac · Sep 1, 2023 · b6e61da · b6e61da
1 parent 59887b0
commit b6e61da
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/R/g.part5.R b/R/g.part5.R
@@ -503,7 +503,8 @@ g.part5 = function(datadir = c(), metadatadir = c(), f0=c(), f1=c(),
                                                          fullFilename = fullfilenames[i],
                                                          add_one_day_to_next_date,
                                                          lightpeak_available, tail_expansion_log,
-                                                         foldernamei = foldername[i])
+                                                         foldernamei = foldername[i],
+                                                         sibreport = sibreport)
                             # Extract essential object to be used as input for the next 
                             # segment
                             indexlog = gas$indexlog
@@ -523,20 +524,6 @@ g.part5 = function(datadir = c(), metadatadir = c(), f0=c(), f1=c(),
                             ws3new = timeList$epochSize
                             if (doNext == TRUE) next
                           }
-                          #=======================================================
-                          # nap/sib/nonwear overlap analysis
-                          #=======================================================
-                          if (params_output[["do.sibreport"]]  == TRUE)  {
-                            # sibreport = sibreport_backup
-                            restAnalyses = g.part5.analyseRest(sibreport = sibreport, dsummary = dsummary,
-                                                ds_names = ds_names, fi = fi, di = di,
-                                                time = ts$time[sse[ts$diur[sse] == 0]],
-                                                tz = params_general[["desiredtz"]])
-                            fi = restAnalyses$fi
-                            di = restAnalyses$di
-                            dsummary = restAnalyses$dsummary
-                            ds_names = restAnalyses$ds_names
-                          }
                           #===============================================
                           # FOLDER STRUCTURE
                           if (params_output[["storefolderstructure"]] == TRUE) {

diff --git a/R/g.part5_analyseSegment.R b/R/g.part5_analyseSegment.R
@@ -10,7 +10,7 @@ g.part5_analyseSegment = function(indexlog, timeList, levelList,
                                   add_one_day_to_next_date,
                                   lightpeak_available,
                                   tail_expansion_log,
-                                  foldernamei) {
+                                  foldernamei, sibreport) {
   # unpack list objects:
   # indexlog
   fileIndex = indexlog$fileIndex
@@ -449,6 +449,19 @@ g.part5_analyseSegment = function(indexlog, timeList, levelList,
         fi = fi + length(luxperseg$values)
       }
     }
+    #=======================================================
+    # nap/sib/nonwear overlap analysis
+    #=======================================================
+    if (params_output[["do.sibreport"]]  == TRUE)  {
+      restAnalyses = g.part5.analyseRest(sibreport = sibreport, dsummary = dsummary,
+                                         ds_names = ds_names, fi = fi, di = si,
+                                         time = ts$time[sse[ts$diur[sse] == 0]],
+                                         tz = params_general[["desiredtz"]])
+      fi = restAnalyses$fi
+      si = restAnalyses$di
+      dsummary = restAnalyses$dsummary
+      ds_names = restAnalyses$ds_names
+    }
     #===============================================
     # FOLDER STRUCTURE
     if (params_output[["storefolderstructure"]] == TRUE) {