From 54c718b542c705c513db3a79ce1174d7185dab2a Mon Sep 17 00:00:00 2001
From: Arjo Segers <Arjo.Segers@tno.nl>
Date: Fri, 10 Apr 2026 09:22:51 +0200
Subject: [PATCH] Updated template settings.

---
 config/Copernicus/cso-s5p-no2.rc       |  4 +++
 config/Copernicus/cso-user-settings.rc |  4 +--
 config/Copernicus/cso.rc               | 39 +++++++++++++++-----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/config/Copernicus/cso-s5p-no2.rc b/config/Copernicus/cso-s5p-no2.rc
index 4cc36ed..aec12a1 100644
--- a/config/Copernicus/cso-s5p-no2.rc
+++ b/config/Copernicus/cso-s5p-no2.rc
@@ -33,6 +33,10 @@
 cso.s5p.no2.inquire-table-dataspace.timerange.start        :  ${my.full-timerange.start}
 cso.s5p.no2.inquire-table-dataspace.timerange.end          :  ${my.full-timerange.end}
 
+!! TESTING: target time range only:
+!cso.s5p.no2.inquire-table-dataspace.timerange.start        :  ${my.timerange.start}
+!cso.s5p.no2.inquire-table-dataspace.timerange.end          :  ${my.timerange.end}
+
 ! API url:
 cso.s5p.no2.inquire-table-dataspace.url                    :  https://stac.dataspace.copernicus.eu/v1
 
diff --git a/config/Copernicus/cso-user-settings.rc b/config/Copernicus/cso-user-settings.rc
index b7252fe..407f165 100644
--- a/config/Copernicus/cso-user-settings.rc
+++ b/config/Copernicus/cso-user-settings.rc
@@ -90,8 +90,8 @@ my.region.figsize               :   (8,5)
 !----------------------------------------------------------
 
 ! full range, used for inquiry jobs:
-my.full-timerange.start         :  2018-01-01 00:00
-my.full-timerange.end           :  2024-12-31 23:59
+my.full-timerange.start         :  2018-04-01 00:00
+my.full-timerange.end           :  2025-12-31 23:59
 
 ! processing for selected period:
 my.timerange.start              :  2018-06-01 00:00
diff --git a/config/Copernicus/cso.rc b/config/Copernicus/cso.rc
index 684eb52..5950905 100644
--- a/config/Copernicus/cso.rc
+++ b/config/Copernicus/cso.rc
@@ -6,10 +6,6 @@
 !!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! dummy keys, actual values defined in environment by "cso" script:
-CSO_RCFILE            :  
-CSO_RCDIR             :  
-
 
 !----------------------------------------------------------
 ! user specific settings:
@@ -215,18 +211,26 @@ cso.s5p.TRACER.sim-gridded-catalogue.index.args      :  '${my.work}/rc/cso-s5p-T
 ! run jobs in foreground:
 *.script.class                      :  utopya.UtopyaJobScriptForeground
 
-! search path for python modules:
-*.pypath                            :  ${my.work}/py
-        
 ! work directory for jobs; 
 ! here path including subdirectories for job name elements:
 *.workdir                           :  ${my.work}/__NAME2PATH__
 
-! jobtree settings from this file:
-*.rcfile                            :  ${my.work}/rc/cso.rc
+! read the jobtree settings from the file written by the "cso.copy" job,
+! only the "cso.copy" job itself will use the file passed as argument to the "cso" script:
+*.rcfile                            :  ${main.copy.rcwrite}
 
+! dummy value, will be defined when running in virtrual environment:
+VIRTUAL_ENV                         :
+! running in virutual envionment?
+#if "${VIRTUAL_ENV}" > ""
+! interpretor from virtual enviornment, the system path is set automatically:
+*.shell                             :  ${VIRTUAL_ENV}/bin/python3
+#else
 ! script interpreter:
 *.shell                             :  /usr/bin/env python3
+! search path for python modules:
+*.pypath                            :  ${CSO_PREFIX}/src:${CSO_PREFIX}/src/utopya:${CSO_PREFIX}/src/cso
+#endif
 
 
 !----------------------------------------------------------
@@ -247,10 +251,8 @@ cso.copy.script.class             :  utopya.UtopyaJobScriptForeground
 ! this task will copy it to the workdir:
 cso.copy.rcfile                   :  ${CSO_RCFILE}
 
-! search path to utopya modules;
-! the 'build.utopya' job will create a copy on the workdir
-! for which the path is included in the '*.pypath' setting:
-cso.copy.pypath                   :  ${CSO_PREFIX}/py
+! search path to utopya modules:
+cso.copy.pypath                   :  ${CSO_PREFIX}/src
 
 ! configure and build:
 cso.copy.task.class               :  utopya.UtopyaCopy
@@ -272,7 +274,7 @@ main.copy.new                 :  False
 
 ! sub directories to be included ;
 ! leave empty if no subdirs are defined:
-main.copy.subdirs             :  py rc
+main.copy.subdirs             :  rc
 
 ! directories to be inlcuded in copy,
 ! otherwise only files are copied:
@@ -280,15 +282,18 @@ main.copy.incdirs             :
 
 ! list of source directories to be copied;
 ! files in latest directory overwrite previously copied versions:
-main.copy.dirs                :  ${CSO_PREFIX}
-
-! extra directories to be copied into "rc":
+!main.copy.dirs                :  ${CSO_PREFIX}
+main.copy.dirs                :  
+!~ also copy settings to "rc":
 main.copy.rc.dirs             :  ${CSO_RCDIR}
 
 ! skip files matching these filename patterns
 ! (tempoary editor files, compiled modules, etc)
 main.copy.skip                :  .#* *~  .DS* *.pyc
 
+! write evaluated rcfile:
+main.copy.rcwrite             :  ${my.work}/cso.rc
+
 
 !----------------------------------------------------------
 ! end
-- 
GitLab