diff --git a/.vscode/launch.json b/.vscode/launch.json index c953e08f..c7890906 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -200,7 +200,7 @@ // Zero-sized seabird .log file in 2021.307.02 //"args": ["-v", "1", "--mission", "2022.094.01", "--noinput", "--local"], //"args": ["-v", "1", "--local", "--noinput"], - //"args": ["-v", "1", "--last_n_days", "80", "--clobber", "--noinput"] + //"args": ["-v", "1", "--last_n_days", "30", "--num_cores", "1", "--noinput"] //"args": ["-v", "1", "--mission", "2022.061.01", "--calibrate", "--noinput"], //"args": ["-v", "1", "--mission", "2022.061.01", "--align", "--noinput"], //"args": ["-v", "1", "--mission", "2022.061.01", "--resample", "--noinput"], @@ -213,7 +213,8 @@ //"args": ["-v", "1", "--mission", "2019.190.00", "--noinput", "--no_cleanup"], //"args": ["-v", "1", "--mission", "2018.065.02", "--noinput", "--no_cleanup"], //"args": ["-v", "1", "--mission", "2018.348.01", "--noinput", "--no_cleanup", "--clobber"], - "args": ["-v", "1", "--mission", "2024.324.00", "--noinput"], + //"args": ["-v", "1", "--mission", "2024.324.00", "--noinput"], + "args": ["-v", "1", "--mission", "2025.030.00", "--noinput"], }, { "name": "process_dorado", diff --git a/WORKFLOW.md b/WORKFLOW.md index be2cae49..d946c635 100644 --- a/WORKFLOW.md +++ b/WORKFLOW.md @@ -72,4 +72,4 @@ on the local file system's work directory is as follows: Copy the netCDF files to the archive directory. The archive directory is initally in the AUVCTD share on atlas which is shared with the data from the Dorado Gulper vehicle, but can also be on the M3 share - on titan near the original log data. + on thalassa near the original log data. diff --git a/src/data/archive.py b/src/data/archive.py index 80e27b49..05f7cd57 100755 --- a/src/data/archive.py +++ b/src/data/archive.py @@ -3,7 +3,7 @@ Archive processed data to relevant repositories. Use smb://atlas.shore.mbari.org/AUVCTD for STOQS loading. -Use smb://titan.shore.mbari.org/M3 for paring with original data. +Use smb://thalassa.shore.mbari.org/M3 for paring with original data. """ __author__ = "Mike McCann" diff --git a/src/data/calibrate.py b/src/data/calibrate.py index b6a67978..6dbff4c9 100755 --- a/src/data/calibrate.py +++ b/src/data/calibrate.py @@ -1118,6 +1118,7 @@ def _cal_date_xml_files( root.find("CalibrationDate").text[:-1], "%d-%b-%y", ).replace(tzinfo=timezone.utc) + else: error_message = ( f"Cannot parse CalibrationDate {root.find('CalibrationDate').text}" ) diff --git a/src/data/process.py b/src/data/process.py index 776bcc09..95b1b0d2 100755 --- a/src/data/process.py +++ b/src/data/process.py @@ -83,7 +83,7 @@ def __init__(self, vehicle, vehicle_dir, mount_dir, calibration_dir) -> None: # Variables to be set by subclasses, e.g.: # vehicle = "i2map" # vehicle_dir = "/Volumes/M3/master/i2MAP" - # mount_dir = "smb://titan.shore.mbari.org/M3" + # mount_dir = "smb://thalassa.shore.mbari.org/M3" self.vehicle = vehicle self.vehicle_dir = vehicle_dir self.mount_dir = mount_dir @@ -826,7 +826,7 @@ def process_command_line(self): VEHICLE = "i2map" VEHICLE_DIR = "/Volumes/M3/master/i2MAP" CALIBRATION_DIR = "/Volumes/DMO/MDUC_CORE_CTD_200103/Calibration Files" - MOUNT_DIR = "smb://titan.shore.mbari.org/M3" + MOUNT_DIR = "smb://thalassa.shore.mbari.org/M3" # Initialize for i2MAP processing, meant to be subclassed for other vehicles proc = Processor(VEHICLE, VEHICLE_DIR, MOUNT_DIR, CALIBRATION_DIR) diff --git a/src/data/process_i2map.py b/src/data/process_i2map.py index dede9746..e2517558 100755 --- a/src/data/process_i2map.py +++ b/src/data/process_i2map.py @@ -2,7 +2,7 @@ """ Scan master/i2MAP directory and process all missions found there -Find all the i2MAP missions in smb://titan.shore.mbari.org/M3/master/i2MAP +Find all the i2MAP missions in smb://thalassa.shore.mbari.org/M3/master/i2MAP and run the data through standard science data processing to calibrated, aligned, and resampled netCDF files. Use a standard set of processing options; more flexibility is available via the inndividual processing modules. @@ -32,7 +32,7 @@ class I2mapProcessor(Processor): VEHICLE = "i2map" VEHICLE_DIR = "/Volumes/M3/master/i2MAP" CALIBRATION_DIR = "/Volumes/DMO/MDUC_CORE_CTD_200103/Calibration Files" - MOUNT_DIR = "smb://titan.shore.mbari.org/M3" + MOUNT_DIR = "smb://thalassa.shore.mbari.org/M3" START_YEAR = 2017 proc = I2mapProcessor(VEHICLE, VEHICLE_DIR, MOUNT_DIR, CALIBRATION_DIR)