From 9b7bcb8ce0f5427200b2abaa4f218572a5262154 Mon Sep 17 00:00:00 2001 From: Markus Zehner Date: Fri, 3 Nov 2023 14:31:20 +0100 Subject: [PATCH 1/3] Examine function adapted to Draco module settings This is a current fix for me, but the Installing of GAMMA might be different on other machines as well: trying to get the version with the call in line 396 with GAMMA_SOFTWARE- was in conflict as the path on my end is /apps/GAMMA_SOFTWARE/VERSION So the call returned an error and GAMMA was not usable --- pyroSAR/examine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyroSAR/examine.py b/pyroSAR/examine.py index 7ae1b13c..ac08379d 100644 --- a/pyroSAR/examine.py +++ b/pyroSAR/examine.py @@ -393,7 +393,7 @@ def __init__(self): setattr(self, 'home', home_sys) else: raise RuntimeError('could not read GAMMA installation directory') - self.version = re.search('GAMMA_SOFTWARE-(?P[0-9]{8})', + self.version = re.search('GAMMA_SOFTWARE/(?P[0-9]{8})', getattr(self, 'home')).group('version') try: From e8a2d51129db8b86be183031d2aeea2c29496866 Mon Sep 17 00:00:00 2001 From: Markus Zehner Date: Mon, 6 Nov 2023 17:13:21 +0100 Subject: [PATCH 2/3] Update ExamineGamma for deviating install path --- pyroSAR/examine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyroSAR/examine.py b/pyroSAR/examine.py index ac08379d..660bb1d4 100644 --- a/pyroSAR/examine.py +++ b/pyroSAR/examine.py @@ -393,7 +393,7 @@ def __init__(self): setattr(self, 'home', home_sys) else: raise RuntimeError('could not read GAMMA installation directory') - self.version = re.search('GAMMA_SOFTWARE/(?P[0-9]{8})', + self.version = re.search('GAMMA_SOFTWARE[-/](?P[0-9]{8})', getattr(self, 'home')).group('version') try: From 67fd0c9fbe742aa17c6b0b87e6ad016934255b8e Mon Sep 17 00:00:00 2001 From: Markus Zehner Date: Mon, 6 Nov 2023 17:33:37 +0100 Subject: [PATCH 3/3] Installation note on GAMMA_HOME pattern --- docs/source/general/installation.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/source/general/installation.rst b/docs/source/general/installation.rst index f41eb56b..cf7a9dac 100644 --- a/docs/source/general/installation.rst +++ b/docs/source/general/installation.rst @@ -130,3 +130,8 @@ To test `pysqlite2` you can import it as follows and then run the test above: Installing this package is likely to cause problems with the `sqlite3` library installed on the system. Thus, it is safer to build a static `sqlite3` library for it (see installation script). + +GAMMA +----- +GAMMA's home directory as environment variable 'GAMMA_HOME' is expected to end either as GAMMA_SOFTWARE- or GAMMA_SOFTWARE/. +If this differs in your install and cannot be changed, a workaround is adjusting the expected pattern in :class:`~pyroSAR.examine.ExamineGamma`.