From 8f74d3f3b77dd7bc7b00b78688201f1e577e2cf3 Mon Sep 17 00:00:00 2001
From: JulioV <JulioV@users.noreply.github.com>
Date: Wed, 28 Oct 2020 14:03:02 -0400
Subject: [PATCH] Minor updates to config and Snakefile

---
 Snakefile   |  2 +-
 config.yaml | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Snakefile b/Snakefile
index ec60d9ae..9c91e7ae 100644
--- a/Snakefile
+++ b/Snakefile
@@ -132,7 +132,7 @@ for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():
 
 for provider in config["PHONE_LOCATIONS"]["PROVIDERS"].keys():
     if config["PHONE_LOCATIONS"]["PROVIDERS"][provider]["COMPUTE"]:
-        if config["PHONE_LOCATIONS"]["LOCATIONS_TO_USE"] == "RESAMPLE_FUSED":
+        if config["PHONE_LOCATIONS"]["LOCATIONS_TO_USE"] == "FUSED_RESAMPLED":
             if "PHONE_LOCATIONS" in config["PHONE_VALID_SENSED_BINS"]["PHONE_SENSORS"]:
                 files_to_compute.extend(expand("data/interim/{pid}/phone_sensed_bins.csv", pid=config["PIDS"]))
             else:
diff --git a/config.yaml b/config.yaml
index f4e63518..7b07564c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,5 +1,5 @@
 # Participants to include in the analysis
-# You must create a file for each participant named pXXX containing their device_id. This can be done manually or automatically
+# You must create a participant file per person manually or automatically (see PARTICIPANT_FILES below)
 PIDS: [test01]
 
 # Use tz codes from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. Double check your code, for example EST is not US Eastern Time.
@@ -9,7 +9,7 @@ TIMEZONE: &timezone
 DATABASE_GROUP: &database_group
   MY_GROUP
 
-# run 'snakemake -j1 create_participants_files'
+# To create your participant files from the aware_device table or a csv file change config below and run 'snakemake -j1 create_participants_files'
 CREATE_PARTICIPANT_FILES:
   SOURCE:
     TYPE: AWARE_DEVICE_TABLE #AWARE_DEVICE_TABLE or CSV_FILE
@@ -256,12 +256,12 @@ PHONE_CONVERSATION:
 ################################################################################
 
 FITBIT_HEARTRATE:
-  TABLE_FORMAT: JSON # JSON or CSV
+  TABLE_FORMAT: JSON # JSON or CSV. If your JSON or CSV data are files change [SENSOR_DATA][FITBIT][SOURCE][TYPE] to FILES
   TABLE:
     JSON: fitbit_heartrate
     CSV:
-      SUMMARY: heartrate_summary.csv
-      INTRADAY: heartrate_intraday.csv
+      SUMMARY: heartrate_summary
+      INTRADAY: heartrate_intraday
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -273,12 +273,12 @@ FITBIT_HEARTRATE:
 
 
 FITBIT_STEPS:
-  TABLE_FORMAT: JSON # JSON or CSV
+  TABLE_FORMAT: JSON # JSON or CSV. If your JSON or CSV data are files change [SENSOR_DATA][FITBIT][SOURCE][TYPE] to FILES
   TABLE:
     JSON: fitbit_steps
     CSV:
-      SUMMARY: steps_summary.csv
-      INTRADAY: steps_intraday.csv
+      SUMMARY: steps_summary
+      INTRADAY: steps_intraday
   EXCLUDE_SLEEP: # you can exclude sleep periods from the step features computation
     EXCLUDE: False
     TYPE: FIXED # FIXED OR FITBIT_BASED (configure FITBIT_SLEEP section)
@@ -297,12 +297,12 @@ FITBIT_STEPS:
       INCLUDE_ZERO_STEP_ROWS: False
 
 FITBIT_SLEEP:
-  TABLE_FORMAT: JSON # JSON or CSV
+  TABLE_FORMAT: JSON # JSON or CSV. If your JSON or CSV data are files change [SENSOR_DATA][FITBIT][SOURCE][TYPE] to FILES
   TABLE:
     JSON: fitbit_sleep
     CSV:
-      SUMMARY: sleep_summary.csv
-      INTRADAY: sleep_intraday.csv
+      SUMMARY: sleep_summary
+      INTRADAY: sleep_intraday
   PROVIDERS:
     RAPIDS:
       COMPUTE: False
@@ -310,12 +310,12 @@ FITBIT_SLEEP:
       SUMMARY_FEATURES: ["sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgefficiency", "countepisode"]
 
 FITBIT_CALORIES:
-  TABLE_FORMAT: JSON # JSON or CSV
+  TABLE_FORMAT: JSON # JSON or CSV. If your JSON or CSV data are files change [SENSOR_DATA][FITBIT][SOURCE][TYPE] to FILES
   TABLE:
     JSON: fitbit_calories
     CSV:
-      SUMMARY: calories_summary.csv
-      INTRADAY: calories_intraday.csv
+      SUMMARY: calories_summary
+      INTRADAY: calories_intraday
   PROVIDERS:
     RAPIDS:
       COMPUTE: False