automated commit by vosslab linux

Author: miloswrath

code/core/acc_new.R

@@ -22,10 +22,20 @@ main <- function() {
   # Assign variables
   ProjectDir <- opt$project_dir
   ProjectDerivDir <- opt$deriv_dir
+  last_folder <- basename(ProjectDir)
+  
+  # Determine correct filename
+  if (last_folder == "act-obs-test") {
+    SleepLog <- normalizePath(file.path(ProjectDir, "sleep_log_observational.csv"), mustWork = FALSE)
+  } else if (last_folder == "act-int-test") {
+    SleepLog <- normalizePath(file.path(ProjectDir, "sleep_log_intervention.csv"), mustWork = FALSE)
+  } else {
+    stop("Unrecognized project directory. Exiting.")
+  }
 
-  # Print values to verify
   print(paste("Project Directory:", ProjectDir))
   print(paste("Derivatives Directory:", ProjectDerivDir))
+  print(paste("Sleep Log Location:", SleepLog))
 
   # Helper functions
   SubjectGGIRDeriv <- function(x) {
@@ -91,7 +101,7 @@ main <- function() {
           overwrite = FALSE,
           desiredtz = "America/Chicago",
           print.filename = TRUE,
-          idloc = 2,
+          idloc = 6,
 
           # ==== Part 1: Data loading and basic signal processing ====
           do.report = c(2, 4, 5, 6),
@@ -104,11 +114,10 @@ main <- function() {
           ignorenonwear = FALSE,
 
           # ==== Part 3: Sleep detection ====
-          # Uncomment the below if using external sleep log:
-          # loglocation = "/mnt/nfs/lss/vosslabhpc/Projects/BOOST/InterventionStudy/3-experiment/data/act-int-test/sleep.csv",
-          # colid = 1,
-          # coln1 = 2,
-          # sleepwindowType = "SPT",
+           loglocation = SleepLog,
+           colid = 1,
+           coln1 = 2,
+           sleepwindowType = "TimeInBed",
 
           # ==== Part 4: Physical activity summaries ====
           timewindow = c("WW", "MM", "OO"),

code/core/gg.py

@@ -17,11 +17,7 @@ def __init__(self, matched, intdir, obsdir):
         self.matched = matched
         self.INTDIR = intdir.rstrip('/') + '/'
         self.OBSDIR = obsdir.rstrip('/') + '/'
-<<<<<<< HEAD
-        self.DERIVATIVES = "derivatives/GGIR-3.2.6-test/"  # Defined within the class
-=======
         self.DERIVATIVES = "derivatives/GGIR-3.2.6-test-ncp/"  # Defined within the class
->>>>>>> 980cb432186a05579a47e1f97a030b68b7e1c741
 
     def run_gg(self):
         """