From d22e3dacc67672da22f1682b6692d8138526f403 Mon Sep 17 00:00:00 2001
From: Florez Ospina Juan Felipe <juan.florez-ospina@psi.ch>
Date: Sun, 22 Jun 2025 15:15:03 +0200
Subject: [PATCH] Update to naming of network_drive as network_mount (includes
 both server name and share). when run locally, network mount defaults to data
 folder

---
 README.md               | 4 ++--
 campaignDescriptor.yaml | 9 ++++-----
 docker-compose.yaml     | 6 ++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index da89907..6d1a589 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ This toolkit includes a containerized JupyterLab environment for executing the d
 5. Start the environment:
 
 - **Locally without network drive mount:**
-
+   Regardless of value in .env, `NETWORK_MOUNT` defaults to `<your-repo-name>/data/`.
   ```bash
   docker compose up idear_processor
 
@@ -104,7 +104,7 @@ This toolkit includes a containerized JupyterLab environment for executing the d
   docker compose up idear_processor_networked
 
 6. Access:
-   - **Jupyter Lab**: [http://localhost:8889/lab/tree/](http://localhost:8889/lab/tree/)
+   - **Jupyter Lab**: [http://localhost:8889/lab/](http://localhost:8889/lab/)
 
 7. Stop the app:
    In the previously open PowerShell terminal, enter:
diff --git a/campaignDescriptor.yaml b/campaignDescriptor.yaml
index b327c7f..a0ce06d 100644
--- a/campaignDescriptor.yaml
+++ b/campaignDescriptor.yaml
@@ -2,11 +2,10 @@
 # Configuration for FAIR Data Integration Pipeline
 # ------------------------------------------------------------------------------
 
-# INPUT DATA DIRECTORY
 # Can be a local or network path. Examples:
-#   - Local: '../data/data_folder/' # manually create data_folder/ with instrument folders
-#   - Network: /mnt/network_drive/data_folder (Docker)
-input_file_directory: '/mnt/network_drive/Data'
+#   - Local: '../data/data_folder/' # All paths must be relative to folder ../data/
+#   - Network: /mnt/network_drive/data_folder or equivalently  ${NETWORK_MOUNT}/data_folder 
+input_file_directory: '/mnt/network_mount/Data'
 
 # OUTPUT DATA DIRECTORY
 # Always relative to notebook location. If run from `notebooks/`,
@@ -30,7 +29,7 @@ dataset_startdate: 'YYYY-MM-DD'
 dataset_enddate: 'YYYY-MM-DD'
 
 # Data processing level (typically '0', '1', or '2'; follows ACTRIS or custom standards)
-actris_level: '1'
+actris_level: '0'
 
 # ------------------------------------------------------------------------------
 # Output File Naming Convention (Optional)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 17bfe39..9c7a022 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,6 +6,7 @@ services:
     restart: unless-stopped
     environment:
       - DOCKER_CONTAINER=1
+      - NETWORK_MOUNT=/mnt/network_mount
     ports:
       - "${JUPYTER_PORT:-8889}:8888"
     volumes:
@@ -13,7 +14,7 @@ services:
       - ./figures:/idear/figures
       - ./notebooks:/idear/notebooks
       - ./scripts:/idear/scripts
-      - network_drive:/mnt/network_drive:rw
+      - network_mount:/mnt/network_mount:rw
     command: >
       bash -c "
       jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --allow-root --NotebookApp.token='${JUPYTER_TOKEN:-my-token}'
@@ -26,6 +27,7 @@ services:
     restart: unless-stopped
     environment:
       - DOCKER_CONTAINER=1
+      - NETWORK_MOUNT=/idear/data
     ports:
       - "${JUPYTER_PORT:-8889}:8888"
     volumes:
@@ -38,7 +40,7 @@ services:
       - local-only
 
 volumes:
-  network_drive:
+  network_mount:
     driver_opts:
       type: cifs
       o: "username=${CIFS_USER},password=${CIFS_PASS},vers=3.0"