Skip to content

fix temporary file collision (again) #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samfranklin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix temporary file collision (again) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a1220
add back in fix from Cathy Jin contributed in PR https://github.com/r…
samfranklin Aug 29, 2024
f173dba
bump release number to 4.0.6
samfranklin Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arcsilib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

ARCSI_VERSION_MAJOR = 4
ARCSI_VERSION_MINOR = 0
ARCSI_VERSION_PATCH = 5
ARCSI_VERSION_PATCH = 6

ARCSI_VERSION = f"{ARCSI_VERSION_MAJOR}.{ARCSI_VERSION_MINOR}.{ARCSI_VERSION_PATCH}"
ARCSI_VERSION_OBJ = LooseVersion(ARCSI_VERSION)
Expand Down
32 changes: 12 additions & 20 deletions arcsilib/arcsisensorsentinel2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2748,10 +2748,11 @@ def convertImageToRadiance(
img_band11_tmp = None
img_band12_tmp = None

basename = self.generateOutputBaseName() # use a basename which has the generation time for uniqueness

if abs(self.ratiometric_offs_B1) > 0:
basename = os.path.splitext(os.path.basename(img_band02))[0]
img_band02_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B02_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B1}"
rsgislib.imagecalc.image_math(
Expand All @@ -2760,9 +2761,8 @@ def convertImageToRadiance(
img_band02 = img_band02_tmp

if abs(self.ratiometric_offs_B2) > 0:
basename = os.path.splitext(os.path.basename(img_band03))[0]
img_band03_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B03_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B2}"
rsgislib.imagecalc.image_math(
Expand All @@ -2771,9 +2771,8 @@ def convertImageToRadiance(
img_band03 = img_band03_tmp

if abs(self.ratiometric_offs_B3) > 0:
basename = os.path.splitext(os.path.basename(img_band04))[0]
img_band04_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B04_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B3}"
rsgislib.imagecalc.image_math(
Expand All @@ -2782,9 +2781,8 @@ def convertImageToRadiance(
img_band04 = img_band04_tmp

if abs(self.ratiometric_offs_B4) > 0:
basename = os.path.splitext(os.path.basename(img_band05))[0]
img_band05_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B05_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B4}"
rsgislib.imagecalc.image_math(
Expand All @@ -2793,9 +2791,8 @@ def convertImageToRadiance(
img_band05 = img_band05_tmp

if abs(self.ratiometric_offs_B5) > 0:
basename = os.path.splitext(os.path.basename(img_band06))[0]
img_band06_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B06_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B5}"
rsgislib.imagecalc.image_math(
Expand All @@ -2804,9 +2801,8 @@ def convertImageToRadiance(
img_band06 = img_band06_tmp

if abs(self.ratiometric_offs_B6) > 0:
basename = os.path.splitext(os.path.basename(img_band07))[0]
img_band07_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B07_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B6}"
rsgislib.imagecalc.image_math(
Expand All @@ -2815,9 +2811,8 @@ def convertImageToRadiance(
img_band07 = img_band07_tmp

if abs(self.ratiometric_offs_B7) > 0:
basename = os.path.splitext(os.path.basename(img_band08))[0]
img_band08_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B08_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B7}"
rsgislib.imagecalc.image_math(
Expand All @@ -2826,9 +2821,8 @@ def convertImageToRadiance(
img_band08 = img_band08_tmp

if abs(self.ratiometric_offs_B8) > 0:
basename = os.path.splitext(os.path.basename(img_band08A))[0]
img_band08A_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B08A_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B8}"
rsgislib.imagecalc.image_math(
Expand All @@ -2837,9 +2831,8 @@ def convertImageToRadiance(
img_band08A = img_band08A_tmp

if abs(self.ratiometric_offs_B11) > 0:
basename = os.path.splitext(os.path.basename(img_band11))[0]
img_band11_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B11_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B11}"
rsgislib.imagecalc.image_math(
Expand All @@ -2848,9 +2841,8 @@ def convertImageToRadiance(
img_band11 = img_band11_tmp

if abs(self.ratiometric_offs_B12) > 0:
basename = os.path.splitext(os.path.basename(img_band12))[0]
img_band12_tmp = os.path.join(
outputPath, f"{basename}_tmpoffapply.kea"
outputPath, f"{basename}_B12_tmpoffapply.kea"
)
exp = f"b1 + {self.ratiometric_offs_B12}"
rsgislib.imagecalc.image_math(
Expand Down