Skip to content

Commit fef5efa

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.4.7' into develop
2 parents 094a45c + 2c7caa8 commit fef5efa

File tree

2 files changed

+306
-296
lines changed

2 files changed

+306
-296
lines changed

‎colour/colorimetry/datasets/illuminants/chromaticity_coordinates.py‎

Lines changed: 160 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -110,58 +110,61 @@
110110
CCS_ILLUMINANTS_CIE_STANDARD_OBSERVER_2_DEGREE_CIE1931: CanonicalMapping = (
111111
CanonicalMapping(
112112
{
113-
"A": np.array([0.44758, 0.40745]),
114-
"B": np.array([0.34842, 0.35161]),
115-
"C": np.array([0.31006, 0.31616]),
116-
"D50": np.array([0.34570, 0.35850]),
117-
"D55": np.array([0.33243, 0.34744]),
118-
"D60": np.array([0.321616709705268, 0.337619916550817]),
119-
"D65": np.array([0.31270, 0.32900]),
120-
"D75": np.array([0.29903, 0.31488]),
121-
"E": np.array([1 / 3, 1 / 3]),
122-
"FL1": np.array([0.31310, 0.33710]),
123-
"FL2": np.array([0.37210, 0.37510]),
124-
"FL3": np.array([0.40910, 0.39410]),
125-
"FL4": np.array([0.44020, 0.40310]),
126-
"FL5": np.array([0.31380, 0.34520]),
127-
"FL6": np.array([0.37790, 0.38820]),
128-
"FL7": np.array([0.31290, 0.32920]),
129-
"FL8": np.array([0.34580, 0.35860]),
130-
"FL9": np.array([0.37410, 0.37270]),
131-
"FL10": np.array([0.34580, 0.35880]),
132-
"FL11": np.array([0.38050, 0.37690]),
133-
"FL12": np.array([0.43700, 0.40420]),
134-
"FL3.1": np.array([0.44070, 0.40330]),
135-
"FL3.2": np.array([0.38080, 0.37340]),
136-
"FL3.3": np.array([0.31530, 0.34390]),
137-
"FL3.4": np.array([0.44290, 0.40430]),
138-
"FL3.5": np.array([0.37490, 0.36720]),
139-
"FL3.6": np.array([0.34880, 0.36000]),
140-
"FL3.7": np.array([0.43840, 0.40450]),
141-
"FL3.8": np.array([0.38200, 0.38320]),
142-
"FL3.9": np.array([0.34990, 0.35910]),
143-
"FL3.10": np.array([0.34550, 0.35600]),
144-
"FL3.11": np.array([0.32450, 0.34340]),
145-
"FL3.12": np.array([0.43770, 0.40370]),
146-
"FL3.13": np.array([0.38300, 0.37240]),
147-
"FL3.14": np.array([0.34470, 0.36090]),
148-
"FL3.15": np.array([0.31270, 0.32880]),
149-
"HP1": np.array([0.53300, 0.4150]),
150-
"HP2": np.array([0.47780, 0.41580]),
151-
"HP3": np.array([0.43020, 0.40750]),
152-
"HP4": np.array([0.38120, 0.37970]),
153-
"HP5": np.array([0.37760, 0.37130]),
154-
"LED-B1": np.array([0.45600, 0.40780]),
155-
"LED-B2": np.array([0.43570, 0.40120]),
156-
"LED-B3": np.array([0.37560, 0.37230]),
157-
"LED-B4": np.array([0.34220, 0.35020]),
158-
"LED-B5": np.array([0.31180, 0.32360]),
159-
"LED-BH1": np.array([0.44740, 0.40660]),
160-
"LED-RGB1": np.array([0.45570, 0.42110]),
161-
"LED-V1": np.array([0.45480, 0.40440]),
162-
"LED-V2": np.array([0.37810, 0.37750]),
163-
"ID65": np.array([0.310656625403120, 0.330663091836953]),
164-
"ID50": np.array([0.343211370103531, 0.360207541805137]),
113+
illuminant: np.array(coordinates)
114+
for illuminant, coordinates in {
115+
"A": [0.44758, 0.40745],
116+
"B": [0.34842, 0.35161],
117+
"C": [0.31006, 0.31616],
118+
"D50": [0.34570, 0.35850],
119+
"D55": [0.33243, 0.34744],
120+
"D60": [0.321616709705268, 0.337619916550817],
121+
"D65": [0.31270, 0.32900],
122+
"D75": [0.29903, 0.31488],
123+
"E": [1 / 3, 1 / 3],
124+
"FL1": [0.31310, 0.33710],
125+
"FL2": [0.37210, 0.37510],
126+
"FL3": [0.40910, 0.39410],
127+
"FL4": [0.44020, 0.40310],
128+
"FL5": [0.31380, 0.34520],
129+
"FL6": [0.37790, 0.38820],
130+
"FL7": [0.31290, 0.32920],
131+
"FL8": [0.34580, 0.35860],
132+
"FL9": [0.37410, 0.37270],
133+
"FL10": [0.34580, 0.35880],
134+
"FL11": [0.38050, 0.37690],
135+
"FL12": [0.43700, 0.40420],
136+
"FL3.1": [0.44070, 0.40330],
137+
"FL3.2": [0.38080, 0.37340],
138+
"FL3.3": [0.31530, 0.34390],
139+
"FL3.4": [0.44290, 0.40430],
140+
"FL3.5": [0.37490, 0.36720],
141+
"FL3.6": [0.34880, 0.36000],
142+
"FL3.7": [0.43840, 0.40450],
143+
"FL3.8": [0.38200, 0.38320],
144+
"FL3.9": [0.34990, 0.35910],
145+
"FL3.10": [0.34550, 0.35600],
146+
"FL3.11": [0.32450, 0.34340],
147+
"FL3.12": [0.43770, 0.40370],
148+
"FL3.13": [0.38300, 0.37240],
149+
"FL3.14": [0.34470, 0.36090],
150+
"FL3.15": [0.31270, 0.32880],
151+
"HP1": [0.53300, 0.4150],
152+
"HP2": [0.47780, 0.41580],
153+
"HP3": [0.43020, 0.40750],
154+
"HP4": [0.38120, 0.37970],
155+
"HP5": [0.37760, 0.37130],
156+
"LED-B1": [0.45600, 0.40780],
157+
"LED-B2": [0.43570, 0.40120],
158+
"LED-B3": [0.37560, 0.37230],
159+
"LED-B4": [0.34220, 0.35020],
160+
"LED-B5": [0.31180, 0.32360],
161+
"LED-BH1": [0.44740, 0.40660],
162+
"LED-RGB1": [0.45570, 0.42110],
163+
"LED-V1": [0.45480, 0.40440],
164+
"LED-V2": [0.37810, 0.37750],
165+
"ID65": [0.310656625403120, 0.330663091836953],
166+
"ID50": [0.343211370103531, 0.360207541805137],
167+
}.items()
165168
}
166169
)
167170
)
@@ -235,25 +238,31 @@
235238
CCS_ILLUMINANTS_ISO_STANDARD_OBSERVER_2_DEGREE_CIE1931: CanonicalMapping = (
236239
CanonicalMapping(
237240
{
238-
"ISO 7589 Photographic Daylight": np.array(
239-
[0.332039098470978, 0.347263885596614]
240-
),
241-
"ISO 7589 Sensitometric Daylight": np.array(
242-
[0.333818313227557, 0.353436231513603]
243-
),
244-
"ISO 7589 Studio Tungsten": np.array(
245-
[0.430944089109761, 0.403585442674295]
246-
),
247-
"ISO 7589 Sensitometric Studio Tungsten": np.array(
248-
[0.431418223648390, 0.407471441950342]
249-
),
250-
"ISO 7589 Photoflood": np.array([0.411146015714843, 0.393719378241161]),
251-
"ISO 7589 Sensitometric Photoflood": np.array(
252-
[0.412024776908998, 0.398177410548532]
253-
),
254-
"ISO 7589 Sensitometric Printer": np.array(
255-
[0.412087967973680, 0.421104984758526]
256-
),
241+
illuminant: np.array(coordinates)
242+
for illuminant, coordinates in {
243+
"ISO 7589 Photographic Daylight": [
244+
0.332039098470978,
245+
0.347263885596614,
246+
],
247+
"ISO 7589 Sensitometric Daylight": [
248+
0.333818313227557,
249+
0.353436231513603,
250+
],
251+
"ISO 7589 Studio Tungsten": [0.430944089109761, 0.403585442674295],
252+
"ISO 7589 Sensitometric Studio Tungsten": [
253+
0.431418223648390,
254+
0.407471441950342,
255+
],
256+
"ISO 7589 Photoflood": [0.411146015714843, 0.393719378241161],
257+
"ISO 7589 Sensitometric Photoflood": [
258+
0.412024776908998,
259+
0.398177410548532,
260+
],
261+
"ISO 7589 Sensitometric Printer": [
262+
0.412087967973680,
263+
0.421104984758526,
264+
],
265+
}.items()
257266
}
258267
)
259268
)
@@ -281,58 +290,61 @@
281290
CCS_ILLUMINANTS_CIE_STANDARD_OBSERVER_10_DEGREE_CIE1964: CanonicalMapping = (
282291
CanonicalMapping(
283292
{
284-
"A": np.array([0.45117, 0.40594]),
285-
"B": np.array([0.34980, 0.35270]),
286-
"C": np.array([0.31039, 0.31905]),
287-
"D50": np.array([0.34773, 0.35952]),
288-
"D55": np.array([0.33412, 0.34877]),
289-
"D60": np.array([0.322986926715820, 0.339275732345997]),
290-
"D65": np.array([0.31382, 0.33100]),
291-
"D75": np.array([0.29968, 0.31740]),
292-
"E": np.array([1 / 3, 1 / 3]),
293-
"FL1": np.array([0.31811, 0.33559]),
294-
"FL2": np.array([0.37925, 0.36733]),
295-
"FL3": np.array([0.41761, 0.38324]),
296-
"FL4": np.array([0.44920, 0.39074]),
297-
"FL5": np.array([0.31975, 0.34246]),
298-
"FL6": np.array([0.38660, 0.37847]),
299-
"FL7": np.array([0.31569, 0.32960]),
300-
"FL8": np.array([0.34902, 0.35939]),
301-
"FL9": np.array([0.37829, 0.37045]),
302-
"FL10": np.array([0.35090, 0.35444]),
303-
"FL11": np.array([0.38541, 0.37123]),
304-
"FL12": np.array([0.44256, 0.39717]),
305-
"FL3.1": np.array([0.449830684010003, 0.390231404321266]),
306-
"FL3.2": np.array([0.386924116672933, 0.365756034732821]),
307-
"FL3.3": np.array([0.321176986855865, 0.340501092654981]),
308-
"FL3.4": np.array([0.448121275113995, 0.397077112142482]),
309-
"FL3.5": np.array([0.377814166608895, 0.366625766963060]),
310-
"FL3.6": np.array([0.351976478983504, 0.361094432889677]),
311-
"FL3.7": np.array([0.444309208810922, 0.396791387314871]),
312-
"FL3.8": np.array([0.387588931999771, 0.376305569410173]),
313-
"FL3.9": np.array([0.354688990710449, 0.353445033593383]),
314-
"FL3.10": np.array([0.349344792334400, 0.354984421140869]),
315-
"FL3.11": np.array([0.329267975695120, 0.338865386643537]),
316-
"FL3.12": np.array([0.442252080438001, 0.401220551071252]),
317-
"FL3.13": np.array([0.386275268780817, 0.374283190950586]),
318-
"FL3.14": np.array([0.347255078638291, 0.366808242504180]),
319-
"FL3.15": np.array([0.314613997909246, 0.333377149377113]),
320-
"HP1": np.array([0.543334600247307, 0.405289298480431]),
321-
"HP2": np.array([0.482647330648721, 0.410815644179685]),
322-
"HP3": np.array([0.435560034503954, 0.398801084399711]),
323-
"HP4": np.array([0.385193641123543, 0.368275479241015]),
324-
"HP5": np.array([0.380316415606638, 0.366617114797851]),
325-
"LED-B1": np.array([0.462504966271043, 0.403041801546906]),
326-
"LED-B2": np.array([0.442119475258745, 0.396633702892576]),
327-
"LED-B3": np.array([0.380851979328052, 0.368518548904765]),
328-
"LED-B4": np.array([0.348371362473402, 0.345065503264192]),
329-
"LED-B5": np.array([0.316916877024753, 0.322060276350364]),
330-
"LED-BH1": np.array([0.452772610754910, 0.400032462750000]),
331-
"LED-RGB1": np.array([0.457036370583652, 0.425381348780888]),
332-
"LED-V1": np.array([0.453602699414564, 0.398199587905174]),
333-
"LED-V2": np.array([0.377728483834020, 0.374512315539769]),
334-
"ID65": np.array([0.312074043269908, 0.332660121024630]),
335-
"ID50": np.array([0.345621427535976, 0.361228962209198]),
293+
illuminant: np.array(coordinates)
294+
for illuminant, coordinates in {
295+
"A": [0.45117, 0.40594],
296+
"B": [0.34980, 0.35270],
297+
"C": [0.31039, 0.31905],
298+
"D50": [0.34773, 0.35952],
299+
"D55": [0.33412, 0.34877],
300+
"D60": [0.322986926715820, 0.339275732345997],
301+
"D65": [0.31382, 0.33100],
302+
"D75": [0.29968, 0.31740],
303+
"E": [1 / 3, 1 / 3],
304+
"FL1": [0.31811, 0.33559],
305+
"FL2": [0.37925, 0.36733],
306+
"FL3": [0.41761, 0.38324],
307+
"FL4": [0.44920, 0.39074],
308+
"FL5": [0.31975, 0.34246],
309+
"FL6": [0.38660, 0.37847],
310+
"FL7": [0.31569, 0.32960],
311+
"FL8": [0.34902, 0.35939],
312+
"FL9": [0.37829, 0.37045],
313+
"FL10": [0.35090, 0.35444],
314+
"FL11": [0.38541, 0.37123],
315+
"FL12": [0.44256, 0.39717],
316+
"FL3.1": [0.449830684010003, 0.390231404321266],
317+
"FL3.2": [0.386924116672933, 0.365756034732821],
318+
"FL3.3": [0.321176986855865, 0.340501092654981],
319+
"FL3.4": [0.448121275113995, 0.397077112142482],
320+
"FL3.5": [0.377814166608895, 0.366625766963060],
321+
"FL3.6": [0.351976478983504, 0.361094432889677],
322+
"FL3.7": [0.444309208810922, 0.396791387314871],
323+
"FL3.8": [0.387588931999771, 0.376305569410173],
324+
"FL3.9": [0.354688990710449, 0.353445033593383],
325+
"FL3.10": [0.349344792334400, 0.354984421140869],
326+
"FL3.11": [0.329267975695120, 0.338865386643537],
327+
"FL3.12": [0.442252080438001, 0.401220551071252],
328+
"FL3.13": [0.386275268780817, 0.374283190950586],
329+
"FL3.14": [0.347255078638291, 0.366808242504180],
330+
"FL3.15": [0.314613997909246, 0.333377149377113],
331+
"HP1": [0.543334600247307, 0.405289298480431],
332+
"HP2": [0.482647330648721, 0.410815644179685],
333+
"HP3": [0.435560034503954, 0.398801084399711],
334+
"HP4": [0.385193641123543, 0.368275479241015],
335+
"HP5": [0.380316415606638, 0.366617114797851],
336+
"LED-B1": [0.462504966271043, 0.403041801546906],
337+
"LED-B2": [0.442119475258745, 0.396633702892576],
338+
"LED-B3": [0.380851979328052, 0.368518548904765],
339+
"LED-B4": [0.348371362473402, 0.345065503264192],
340+
"LED-B5": [0.316916877024753, 0.322060276350364],
341+
"LED-BH1": [0.452772610754910, 0.400032462750000],
342+
"LED-RGB1": [0.457036370583652, 0.425381348780888],
343+
"LED-V1": [0.453602699414564, 0.398199587905174],
344+
"LED-V2": [0.377728483834020, 0.374512315539769],
345+
"ID65": [0.312074043269908, 0.332660121024630],
346+
"ID50": [0.345621427535976, 0.361228962209198],
347+
}.items()
336348
}
337349
)
338350
)
@@ -348,25 +360,31 @@
348360
CCS_ILLUMINANTS_ISO_STANDARD_OBSERVER_10_DEGREE_CIE1964: CanonicalMapping = (
349361
CanonicalMapping(
350362
{
351-
"ISO 7589 Photographic Daylight": np.array(
352-
[0.333716908394534, 0.348592494683065]
353-
),
354-
"ISO 7589 Sensitometric Daylight": np.array(
355-
[0.336125906007630, 0.354997062476417]
356-
),
357-
"ISO 7589 Studio Tungsten": np.array(
358-
[0.434575926493196, 0.402219691745325]
359-
),
360-
"ISO 7589 Sensitometric Studio Tungsten": np.array(
361-
[0.435607674215215, 0.406129244796761]
362-
),
363-
"ISO 7589 Photoflood": np.array([0.414144647169611, 0.392458587686395]),
364-
"ISO 7589 Sensitometric Photoflood": np.array(
365-
[0.415625819190627, 0.397002292994179]
366-
),
367-
"ISO 7589 Sensitometric Printer": np.array(
368-
[0.418841052206998, 0.418695130974955]
369-
),
363+
illuminant: np.array(coordinates)
364+
for illuminant, coordinates in {
365+
"ISO 7589 Photographic Daylight": [
366+
0.333716908394534,
367+
0.348592494683065,
368+
],
369+
"ISO 7589 Sensitometric Daylight": [
370+
0.336125906007630,
371+
0.354997062476417,
372+
],
373+
"ISO 7589 Studio Tungsten": [0.434575926493196, 0.402219691745325],
374+
"ISO 7589 Sensitometric Studio Tungsten": [
375+
0.435607674215215,
376+
0.406129244796761,
377+
],
378+
"ISO 7589 Photoflood": [0.414144647169611, 0.392458587686395],
379+
"ISO 7589 Sensitometric Photoflood": [
380+
0.415625819190627,
381+
0.397002292994179,
382+
],
383+
"ISO 7589 Sensitometric Printer": [
384+
0.418841052206998,
385+
0.418695130974955,
386+
],
387+
}.items()
370388
}
371389
)
372390
)

0 commit comments

Comments
 (0)