From 414ff7a5a4056644f605d99ea337c0b7865aea01 Mon Sep 17 00:00:00 2001
From: Sam Kagan <skagan@nrao.edu>
Date: Mon, 2 Oct 2023 13:44:37 -0600
Subject: [PATCH] Fixed minor hiccups in running std_cal locally
---
.../pexable/casa_envoy/casa_envoy/launchers.py | 9 ++++-----
docker.properties | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/apps/cli/executables/pexable/casa_envoy/casa_envoy/launchers.py b/apps/cli/executables/pexable/casa_envoy/casa_envoy/launchers.py
index 318d9c618..9597796e7 100644
--- a/apps/cli/executables/pexable/casa_envoy/casa_envoy/launchers.py
+++ b/apps/cli/executables/pexable/casa_envoy/casa_envoy/launchers.py
@@ -20,16 +20,15 @@ import json
import logging
import os
import pathlib
+import re
import subprocess
import sys
from typing import Dict, Union
-import re
-
from casa_envoy.auditor import AuditDirectories, AuditFiles
+from casa_envoy.configure import CasaConfigure, ParallelRunner, StandardRunner
from casa_envoy.enums import ProductType
-from casa_envoy.foundation import RestoreFoundation, GeneralFoundation, CubeFoundation
-from casa_envoy.configure import StandardRunner, ParallelRunner, CasaConfigure
+from casa_envoy.foundation import CubeFoundation, GeneralFoundation, RestoreFoundation
from casa_envoy.interfaces import LauncherIF
from casa_envoy.schema import AbstractTextFile
@@ -98,7 +97,7 @@ class CasaLauncher:
# directly from the processing directory. Account for both cases
vela_path = (
"./vela"
- if pathlib.Path("./vela").exists()
+ if (pathlib.Path.cwd() / "vela").exists()
else f"/lustre/aoc/cluster/pipeline/{os.environ.get('CAPO_PROFILE')}/workspaces/sbin/vela"
)
subprocess.run([vela_path, "-f", metadata, ppr, "--" + run_type])
diff --git a/docker.properties b/docker.properties
index 935303efa..d689fafb7 100644
--- a/docker.properties
+++ b/docker.properties
@@ -65,7 +65,7 @@ edu.nrao.workspaces.DeliverySettings.standardImageDelivery = /lustre/aoc/cluster
#
edu.nrao.workspaces.ProductFetcherSettings.locatorServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/location?locator
edu.nrao.workspaces.ProductFetcherSettings.metadataServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/product/metadata
-edu.nrao.workspaces.ProductFetcherSettings.defaultThreadsPerHost = 4
+edu.nrao.workspaces.ProductFetcherSettings.defaultThreadsPerHost = 1
edu.nrao.workspaces.ProductFetcherSettings.executionSite = local_test
#
--
GitLab