From ce46a2cb2a39ed9622b7432ee42ed78186e4ebc0 Mon Sep 17 00:00:00 2001
From: "Fabian P. Schmidt" <kerel@mailbox.org>
Date: Sat, 20 Nov 2021 06:39:40 +0100
Subject: [PATCH] Rename OBS_DIR to SATNOGS_DOPPLER_OBS_DIR

Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
---
 GUIDE.md            | 10 +++++-----
 contrib/settings.py |  6 ++++--
 env-dist            |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/GUIDE.md b/GUIDE.md
index 3510b9a..ebc024b 100644
--- a/GUIDE.md
+++ b/GUIDE.md
@@ -25,14 +25,14 @@ Example:
 SATNOGS_TLE_DIR="./data/tles"
 
 # absulute frequency measurement storage
-# Filename convention: {OBS_DIR}/{observation_id}.txt
-SATNOGS_OBS_DIR="./data/obs"
+# Filename convention: {DOPPLER_OBS_DIR}/{observation_id}.txt
+SATNOGS_DOPPLER_OBS_DIR="./data/obs"
 
 # SATTOOLS/STRF/STVID sites.txt file
 SATNOGS_SITES_TXT="./data/sites.txt"
 
-mkdir -p $SATNOGS_TLE_DIR 
-mkdir -p $SATNOGS_OBS_DIR 
+mkdir -p $SATNOGS_TLE_DIR
+mkdir -p $SATNOGS_DOPPLER_OBS_DIR
 ```
 
 ## Usage
@@ -62,7 +62,7 @@ mkdir -p $SATNOGS_OBS_DIR
 
 2. Run rffit for orbit fitting, e.g.
    ```
-   ./rffit -d $SATNOGS_OBS_DIR/1102230.dat -i 44356 -c $SATNOGS_TLE_DIR/1102230.txt -s 7669
+   ./rffit -d $SATNOGS_DOPPLER_OBS_DIR/1102230.dat -i 44356 -c $SATNOGS_TLE_DIR/1102230.txt -s 7669
    ```
 
 ## Known issues
diff --git a/contrib/settings.py b/contrib/settings.py
index 9abbf7b..e88ce8e 100644
--- a/contrib/settings.py
+++ b/contrib/settings.py
@@ -5,8 +5,10 @@ from decouple import config
 TLE_DIR = config('SATNOGS_TLE_DIR')
 
 # absulute frequency measurement storage
-# Filename convention: {OBS_DIR}/{observation_id}.txt
-OBS_DIR = config('SATNOGS_OBS_DIR')
+# Filename convention: {DOPPLER_OBS_DIR}/{observation_id}.dat
+DOPPLER_OBS_DIR = config('SATNOGS_DOPPLER_OBS_DIR')
+# legacy name:
+OBS_DIR = DOPPLER_OBS_DIR
 
 # SATTOOLS/STRF/STVID sites.txt file
 SITES_TXT = config('SATNOGS_SITES_TXT')
diff --git a/env-dist b/env-dist
index f0da9a2..855c80b 100644
--- a/env-dist
+++ b/env-dist
@@ -4,7 +4,7 @@ SATNOGS_DIR=/my/path/to/satnogs/data
 
 # SatNOGS Waterfall Tabulation Helper
 SATNOGS_TLE_DIR=$SATNOGS_DIR/tles
-SATNOGS_OBS_DIR=$SATNOGS_DIR/doppler_obs
+SATNOGS_DOPPLER_OBS_DIR=$SATNOGS_DIR/doppler_obs
 SATNOGS_SITES_TXT=$SATNOGS_DIR/sites.txt