ITS: scene1_1 lists --> immutables for _CONSTANTS
Mostly replacements for [R, G, B] to (R, G, B)
files affected:
test_ae_af.py
test_burst_sameness_manual.py
test_dng_noise_model.py
test_locked_burst.py
test_param_exposure_time.py
test_param_noise_reduction.py
bug: 256213057
Change-Id: I6cefbb2ecebb2653ff8fc90483528cf55cb4caf9
diff --git a/apps/CameraITS/tests/scene1_1/test_ae_af.py b/apps/CameraITS/tests/scene1_1/test_ae_af.py
index 128e3a0..5240c84 100644
--- a/apps/CameraITS/tests/scene1_1/test_ae_af.py
+++ b/apps/CameraITS/tests/scene1_1/test_ae_af.py
@@ -30,9 +30,9 @@
_G_GAIN = 1.0
_G_GAIN_TOL = 0.05
_NAME = os.path.splitext(os.path.basename(__file__))[0]
-_THREE_A_STATES = {'AE': [True, False, True],
- 'AF': [False, True, True],
- 'FULL_3A': [True, True, True]} # note no AWB solo
+_THREE_A_STATES = {'AE': (True, False, True),
+ 'AF': (False, True, True),
+ 'FULL_3A': (True, True, True)} # note no AWB solo
class SingleATest(its_base_test.ItsBaseTest):
diff --git a/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py b/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
index ae9534a..40e8370 100644
--- a/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
+++ b/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
@@ -30,7 +30,7 @@
_API_LEVEL_30 = 30
_BURST_LEN = 50
-_COLORS = ['R', 'G', 'B']
+_COLORS = ('R', 'G', 'B')
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_NUM_BURSTS = 2
_PATCH_H = 0.1 # center 10%
diff --git a/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py b/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
index 6084da5..502f80b 100644
--- a/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
+++ b/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
@@ -28,7 +28,7 @@
import its_session_utils
-_BAYER_LIST = ['R', 'GR', 'GB', 'B']
+_BAYER_COLORS = ('R', 'GR', 'GB', 'B')
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_NUM_STEPS = 4
_PATCH_H = 0.02 # center 2%
@@ -104,10 +104,10 @@
# Test each raw color channel (R, GR, GB, B)
noise_profile = cap['metadata']['android.sensor.noiseProfile']
- if len(noise_profile) != len(_BAYER_LIST):
+ if len(noise_profile) != len(_BAYER_COLORS):
raise AssertionError(
f'noise_profile wrong length! {len(noise_profile)}')
- for i, ch in enumerate(_BAYER_LIST):
+ for i, ch in enumerate(_BAYER_COLORS):
# Get the noise model parameters for this channel of this shot.
s, o = noise_profile[cfa_idxs[i]]
@@ -153,7 +153,7 @@
# plot data and models
pylab.figure(_NAME)
- for i, ch in enumerate(_BAYER_LIST):
+ for i, ch in enumerate(_BAYER_COLORS):
pylab.plot(sens_valid, var_exp[i], 'rgkb'[i], label=ch+' expected')
pylab.plot(sens_valid, var_meas[i], 'rgkb'[i]+'.--', label=ch+' measured')
pylab.title(_NAME)
@@ -164,7 +164,7 @@
matplotlib.pyplot.savefig(f'{name_with_log_path}_plot.png')
# PASS/FAIL check
- for i, ch in enumerate(_BAYER_LIST):
+ for i, ch in enumerate(_BAYER_COLORS):
var_diffs = [abs(var_meas[i][j] - var_exp[i][j])
for j in range(len(sens_valid))]
logging.debug('%s variance diffs: %s', ch, str(var_diffs))
diff --git a/apps/CameraITS/tests/scene1_1/test_locked_burst.py b/apps/CameraITS/tests/scene1_1/test_locked_burst.py
index 9c44680..4603841 100644
--- a/apps/CameraITS/tests/scene1_1/test_locked_burst.py
+++ b/apps/CameraITS/tests/scene1_1/test_locked_burst.py
@@ -25,7 +25,7 @@
import its_session_utils
_BURST_LEN = 8
-_COLORS = ['R', 'G', 'B']
+_COLORS = ('R', 'G', 'B')
_FPS_MAX_DIFF = 2.0
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_PATCH_H = 0.1 # center 10%
diff --git a/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py b/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
index 36294bd..8f090d6 100644
--- a/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
+++ b/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
@@ -27,8 +27,8 @@
import its_session_utils
import target_exposure_utils
-_COLORS = ['R', 'G', 'B']
-_EXP_MULT_FACTORS = [0.8, 0.9, 1.0, 1.1, 1.2] # vary exposure +/- 20%
+_COLORS = ('R', 'G', 'B')
+_EXP_MULT_FACTORS = (0.8, 0.9, 1.0, 1.1, 1.2) # vary exposure +/- 20%
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_PATCH_H = 0.1 # center 10%
_PATCH_W = 0.1
diff --git a/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py b/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
index 0c0d3fa..81904c6 100644
--- a/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
+++ b/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
@@ -28,7 +28,7 @@
import its_session_utils
import target_exposure_utils
-_COLORS = ['R', 'G', 'B']
+_COLORS = ('R', 'G', 'B')
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_NR_MODES = {'OFF': 0, 'FAST': 1, 'HQ': 2, 'MIN': 3, 'ZSL': 4}
_NR_MODES_LIST = list(_NR_MODES.values())
