Skip to content

Commit 50829d8

Browse files
committed
Improve case consistency on various definitions.
1 parent d5c4b36 commit 50829d8

3 files changed

Lines changed: 45 additions & 45 deletions

File tree

aces_1.0.0/python/aces_ocio/aces_config.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
'ACES_OCIO_CONFIGURATION_DIRECTORY_ENVIRON',
4242
'set_config_default_roles',
4343
'write_config',
44-
'generate_OCIO_transform',
44+
'generate_ocio_transform',
4545
'add_colorspace_aliases',
4646
'add_look',
4747
'integrate_looks_into_views',
@@ -160,7 +160,7 @@ def write_config(config, config_path, sanity_check=True):
160160
fp.write(config.serialize())
161161

162162

163-
def generate_OCIO_transform(transforms):
163+
def generate_ocio_transform(transforms):
164164
"""
165165
Object description.
166166
@@ -339,7 +339,7 @@ def add_colorspace_aliases(config,
339339

340340
if colorspace.to_reference_transforms:
341341
print('\tGenerating To-Reference transforms')
342-
ocio_transform = generate_OCIO_transform(
342+
ocio_transform = generate_ocio_transform(
343343
[{'type': 'colorspace',
344344
'src': colorspace.name,
345345
'dst': reference_colorspace.name,
@@ -350,7 +350,7 @@ def add_colorspace_aliases(config,
350350

351351
if colorspace.from_reference_transforms:
352352
print('\tGenerating From-Reference transforms')
353-
ocio_transform = generate_OCIO_transform(
353+
ocio_transform = generate_ocio_transform(
354354
[{'type': 'colorspace',
355355
'src': reference_colorspace.name,
356356
'dst': colorspace.name,
@@ -405,7 +405,7 @@ def add_look(config,
405405
if look_cccid:
406406
keys['cccid'] = look_cccid
407407

408-
ocio_transform = generate_OCIO_transform([keys])
408+
ocio_transform = generate_ocio_transform([keys])
409409
ocio_look.setTransform(ocio_transform)
410410

411411
config.addLook(ocio_look)
@@ -644,15 +644,15 @@ def create_config(config_data,
644644

645645
if colorspace.to_reference_transforms:
646646
print('\tGenerating To-Reference transforms')
647-
ocio_transform = generate_OCIO_transform(
647+
ocio_transform = generate_ocio_transform(
648648
colorspace.to_reference_transforms)
649649
ocio_colorspace.setTransform(
650650
ocio_transform,
651651
ocio.Constants.COLORSPACE_DIR_TO_REFERENCE)
652652

653653
if colorspace.from_reference_transforms:
654654
print('\tGenerating From-Reference transforms')
655-
ocio_transform = generate_OCIO_transform(
655+
ocio_transform = generate_ocio_transform(
656656
colorspace.from_reference_transforms)
657657
ocio_colorspace.setTransform(
658658
ocio_transform,

aces_1.0.0/python/aces_ocio/colorspaces/red.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
__email__ = 'aces@oscars.org'
2323
__status__ = 'Production'
2424

25-
__all__ = ['create_RED_log_film',
25+
__all__ = ['create_red_log_film',
2626
'create_colorspaces']
2727

2828

29-
def create_RED_log_film(gamut,
29+
def create_red_log_film(gamut,
3030
transfer_function,
3131
lut_directory,
3232
lut_resolution_1d,
@@ -168,105 +168,105 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
168168
colorspaces = []
169169

170170
# Full conversion
171-
RED_log_film_dragon = create_RED_log_film(
171+
red_log_film_dragon = create_red_log_film(
172172
'DRAGONcolor',
173173
'REDlogFilm',
174174
lut_directory,
175175
lut_resolution_1d,
176176
['rlf_dgn'])
177-
colorspaces.append(RED_log_film_dragon)
177+
colorspaces.append(red_log_film_dragon)
178178

179-
RED_log_film_dragon2 = create_RED_log_film(
179+
red_log_film_dragon2 = create_red_log_film(
180180
'DRAGONcolor2',
181181
'REDlogFilm',
182182
lut_directory,
183183
lut_resolution_1d,
184184
['rlf_dgn2'])
185-
colorspaces.append(RED_log_film_dragon2)
185+
colorspaces.append(red_log_film_dragon2)
186186

187-
RED_log_film_color = create_RED_log_film(
187+
red_log_film_color = create_red_log_film(
188188
'REDcolor',
189189
'REDlogFilm',
190190
lut_directory,
191191
lut_resolution_1d,
192192
['rlf_rc'])
193-
colorspaces.append(RED_log_film_color)
193+
colorspaces.append(red_log_film_color)
194194

195-
RED_log_film_color2 = create_RED_log_film(
195+
red_log_film_color2 = create_red_log_film(
196196
'REDcolor2',
197197
'REDlogFilm',
198198
lut_directory,
199199
lut_resolution_1d,
200200
['rlf_rc2'])
201-
colorspaces.append(RED_log_film_color2)
201+
colorspaces.append(red_log_film_color2)
202202

203-
RED_log_film_color3 = create_RED_log_film(
203+
red_log_film_color3 = create_red_log_film(
204204
'REDcolor3',
205205
'REDlogFilm',
206206
lut_directory,
207207
lut_resolution_1d,
208208
['rlf_rc3'])
209-
colorspaces.append(RED_log_film_color3)
209+
colorspaces.append(red_log_film_color3)
210210

211-
RED_log_film_color4 = create_RED_log_film(
211+
red_log_film_color4 = create_red_log_film(
212212
'REDcolor4',
213213
'REDlogFilm',
214214
lut_directory,
215215
lut_resolution_1d,
216216
['rlf_rc4'])
217-
colorspaces.append(RED_log_film_color4)
217+
colorspaces.append(red_log_film_color4)
218218

219219
# Linearization only
220-
RED_log_film = create_RED_log_film(
220+
red_log_film = create_red_log_film(
221221
'',
222222
'REDlogFilm',
223223
lut_directory,
224224
lut_resolution_1d,
225225
['crv_rlf'])
226-
colorspaces.append(RED_log_film)
226+
colorspaces.append(red_log_film)
227227

228228
# Primaries only
229-
RED_dragon = create_RED_log_film(
229+
RED_dragon = create_red_log_film(
230230
'DRAGONcolor',
231231
'',
232232
lut_directory,
233233
lut_resolution_1d,
234234
['lin_dgn'])
235235
colorspaces.append(RED_dragon)
236236

237-
RED_dragon2 = create_RED_log_film(
237+
RED_dragon2 = create_red_log_film(
238238
'DRAGONcolor2',
239239
'',
240240
lut_directory,
241241
lut_resolution_1d,
242242
['lin_dgn2'])
243243
colorspaces.append(RED_dragon2)
244244

245-
RED_color = create_RED_log_film(
245+
RED_color = create_red_log_film(
246246
'REDcolor',
247247
'',
248248
lut_directory,
249249
lut_resolution_1d,
250250
['lin_rc'])
251251
colorspaces.append(RED_color)
252252

253-
RED_color2 = create_RED_log_film(
253+
RED_color2 = create_red_log_film(
254254
'REDcolor2',
255255
'',
256256
lut_directory,
257257
lut_resolution_1d,
258258
['lin_rc2'])
259259
colorspaces.append(RED_color2)
260260

261-
RED_color3 = create_RED_log_film(
261+
RED_color3 = create_red_log_film(
262262
'REDcolor3',
263263
'',
264264
lut_directory,
265265
lut_resolution_1d,
266266
['lin_rc3'])
267267
colorspaces.append(RED_color3)
268268

269-
RED_color4 = create_RED_log_film(
269+
RED_color4 = create_red_log_film(
270270
'REDcolor4',
271271
'',
272272
lut_directory,

aces_1.0.0/python/aces_ocio/colorspaces/sony.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
__email__ = 'aces@oscars.org'
2323
__status__ = 'Production'
2424

25-
__all__ = ['create_S_Log',
25+
__all__ = ['create_s_log',
2626
'create_colorspaces']
2727

2828

29-
def create_S_Log(gamut,
29+
def create_s_log(gamut,
3030
transfer_function,
3131
lut_directory,
3232
lut_resolution_1d,
@@ -232,7 +232,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
232232
colorspaces = []
233233

234234
# *S-Log1*
235-
s_log1_s_gamut = create_S_Log(
235+
s_log1_s_gamut = create_s_log(
236236
'S-Gamut',
237237
'S-Log1',
238238
lut_directory,
@@ -241,23 +241,23 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
241241
colorspaces.append(s_log1_s_gamut)
242242

243243
# *S-Log2*
244-
s_log2_s_gamut = create_S_Log(
244+
s_log2_s_gamut = create_s_log(
245245
'S-Gamut',
246246
'S-Log2',
247247
lut_directory,
248248
lut_resolution_1d,
249249
['slog2_sgamut'])
250250
colorspaces.append(s_log2_s_gamut)
251251

252-
s_log2_s_gamut_daylight = create_S_Log(
252+
s_log2_s_gamut_daylight = create_s_log(
253253
'S-Gamut Daylight',
254254
'S-Log2',
255255
lut_directory,
256256
lut_resolution_1d,
257257
['slog2_sgamutday'])
258258
colorspaces.append(s_log2_s_gamut_daylight)
259259

260-
s_log2_s_gamut_tungsten = create_S_Log(
260+
s_log2_s_gamut_tungsten = create_s_log(
261261
'S-Gamut Tungsten',
262262
'S-Log2',
263263
lut_directory,
@@ -266,15 +266,15 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
266266
colorspaces.append(s_log2_s_gamut_tungsten)
267267

268268
# *S-Log3*
269-
s_log3_s_gamut3Cine = create_S_Log(
269+
s_log3_s_gamut3Cine = create_s_log(
270270
'S-Gamut3.Cine',
271271
'S-Log3',
272272
lut_directory,
273273
lut_resolution_1d,
274274
['slog3_sgamutcine'])
275275
colorspaces.append(s_log3_s_gamut3Cine)
276276

277-
s_log3_s_gamut3 = create_S_Log(
277+
s_log3_s_gamut3 = create_s_log(
278278
'S-Gamut3',
279279
'S-Log3',
280280
lut_directory,
@@ -283,23 +283,23 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
283283
colorspaces.append(s_log3_s_gamut3)
284284

285285
# Linearization Only
286-
s_log1 = create_S_Log(
286+
s_log1 = create_s_log(
287287
'',
288288
'S-Log1',
289289
lut_directory,
290290
lut_resolution_1d,
291291
['crv_slog1'])
292292
colorspaces.append(s_log1)
293293

294-
s_log2 = create_S_Log(
294+
s_log2 = create_s_log(
295295
'',
296296
'S-Log2',
297297
lut_directory,
298298
lut_resolution_1d,
299299
['crv_slog2'])
300300
colorspaces.append(s_log2)
301301

302-
s_log3 = create_S_Log(
302+
s_log3 = create_s_log(
303303
'',
304304
'S-Log3',
305305
lut_directory,
@@ -308,39 +308,39 @@ def create_colorspaces(lut_directory, lut_resolution_1d):
308308
colorspaces.append(s_log3)
309309

310310
# Primaries Only
311-
s_gamut = create_S_Log(
311+
s_gamut = create_s_log(
312312
'S-Gamut',
313313
'',
314314
lut_directory,
315315
lut_resolution_1d,
316316
['lin_sgamut'])
317317
colorspaces.append(s_gamut)
318318

319-
s_gamut_daylight = create_S_Log(
319+
s_gamut_daylight = create_s_log(
320320
'S-Gamut Daylight',
321321
'',
322322
lut_directory,
323323
lut_resolution_1d,
324324
['lin_sgamutday'])
325325
colorspaces.append(s_gamut_daylight)
326326

327-
s_gamut_tungsten = create_S_Log(
327+
s_gamut_tungsten = create_s_log(
328328
'S-Gamut Tungsten',
329329
'',
330330
lut_directory,
331331
lut_resolution_1d,
332332
['lin_sgamuttung'])
333333
colorspaces.append(s_gamut_tungsten)
334334

335-
s_gamut3Cine = create_S_Log(
335+
s_gamut3Cine = create_s_log(
336336
'S-Gamut3.Cine',
337337
'',
338338
lut_directory,
339339
lut_resolution_1d,
340340
['lin_sgamut3cine'])
341341
colorspaces.append(s_gamut3Cine)
342342

343-
s_gamut3 = create_S_Log(
343+
s_gamut3 = create_s_log(
344344
'S-Gamut3',
345345
'',
346346
lut_directory,

0 commit comments

Comments
 (0)