...

Author: miloswrath

code/core/acc_new.R

@@ -101,7 +101,7 @@ main <- function() {
           windowsizes = c(5, 900, 3600),
 
           # ==== Part 2: Non-wear detection ====
-          ignorenonwear = TRUE,
+          ignorenonwear = FALSE,
 
           # ==== Part 3: Sleep detection ====
           # Uncomment the below if using external sleep log:

code/core/gg.py

@@ -17,7 +17,11 @@ 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):
         """

code/logs/log.txt

@@ -8,6 +8,16 @@ conda activate act
 
 # Move to project home dir
 cd "$(dirname "$0")"
+# grab any new code changes, otherwise skip
+git pull --ff-only origin main
 
 # run pipe
 cd code && python main.py 1 "DE4E2DB72778DACA9B8848574107D2F5"
+
+#move back to home dir
+cd ..
+
+# commit and push made changes
+git add .
+git commit -m "automated commit by vosslab linux"
+git push