Cycles / Sky Texture:

* Added a new sky model by Hosek and Wilkie: "An Analytic Model for Full Spectral Sky-Dome Radiance" http://cgg.mff.cuni.cz/projects/SkylightModelling/ Example render: http://archive.dingto.org/2013/blender/code/new_sky_model.png Documentation: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Sky_Texture Details: * User can choose between the older Preetham and the new Hosek / Wilkie model via a dropdown. For older files, backwards compatibility is preserved. When we add a new Sky texture, it defaults to the new model though. * For the new model, you can specify the ground albedo (see documentation for details). * Turbidity now has a UI soft range between 1 and 10, higher values (up to 30) are still possible, but can result in weird colors or black. * Removed the limitation of 1 sky texture per SVM stack. (Patch by Lukas Tönne, thanks!) Thanks to Brecht for code review and some help! This is part of my GSoC 2013 project, SVN merge of r59214, r59220, r59251 and r59601.
author: Thomas Dinges <blender@dingto.org> 2013-08-28 18:11:28 +0400
committer: Thomas Dinges <blender@dingto.org> 2013-08-28 18:11:28 +0400
commit: d539bd46729b3cdb85483f34f4aa362f2b64195a (patch)
tree: 9807785dddb1b92cc4fe1b82b8358cc60b09a80c /intern
parent: 1a6b364c284c1d919e0184b18465d9b673d330c6 (diff)
parent: 8b955e9b19dd8616f61c27d5e9d2d80d66dacd96 (diff)
14 files changed, 5027 insertions, 131 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index b10c7847e21..5dfbd97366a 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -632,8 +632,10 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
 	else if (b_node.is_a(&RNA_ShaderNodeTexSky)) {
 		BL::ShaderNodeTexSky b_sky_node(b_node);
 		SkyTextureNode *sky = new SkyTextureNode();
+		sky->type = SkyTextureNode::type_enum[(int)b_sky_node.sky_type()];
 		sky->sun_direction = get_float3(b_sky_node.sun_direction());
 		sky->turbidity = b_sky_node.turbidity();
+		sky->ground_albedo = b_sky_node.ground_albedo();
 		get_tex_mapping(&sky->tex_mapping, b_sky_node.texture_mapping());
 		node = sky;
 	}
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index f64277564c4..71ab39a0eca 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -717,16 +717,6 @@ typedef struct KernelBackground {
 	float ao_distance;
 } KernelBackground;
 
-typedef struct KernelSunSky {
-	/* sun direction in spherical and cartesian */
-	float theta, phi, pad3, pad4;
-
-	/* perez function parameters */
-	float zenith_Y, zenith_x, zenith_y, pad2;
-	float perez_Y[5], perez_x[5], perez_y[5];
-	float pad5;
-} KernelSunSky;
-
 typedef struct KernelIntegrator {
 	/* emission */
 	int use_direct_light;
@@ -837,7 +827,6 @@ typedef struct KernelData {
 	KernelCamera cam;
 	KernelFilm film;
 	KernelBackground background;
-	KernelSunSky sunsky;
 	KernelIntegrator integrator;
 	KernelBVH bvh;
 	KernelCurves curve;
diff --git a/intern/cycles/kernel/shaders/node_sky_texture.osl b/intern/cycles/kernel/shaders/node_sky_texture.osl
index 9fa9f938b6a..3ed791fdc92 100644
--- a/intern/cycles/kernel/shaders/node_sky_texture.osl
+++ b/intern/cycles/kernel/shaders/node_sky_texture.osl
@@ -17,16 +17,6 @@
 #include "stdosl.h"
 #include "node_color.h"
 
-struct KernelSunSky {
-	/* sun direction in spherical and cartesian */
-	float theta, phi;
-	vector dir;
-
-	/* perez function parameters */
-	float zenith_Y, zenith_x, zenith_y;
-	float perez_Y[5], perez_x[5], perez_y[5];
-};
-
 float sky_angle_between(float thetav, float phiv, float theta, float phi)
 {
 	float cospsi = sin(thetav) * sin(theta) * cos(phi - phiv) + cos(thetav) * cos(theta);
@@ -44,7 +34,8 @@ vector sky_spherical_coordinates(vector dir)
 	return vector(acos(dir[2]), atan2(dir[0], dir[1]), 0);
 }
 
-float sky_perez_function(float lam[5], float theta, float gamma)
+/* Preetham */
+float sky_perez_function(float lam[9], float theta, float gamma)
 {
 	float ctheta = cos(theta);
 	float cgamma = cos(gamma);
@@ -52,7 +43,9 @@ float sky_perez_function(float lam[5], float theta, float gamma)
 	return (1.0 + lam[0] * exp(lam[1] / ctheta)) * (1.0 + lam[2] * exp(lam[3] * gamma) + lam[4] * cgamma * cgamma);
 }
 
-color sky_xyz_radiance(KernelSunSky sunsky, vector dir)
+color sky_radiance_old(normal dir,
+                   float sunphi, float suntheta, color radiance,
+                   float config_x[9], float config_y[9], float config_z[9])
 {
 	/* convert vector to spherical coordinates */
 	vector spherical = sky_spherical_coordinates(dir);
@@ -60,89 +53,81 @@ color sky_xyz_radiance(KernelSunSky sunsky, vector dir)
 	float phi = spherical[1];
 
 	/* angle between sun direction and dir */
-	float gamma = sky_angle_between(theta, phi, sunsky.theta, sunsky.phi);
+	float gamma = sky_angle_between(theta, phi, suntheta, sunphi);
 
 	/* clamp theta to horizon */
 	theta = min(theta, M_PI_2 - 0.001);
 
 	/* compute xyY color space values */
-	float x = sunsky.zenith_x * sky_perez_function(sunsky.perez_x, theta, gamma);
-	float y = sunsky.zenith_y * sky_perez_function(sunsky.perez_y, theta, gamma);
-	float Y = sunsky.zenith_Y * sky_perez_function(sunsky.perez_Y, theta, gamma);
+	float x = radiance[1] * sky_perez_function(config_y, theta, gamma);
+	float y = radiance[2] * sky_perez_function(config_z, theta, gamma);
+	float Y = radiance[0] * sky_perez_function(config_x, theta, gamma);
 
 	/* convert to RGB */
 	color xyz = xyY_to_xyz(x, y, Y);
 	return xyz_to_rgb(xyz[0], xyz[1], xyz[2]);
 }
 
-void precompute_sunsky(vector dir, float turbidity, output KernelSunSky sunsky)
+/* Hosek / Wilkie */
+float sky_radiance_internal(float config[9], float theta, float gamma)
+{
+	float ctheta = cos(theta);
+	float cgamma = cos(gamma);
+	
+	float expM = exp(config[4] * gamma);
+	float rayM = cgamma * cgamma;
+	float mieM = (1.0 + rayM) / pow((1.0 + config[8]*config[8] - 2.0*config[8]*cgamma), 1.5);
+	float zenith = sqrt(ctheta);
+
+	return (1.0 + config[0] * exp(config[1] / (ctheta + 0.01))) *
+	        (config[2] + config[3] * expM + config[5] * rayM + config[6] * mieM + config[7] * zenith);
+}
+
+color sky_radiance_new(normal dir,
+                   float sunphi, float suntheta, color radiance,
+                   float config_x[9], float config_y[9], float config_z[9])
 {
+	/* convert vector to spherical coordinates */
 	vector spherical = sky_spherical_coordinates(dir);
 	float theta = spherical[0];
 	float phi = spherical[1];
 
-	sunsky.theta = theta;
-	sunsky.phi = phi;
-	sunsky.dir = dir;
-
-	float theta2 = theta * theta;
-	float theta3 = theta2 * theta;
-	float T = turbidity;
-	float T2 = T * T;
-
-	float chi = (4.0 / 9.0 - T / 120.0) * (M_PI - 2.0 * theta);
-	sunsky.zenith_Y = (4.0453 * T - 4.9710) * tan(chi) - 0.2155 * T + 2.4192;
-	sunsky.zenith_Y *= 0.06;
-
-	sunsky.zenith_x =
-	        ( 0.00166 * theta3 - 0.00375 * theta2 + 0.00209 * theta) * T2 +
-	        (-0.02903 * theta3 + 0.06377 * theta2 - 0.03202 * theta + 0.00394) * T +
-	        ( 0.11693 * theta3 - 0.21196 * theta2 + 0.06052 * theta + 0.25886);
-
-	sunsky.zenith_y =
-	        ( 0.00275 * theta3 - 0.00610 * theta2 + 0.00317 * theta) * T2 +
-	        (-0.04214 * theta3 + 0.08970 * theta2 - 0.04153 * theta + 0.00516) * T +
-	        ( 0.15346 * theta3 - 0.26756 * theta2 + 0.06670 * theta + 0.26688);
-
-	sunsky.perez_Y[0] = ( 0.1787 * T - 1.4630);
-	sunsky.perez_Y[1] = (-0.3554 * T + 0.4275);
-	sunsky.perez_Y[2] = (-0.0227 * T + 5.3251);
-	sunsky.perez_Y[3] = ( 0.1206 * T - 2.5771);
-	sunsky.perez_Y[4] = (-0.0670 * T + 0.3703);
-
-	sunsky.perez_x[0] = (-0.0193 * T - 0.2592);
-	sunsky.perez_x[1] = (-0.0665 * T + 0.0008);
-	sunsky.perez_x[2] = (-0.0004 * T + 0.2125);
-	sunsky.perez_x[3] = (-0.0641 * T - 0.8989);
-	sunsky.perez_x[4] = (-0.0033 * T + 0.0452);
-
-	sunsky.perez_y[0] = (-0.0167 * T - 0.2608);
-	sunsky.perez_y[1] = (-0.0950 * T + 0.0092);
-	sunsky.perez_y[2] = (-0.0079 * T + 0.2102);
-	sunsky.perez_y[3] = (-0.0441 * T - 1.6537);
-	sunsky.perez_y[4] = (-0.0109 * T + 0.0529);
-
-	sunsky.zenith_Y /= sky_perez_function(sunsky.perez_Y, 0, theta);
-	sunsky.zenith_x /= sky_perez_function(sunsky.perez_x, 0, theta);
-	sunsky.zenith_y /= sky_perez_function(sunsky.perez_y, 0, theta);
+	/* angle between sun direction and dir */
+	float gamma = sky_angle_between(theta, phi, suntheta, sunphi);
+
+	/* clamp theta to horizon */
+	theta = min(theta, M_PI_2 - 0.001);
+
+	/* compute xyz color space values */
+	float x = sky_radiance_internal(config_x, theta, gamma) * radiance[0];
+	float y = sky_radiance_internal(config_y, theta, gamma) * radiance[1];
+	float z = sky_radiance_internal(config_z, theta, gamma) * radiance[2];
+
+	/* convert to RGB and adjust strength */
+	return xyz_to_rgb(x, y, z) * (M_2PI/683);
 }
 
 shader node_sky_texture(
 	int use_mapping = 0,
 	matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 	vector Vector = P,
-	vector sun_direction = vector(0, 0, 1),
-	float turbidity = 2.2,
-	output color Color = 0.0)
+	string sky_model = "Hosek / Wilkie",
+	float theta = 0.0,
+	float phi = 0.0,
+	color radiance = color(0.0, 0.0, 0.0),
+	float config_x[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+	float config_y[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+	float config_z[9] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
+	output color Color = color(0.0, 0.0, 0.0))
 {
 	vector p = Vector;
 
 	if (use_mapping)
 		p = transform(mapping, p);
-
-	KernelSunSky sunsky;
-
-	precompute_sunsky(sun_direction, turbidity, sunsky);
-	Color = sky_xyz_radiance(sunsky, p);
+	
+	if (sky_model == "Hosek / Wilkie")
+		Color = sky_radiance_new(p, phi, theta, radiance, config_x, config_y, config_z);
+	else
+		Color = sky_radiance_old(p, phi, theta, radiance, config_x, config_y, config_z);
 }
 
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 2cf507f9c89..168127c620c 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -255,7 +255,7 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
 #endif
 #ifdef __PROCEDURAL_TEXTURES__
 			case NODE_TEX_SKY:
-				svm_node_tex_sky(kg, sd, stack, node.y, node.z);
+				svm_node_tex_sky(kg, sd, stack, node, &offset);
 				break;
 			case NODE_TEX_GRADIENT:
 				svm_node_tex_gradient(sd, stack, node);
diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/svm_sky.h
index c4e0ca3e242..cb6e5def4bd 100644
--- a/intern/cycles/kernel/svm/svm_sky.h
+++ b/intern/cycles/kernel/svm/svm_sky.h
@@ -16,10 +16,7 @@
 
 CCL_NAMESPACE_BEGIN
 
-/*
- * "A Practical Analytic Model for Daylight"
- * A. J. Preetham, Peter Shirley, Brian Smits
- */
+/* Sky texture */
 
 __device float sky_angle_between(float thetav, float phiv, float theta, float phi)
 {
@@ -27,6 +24,10 @@ __device float sky_angle_between(float thetav, float phiv, float theta, float ph
 	return safe_acosf(cospsi);
 }
 
+/*
+ * "A Practical Analytic Model for Daylight"
+ * A. J. Preetham, Peter Shirley, Brian Smits
+ */
 __device float sky_perez_function(__constant float *lam, float theta, float gamma)
 {
 	float ctheta = cosf(theta);
@@ -35,7 +36,10 @@ __device float sky_perez_function(__constant float *lam, float theta, float gamm
 	return (1.0f + lam[0]*expf(lam[1]/ctheta)) * (1.0f + lam[2]*expf(lam[3]*gamma)  + lam[4]*cgamma*cgamma);
 }
 
-__device float3 sky_radiance(KernelGlobals *kg, float3 dir)
+__device float3 sky_radiance_old(KernelGlobals *kg, float3 dir,
+                                 float sunphi, float suntheta,
+                                 float radiance_x, float radiance_y, float radiance_z,
+                                 float *config_x, float *config_y, float *config_z)
 {
 	/* convert vector to spherical coordinates */
 	float2 spherical = direction_to_spherical(dir);
@@ -43,25 +47,135 @@ __device float3 sky_radiance(KernelGlobals *kg, float3 dir)
 	float phi = spherical.y;
 
 	/* angle between sun direction and dir */
-	float gamma = sky_angle_between(theta, phi, kernel_data.sunsky.theta, kernel_data.sunsky.phi);
+	float gamma = sky_angle_between(theta, phi, suntheta, sunphi);
 
 	/* clamp theta to horizon */
 	theta = min(theta, M_PI_2_F - 0.001f);
 
 	/* compute xyY color space values */
-	float x = kernel_data.sunsky.zenith_x * sky_perez_function(kernel_data.sunsky.perez_x, theta, gamma);
-	float y = kernel_data.sunsky.zenith_y * sky_perez_function(kernel_data.sunsky.perez_y, theta, gamma);
-	float Y = kernel_data.sunsky.zenith_Y * sky_perez_function(kernel_data.sunsky.perez_Y, theta, gamma);
+	float x = radiance_y * sky_perez_function(config_y, theta, gamma);
+	float y = radiance_z * sky_perez_function(config_z, theta, gamma);
+	float Y = radiance_x * sky_perez_function(config_x, theta, gamma);
 
 	/* convert to RGB */
 	float3 xyz = xyY_to_xyz(x, y, Y);
 	return xyz_to_rgb(xyz.x, xyz.y, xyz.z);
 }
 
-__device void svm_node_tex_sky(KernelGlobals *kg, ShaderData *sd, float *stack, uint dir_offset, uint out_offset)
+/*
+ * "An Analytic Model for Full Spectral Sky-Dome Radiance"
+ * Lukas Hosek, Alexander Wilkie
+ */
+__device float sky_radiance_internal(__constant float *configuration, float theta, float gamma)
+{
+	float ctheta = cosf(theta);
+	float cgamma = cosf(gamma);
+
+	float expM = expf(configuration[4] * gamma);
+	float rayM = cgamma * cgamma;
+	float mieM = (1.0f + rayM) / powf((1.0f + configuration[8]*configuration[8] - 2.0f*configuration[8]*cgamma), 1.5f);
+	float zenith = sqrt(ctheta);
+
+	return (1.0f + configuration[0] * expf(configuration[1] / (ctheta + 0.01f))) *
+		(configuration[2] + configuration[3] * expM + configuration[5] * rayM + configuration[6] * mieM + configuration[7] * zenith);
+}
+
+__device float3 sky_radiance_new(KernelGlobals *kg, float3 dir,
+                                 float sunphi, float suntheta,
+                                 float radiance_x, float radiance_y, float radiance_z,
+                                 float *config_x, float *config_y, float *config_z)
 {
+	/* convert vector to spherical coordinates */
+	float2 spherical = direction_to_spherical(dir);
+	float theta = spherical.x;
+	float phi = spherical.y;
+
+	/* angle between sun direction and dir */
+	float gamma = sky_angle_between(theta, phi, suntheta, sunphi);
+
+	/* clamp theta to horizon */
+	theta = min(theta, M_PI_2_F - 0.001f);
+
+	/* compute xyz color space values */
+	float x = sky_radiance_internal(config_x, theta, gamma) * radiance_x;
+	float y = sky_radiance_internal(config_y, theta, gamma) * radiance_y;
+	float z = sky_radiance_internal(config_z, theta, gamma) * radiance_z;
+
+	/* convert to RGB and adjust strength */
+	return xyz_to_rgb(x, y, z) * (M_2PI_F/683);
+}
+
+__device void svm_node_tex_sky(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
+{
+	/* Define variables */
+	float sunphi, suntheta, radiance_x, radiance_y, radiance_z;
+	float config_x[9], config_y[9], config_z[9];
+	
+	/* Load data */
+	uint dir_offset = node.y;
+	uint out_offset = node.z;
+	int sky_model = node.w;
+
+	float4 data = read_node_float(kg, offset);
+	sunphi = data.x;
+	suntheta = data.y;
+	radiance_x = data.z;
+	radiance_y = data.w;
+	
+	data = read_node_float(kg, offset);
+	radiance_z = data.x;
+	config_x[0] = data.y;
+	config_x[1] = data.z;
+	config_x[2] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_x[3] = data.x;
+	config_x[4] = data.y;
+	config_x[5] = data.z;
+	config_x[6] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_x[7] = data.x;
+	config_x[8] = data.y;
+	config_y[0] = data.z;
+	config_y[1] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_y[2] = data.x;
+	config_y[3] = data.y;
+	config_y[4] = data.z;
+	config_y[5] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_y[6] = data.x;
+	config_y[7] = data.y;
+	config_y[8] = data.z;
+	config_z[0] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_z[1] = data.x;
+	config_z[2] = data.y;
+	config_z[3] = data.z;
+	config_z[4] = data.w;
+	
+	data = read_node_float(kg, offset);
+	config_z[5] = data.x;
+	config_z[6] = data.y;
+	config_z[7] = data.z;
+	config_z[8] = data.w;
+	
 	float3 dir = stack_load_float3(stack, dir_offset);
-	float3 f = sky_radiance(kg, dir);
+	float3 f;
+
+	/* Compute Sky */
+	if(sky_model == 0)
+		f = sky_radiance_old(kg, dir, sunphi, suntheta,
+	                             radiance_x, radiance_y, radiance_z,
+	                             config_x, config_y, config_z);
+	else
+		f = sky_radiance_new(kg, dir, sunphi, suntheta,
+	                             radiance_x, radiance_y, radiance_z,
+	                             config_x, config_y, config_z);
 
 	stack_store_float3(stack, out_offset, f);
 }
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 68f2ba041a1..e2b299e661d 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -285,6 +285,11 @@ typedef enum NodeWaveType {
 	NODE_WAVE_RINGS
 } NodeWaveType;
 
+typedef enum NodeSkyType {
+	NODE_SKY_OLD,
+	NODE_SKY_NEW
+} NodeSkyType;
+
 typedef enum NodeGradientType {
 	NODE_BLEND_LINEAR,
 	NODE_BLEND_QUADRATIC,
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index 0cf29435a8c..dbbfe2ee7c9 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -35,6 +35,7 @@ set(SRC
 	scene.cpp
 	session.cpp
 	shader.cpp
+	sky_model.cpp
 	sobol.cpp
 	svm.cpp
 	tables.cpp
@@ -62,6 +63,8 @@ set(SRC_HEADERS
 	scene.h
 	session.h
 	shader.h
+	sky_model.h
+	sky_model_data.h
 	sobol.h
 	svm.h
 	tables.h
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 8fe856e6409..676b628f458 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -18,6 +18,7 @@
 #include "nodes.h"
 #include "svm.h"
 #include "osl.h"
+#include "sky_model.h"
 
 #include "util_transform.h"
 
@@ -384,19 +385,35 @@ static float2 sky_spherical_coordinates(float3 dir)
 	return make_float2(acosf(dir.z), atan2f(dir.x, dir.y));
 }
 
+typedef struct SunSky {
+	/* sun direction in spherical and cartesian */
+	float theta, phi;
+
+	/* Parameter */
+	float radiance_x, radiance_y, radiance_z;
+	float config_x[9], config_y[9], config_z[9];
+} SunSky;
+
+/* Preetham model */
 static float sky_perez_function(float lam[6], float theta, float gamma)
 {
 	return (1.0f + lam[0]*expf(lam[1]/cosf(theta))) * (1.0f + lam[2]*expf(lam[3]*gamma)  + lam[4]*cosf(gamma)*cosf(gamma));
 }
 
-static void sky_texture_precompute(KernelSunSky *ksunsky, float3 dir, float turbidity)
+static void sky_texture_precompute_old(SunSky *sunsky, float3 dir, float turbidity)
 {
+	/*
+	* We re-use the SunSky struct of the new model, to avoid extra variables
+	* zenith_Y/x/y is now radiance_x/y/z
+	* perez_Y/x/y is now config_x/y/z
+	*/
+	
 	float2 spherical = sky_spherical_coordinates(dir);
 	float theta = spherical.x;
 	float phi = spherical.y;
 
-	ksunsky->theta = theta;
-	ksunsky->phi = phi;
+	sunsky->theta = theta;
+	sunsky->phi = phi;
 
 	float theta2 = theta*theta;
 	float theta3 = theta2*theta;
@@ -404,47 +421,93 @@ static void sky_texture_precompute(KernelSunSky *ksunsky, float3 dir, float turb
 	float T2 = T * T;
 
 	float chi = (4.0f / 9.0f - T / 120.0f) * (M_PI_F - 2.0f * theta);
-	ksunsky->zenith_Y = (4.0453f * T - 4.9710f) * tanf(chi) - 0.2155f * T + 2.4192f;
-	ksunsky->zenith_Y *= 0.06f;
+	sunsky->radiance_x = (4.0453f * T - 4.9710f) * tanf(chi) - 0.2155f * T + 2.4192f;
+	sunsky->radiance_x *= 0.06f;
 
-	ksunsky->zenith_x =
+	sunsky->radiance_y =
 	(0.00166f * theta3 - 0.00375f * theta2 + 0.00209f * theta) * T2 +
 	(-0.02903f * theta3 + 0.06377f * theta2 - 0.03202f * theta + 0.00394f) * T +
 	(0.11693f * theta3 - 0.21196f * theta2 + 0.06052f * theta + 0.25886f);
 
-	ksunsky->zenith_y =
+	sunsky->radiance_z =
 	(0.00275f * theta3 - 0.00610f * theta2 + 0.00317f * theta) * T2 +
 	(-0.04214f * theta3 + 0.08970f * theta2 - 0.04153f * theta  + 0.00516f) * T +
 	(0.15346f * theta3 - 0.26756f * theta2 + 0.06670f * theta  + 0.26688f);
 
-	ksunsky->perez_Y[0] = (0.1787f * T  - 1.4630f);
-	ksunsky->perez_Y[1] = (-0.3554f * T  + 0.4275f);
-	ksunsky->perez_Y[2] = (-0.0227f * T  + 5.3251f);
-	ksunsky->perez_Y[3] = (0.1206f * T  - 2.5771f);
-	ksunsky->perez_Y[4] = (-0.0670f * T  + 0.3703f);
+	sunsky->config_x[0] = (0.1787f * T  - 1.4630f);
+	sunsky->config_x[1] = (-0.3554f * T  + 0.4275f);
+	sunsky->config_x[2] = (-0.0227f * T  + 5.3251f);
+	sunsky->config_x[3] = (0.1206f * T  - 2.5771f);
+	sunsky->config_x[4] = (-0.0670f * T  + 0.3703f);
 
-	ksunsky->perez_x[0] = (-0.0193f * T  - 0.2592f);
-	ksunsky->perez_x[1] = (-0.0665f * T  + 0.0008f);
-	ksunsky->perez_x[2] = (-0.0004f * T  + 0.2125f);
-	ksunsky->perez_x[3] = (-0.0641f * T  - 0.8989f);
-	ksunsky->perez_x[4] = (-0.0033f * T  + 0.0452f);
+	sunsky->config_y[0] = (-0.0193f * T  - 0.2592f);
+	sunsky->config_y[1] = (-0.0665f * T  + 0.0008f);
+	sunsky->config_y[2] = (-0.0004f * T  + 0.2125f);
+	sunsky->config_y[3] = (-0.0641f * T  - 0.8989f);
+	sunsky->config_y[4] = (-0.0033f * T  + 0.0452f);
 
-	ksunsky->perez_y[0] = (-0.0167f * T  - 0.2608f);
-	ksunsky->perez_y[1] = (-0.0950f * T  + 0.0092f);
-	ksunsky->perez_y[2] = (-0.0079f * T  + 0.2102f);
-	ksunsky->perez_y[3] = (-0.0441f * T  - 1.6537f);
-	ksunsky->perez_y[4] = (-0.0109f * T  + 0.0529f);
+	sunsky->config_z[0] = (-0.0167f * T  - 0.2608f);
+	sunsky->config_z[1] = (-0.0950f * T  + 0.0092f);
+	sunsky->config_z[2] = (-0.0079f * T  + 0.2102f);
+	sunsky->config_z[3] = (-0.0441f * T  - 1.6537f);
+	sunsky->config_z[4] = (-0.0109f * T  + 0.0529f);
 
-	ksunsky->zenith_Y /= sky_perez_function(ksunsky->perez_Y, 0, theta);
-	ksunsky->zenith_x /= sky_perez_function(ksunsky->perez_x, 0, theta);
-	ksunsky->zenith_y /= sky_perez_function(ksunsky->perez_y, 0, theta);
+	sunsky->radiance_x /= sky_perez_function(sunsky->config_x, 0, theta);
+	sunsky->radiance_y /= sky_perez_function(sunsky->config_y, 0, theta);
+	sunsky->radiance_z /= sky_perez_function(sunsky->config_z, 0, theta);
 }
 
+/* Hosek / Wilkie */
+static void sky_texture_precompute_new(SunSky *sunsky, float3 dir, float turbidity, float ground_albedo)
+{
+	/* Calculate Sun Direction and save coordinates */
+	float2 spherical = sky_spherical_coordinates(dir);
+	float theta = spherical.x;
+	float phi = spherical.y;
+
+	sunsky->theta = theta;
+	sunsky->phi = phi;
+
+	double solarElevation = M_PI_2_F - theta;
+
+	/* Initialize Sky Model */
+	ArHosekSkyModelState *sky_state;
+	sky_state = arhosek_xyz_skymodelstate_alloc_init(turbidity, ground_albedo, solarElevation);
+
+	/* Copy values from sky_state to SunSky */
+	for (int i = 0; i < 9; ++i) {
+		sunsky->config_x[i] = sky_state->configs[0][i];
+		sunsky->config_y[i] = sky_state->configs[1][i];
+		sunsky->config_z[i] = sky_state->configs[2][i];
+	}
+	sunsky->radiance_x = sky_state->radiances[0];
+	sunsky->radiance_y = sky_state->radiances[1];
+	sunsky->radiance_z = sky_state->radiances[2];
+
+	/* Free sky_state */
+	arhosekskymodelstate_free(sky_state);
+}
+
+static ShaderEnum sky_type_init()
+{
+	ShaderEnum enm;
+
+	enm.insert("Preetham", NODE_SKY_OLD);
+	enm.insert("Hosek / Wilkie", NODE_SKY_NEW);
+
+	return enm;
+}
+
+ShaderEnum SkyTextureNode::type_enum = sky_type_init();
+
 SkyTextureNode::SkyTextureNode()
 : TextureNode("sky_texture")
 {
+	type = ustring("Hosek / Wilkie");
+	
 	sun_direction = make_float3(0.0f, 0.0f, 1.0f);
 	turbidity = 2.2f;
+	ground_albedo = 0.3f;
 
 	add_input("Vector", SHADER_SOCKET_VECTOR, ShaderInput::POSITION);
 	add_output("Color", SHADER_SOCKET_COLOR);
@@ -455,15 +518,17 @@ void SkyTextureNode::compile(SVMCompiler& compiler)
 	ShaderInput *vector_in = input("Vector");
 	ShaderOutput *color_out = output("Color");
 
-	if(compiler.sunsky) {
-		sky_texture_precompute(compiler.sunsky, sun_direction, turbidity);
-		compiler.sunsky = NULL;
-	}
+	SunSky sunsky;
+	if(type_enum[type] == NODE_SKY_OLD)
+		sky_texture_precompute_old(&sunsky, sun_direction, turbidity);
+	else if(type_enum[type] == NODE_SKY_NEW)
+		sky_texture_precompute_new(&sunsky, sun_direction, turbidity, ground_albedo);
 
 	if(vector_in->link)
 		compiler.stack_assign(vector_in);
 
 	int vector_offset = vector_in->stack_offset;
+	int sky_model = type_enum[type];
 
 	if(!tex_mapping.skip()) {
 		vector_offset = compiler.stack_find_offset(SHADER_SOCKET_VECTOR);
@@ -471,7 +536,15 @@ void SkyTextureNode::compile(SVMCompiler& compiler)
 	}
 
 	compiler.stack_assign(color_out);
-	compiler.add_node(NODE_TEX_SKY, vector_offset, color_out->stack_offset);
+	compiler.add_node(NODE_TEX_SKY, vector_offset, color_out->stack_offset, sky_model);
+	compiler.add_node(__float_as_uint(sunsky.phi), __float_as_uint(sunsky.theta), __float_as_uint(sunsky.radiance_x), __float_as_uint(sunsky.radiance_y));
+	compiler.add_node(__float_as_uint(sunsky.radiance_z), __float_as_uint(sunsky.config_x[0]), __float_as_uint(sunsky.config_x[1]), __float_as_uint(sunsky.config_x[2]));
+	compiler.add_node(__float_as_uint(sunsky.config_x[3]), __float_as_uint(sunsky.config_x[4]), __float_as_uint(sunsky.config_x[5]), __float_as_uint(sunsky.config_x[6]));
+	compiler.add_node(__float_as_uint(sunsky.config_x[7]), __float_as_uint(sunsky.config_x[8]), __float_as_uint(sunsky.config_y[0]), __float_as_uint(sunsky.config_y[1]));
+	compiler.add_node(__float_as_uint(sunsky.config_y[2]), __float_as_uint(sunsky.config_y[3]), __float_as_uint(sunsky.config_y[4]), __float_as_uint(sunsky.config_y[5]));
+	compiler.add_node(__float_as_uint(sunsky.config_y[6]), __float_as_uint(sunsky.config_y[7]), __float_as_uint(sunsky.config_y[8]), __float_as_uint(sunsky.config_z[0]));
+	compiler.add_node(__float_as_uint(sunsky.config_z[1]), __float_as_uint(sunsky.config_z[2]), __float_as_uint(sunsky.config_z[3]), __float_as_uint(sunsky.config_z[4]));
+	compiler.add_node(__float_as_uint(sunsky.config_z[5]), __float_as_uint(sunsky.config_z[6]), __float_as_uint(sunsky.config_z[7]), __float_as_uint(sunsky.config_z[8]));
 
 	if(vector_offset != vector_in->stack_offset)
 		compiler.stack_clear_offset(vector_in->type, vector_offset);
@@ -481,8 +554,19 @@ void SkyTextureNode::compile(OSLCompiler& compiler)
 {
 	tex_mapping.compile(compiler);
 
-	compiler.parameter_vector("sun_direction", sun_direction);
-	compiler.parameter("turbidity", turbidity);
+	SunSky sunsky;
+	if(type_enum[type] == NODE_SKY_OLD)
+		sky_texture_precompute_old(&sunsky, sun_direction, turbidity);
+	else if(type_enum[type] == NODE_SKY_NEW)
+		sky_texture_precompute_new(&sunsky, sun_direction, turbidity, ground_albedo);
+		
+	compiler.parameter("sky_model", type);
+	compiler.parameter("theta", sunsky.theta);
+	compiler.parameter("phi", sunsky.phi);
+	compiler.parameter_color("radiance", make_float3(sunsky.radiance_x, sunsky.radiance_y, sunsky.radiance_z));
+	compiler.parameter_array("config_x", sunsky.config_x, 9);
+	compiler.parameter_array("config_y", sunsky.config_y, 9);
+	compiler.parameter_array("config_z", sunsky.config_z, 9);
 	compiler.add(this, "node_sky_texture");
 }
 
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index f45ce498100..1a2494d96ea 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -105,6 +105,10 @@ public:
 
 	float3 sun_direction;
 	float turbidity;
+	float ground_albedo;
+	
+	ustring type;
+	static ShaderEnum type_enum;
 };
 
 class OutputNode : public ShaderNode {
diff --git a/intern/cycles/render/sky_model.cpp b/intern/cycles/render/sky_model.cpp
new file mode 100644
index 00000000000..1729acab775
--- /dev/null
+++ b/intern/cycles/render/sky_model.cpp
@@ -0,0 +1,397 @@
+/*
+This source is published under the following 3-clause BSD license.
+
+Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * None of the names of the contributors may be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* ============================================================================
+
+This file is part of a sample implementation of the analytical skylight and
+solar radiance models presented in the SIGGRAPH 2012 paper
+
+
+           "An Analytic Model for Full Spectral Sky-Dome Radiance"
+
+and the 2013 IEEE CG&A paper
+
+       "Adding a Solar Radiance Function to the Hosek Skylight Model"
+
+                                   both by 
+
+                       Lukas Hosek and Alexander Wilkie
+                Charles University in Prague, Czech Republic
+
+
+                        Version: 1.4a, February 22nd, 2013
+                        
+Version history:
+
+1.4a  February 22nd, 2013
+      Removed unnecessary and counter-intuitive solar radius parameters 
+      from the interface of the colourspace sky dome initialisation functions.
+
+1.4   February 11th, 2013
+      Fixed a bug which caused the relative brightness of the solar disc
+      and the sky dome to be off by a factor of about 6. The sun was too 
+      bright: this affected both normal and alien sun scenarios. The 
+      coefficients of the solar radiance function were changed to fix this.
+
+1.3   January 21st, 2013 (not released to the public)
+      Added support for solar discs that are not exactly the same size as
+      the terrestrial sun. Also added support for suns with a different
+      emission spectrum ("Alien World" functionality).
+
+1.2a  December 18th, 2012
+      Fixed a mistake and some inaccuracies in the solar radiance function
+      explanations found in ArHosekSkyModel.h. The actual source code is
+      unchanged compared to version 1.2.
+
+1.2   December 17th, 2012
+      Native RGB data and a solar radiance function that matches the turbidity
+      conditions were added.
+
+1.1   September 2012
+      The coefficients of the spectral model are now scaled so that the output
+      is given in physical units: W / (m^-2 * sr * nm). Also, the output of the
+      XYZ model is now no longer scaled to the range [0...1]. Instead, it is
+      the result of a simple conversion from spectral data via the CIE 2 degree
+      standard observer matching functions. Therefore, after multiplication
+      with 683 lm / W, the Y channel now corresponds to luminance in lm.
+     
+1.0   May 11th, 2012
+      Initial release.
+
+
+Please visit http://cgg.mff.cuni.cz/projects/SkylightModelling/ to check if
+an updated version of this code has been published!
+
+============================================================================ */
+
+/*
+
+All instructions on how to use this code are in the accompanying header file.
+
+*/
+
+#include "sky_model.h"
+#include "sky_model_data.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+CCL_NAMESPACE_BEGIN
+
+//   Some macro definitions that occur elsewhere in ART, and that have to be
+//   replicated to make this a stand-alone module.
+
+#ifndef NIL
+#define NIL                         0
+#endif
+
+#ifndef MATH_PI 
+#define MATH_PI                     3.141592653589793
+#endif
+
+#ifndef MATH_DEG_TO_RAD
+#define MATH_DEG_TO_RAD             ( MATH_PI / 180.0 )
+#endif
+
+#ifndef MATH_RAD_TO_DEG
+#define MATH_RAD_TO_DEG             ( 180.0 / MATH_PI )
+#endif
+
+#ifndef DEGREES
+#define DEGREES                     * MATH_DEG_TO_RAD
+#endif
+
+#ifndef TERRESTRIAL_SOLAR_RADIUS
+#define TERRESTRIAL_SOLAR_RADIUS    ( ( 0.51 DEGREES ) / 2.0 )
+#endif
+
+#ifndef ALLOC
+#define ALLOC(_struct)              ((_struct *)malloc(sizeof(_struct)))
+#endif
+
+// internal definitions
+
+typedef double *ArHosekSkyModel_Dataset;
+typedef double *ArHosekSkyModel_Radiance_Dataset;
+
+// internal functions
+
+void ArHosekSkyModel_CookConfiguration(
+        ArHosekSkyModel_Dataset       dataset, 
+        ArHosekSkyModelConfiguration  config, 
+        double                        turbidity, 
+        double                        albedo, 
+        double                        solar_elevation
+        )
+{
+    double  * elev_matrix;
+
+    int     int_turbidity = (int)turbidity;
+    double  turbidity_rem = turbidity - (double)int_turbidity;
+
+    solar_elevation = pow(solar_elevation / (MATH_PI / 2.0), (1.0 / 3.0));
+
+    // alb 0 low turb
+
+    elev_matrix = dataset + ( 9 * 6 * (int_turbidity-1) );
+    
+    
+    for( unsigned int i = 0; i < 9; ++i )
+    {
+        //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+        config[i] = 
+        (1.0-albedo) * (1.0 - turbidity_rem) 
+        * ( pow(1.0-solar_elevation, 5.0) * elev_matrix[i]  + 
+           5.0  * pow(1.0-solar_elevation, 4.0) * solar_elevation * elev_matrix[i+9] +
+           10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[i+18] +
+           10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[i+27] +
+           5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[i+36] +
+           pow(solar_elevation, 5.0)  * elev_matrix[i+45]);
+    }
+
+    // alb 1 low turb
+    elev_matrix = dataset + (9*6*10 + 9*6*(int_turbidity-1));
+    for(unsigned int i = 0; i < 9; ++i)
+    {
+        //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+        config[i] += 
+        (albedo) * (1.0 - turbidity_rem)
+        * ( pow(1.0-solar_elevation, 5.0) * elev_matrix[i]  + 
+           5.0  * pow(1.0-solar_elevation, 4.0) * solar_elevation * elev_matrix[i+9] +
+           10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[i+18] +
+           10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[i+27] +
+           5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[i+36] +
+           pow(solar_elevation, 5.0)  * elev_matrix[i+45]);
+    }
+
+    if(int_turbidity == 10)
+        return;
+
+    // alb 0 high turb
+    elev_matrix = dataset + (9*6*(int_turbidity));
+    for(unsigned int i = 0; i < 9; ++i)
+    {
+        //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+        config[i] += 
+        (1.0-albedo) * (turbidity_rem)
+        * ( pow(1.0-solar_elevation, 5.0) * elev_matrix[i]  + 
+           5.0  * pow(1.0-solar_elevation, 4.0) * solar_elevation * elev_matrix[i+9] +
+           10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[i+18] +
+           10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[i+27] +
+           5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[i+36] +
+           pow(solar_elevation, 5.0)  * elev_matrix[i+45]);
+    }
+
+    // alb 1 high turb
+    elev_matrix = dataset + (9*6*10 + 9*6*(int_turbidity));
+    for(unsigned int i = 0; i < 9; ++i)
+    {
+        //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+        config[i] += 
+        (albedo) * (turbidity_rem)
+        * ( pow(1.0-solar_elevation, 5.0) * elev_matrix[i]  + 
+           5.0  * pow(1.0-solar_elevation, 4.0) * solar_elevation * elev_matrix[i+9] +
+           10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[i+18] +
+           10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[i+27] +
+           5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[i+36] +
+           pow(solar_elevation, 5.0)  * elev_matrix[i+45]);
+    }
+}
+
+double ArHosekSkyModel_CookRadianceConfiguration(
+        ArHosekSkyModel_Radiance_Dataset  dataset, 
+        double                            turbidity, 
+        double                            albedo, 
+        double                            solar_elevation
+        )
+{
+    double* elev_matrix;
+
+    int int_turbidity = (int)turbidity;
+    double turbidity_rem = turbidity - (double)int_turbidity;
+    double res;
+    solar_elevation = pow(solar_elevation / (MATH_PI / 2.0), (1.0 / 3.0));
+
+    // alb 0 low turb
+    elev_matrix = dataset + (6*(int_turbidity-1));
+    //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+    res = (1.0-albedo) * (1.0 - turbidity_rem) *
+        ( pow(1.0-solar_elevation, 5.0) * elev_matrix[0] +
+         5.0*pow(1.0-solar_elevation, 4.0)*solar_elevation * elev_matrix[1] +
+         10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[2] +
+         10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[3] +
+         5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[4] +
+         pow(solar_elevation, 5.0) * elev_matrix[5]);
+
+    // alb 1 low turb
+    elev_matrix = dataset + (6*10 + 6*(int_turbidity-1));
+    //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+    res += (albedo) * (1.0 - turbidity_rem) *
+        ( pow(1.0-solar_elevation, 5.0) * elev_matrix[0] +
+         5.0*pow(1.0-solar_elevation, 4.0)*solar_elevation * elev_matrix[1] +
+         10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[2] +
+         10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[3] +
+         5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[4] +
+         pow(solar_elevation, 5.0) * elev_matrix[5]);
+    if(int_turbidity == 10)
+        return res;
+
+    // alb 0 high turb
+    elev_matrix = dataset + (6*(int_turbidity));
+    //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+    res += (1.0-albedo) * (turbidity_rem) *
+        ( pow(1.0-solar_elevation, 5.0) * elev_matrix[0] +
+         5.0*pow(1.0-solar_elevation, 4.0)*solar_elevation * elev_matrix[1] +
+         10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[2] +
+         10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[3] +
+         5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[4] +
+         pow(solar_elevation, 5.0) * elev_matrix[5]);
+
+    // alb 1 high turb
+    elev_matrix = dataset + (6*10 + 6*(int_turbidity));
+    //(1-t).^3* A1 + 3*(1-t).^2.*t * A2 + 3*(1-t) .* t .^ 2 * A3 + t.^3 * A4;
+    res += (albedo) * (turbidity_rem) *
+        ( pow(1.0-solar_elevation, 5.0) * elev_matrix[0] +
+         5.0*pow(1.0-solar_elevation, 4.0)*solar_elevation * elev_matrix[1] +
+         10.0*pow(1.0-solar_elevation, 3.0)*pow(solar_elevation, 2.0) * elev_matrix[2] +
+         10.0*pow(1.0-solar_elevation, 2.0)*pow(solar_elevation, 3.0) * elev_matrix[3] +
+         5.0*(1.0-solar_elevation)*pow(solar_elevation, 4.0) * elev_matrix[4] +
+         pow(solar_elevation, 5.0) * elev_matrix[5]);
+    return res;
+}
+
+double ArHosekSkyModel_GetRadianceInternal(
+        ArHosekSkyModelConfiguration  configuration, 
+        double                        theta, 
+        double                        gamma
+        )
+{
+    const double expM = exp(configuration[4] * gamma);
+    const double rayM = cos(gamma)*cos(gamma);
+    const double mieM = (1.0 + cos(gamma)*cos(gamma)) / pow((1.0 + configuration[8]*configuration[8] - 2.0*configuration[8]*cos(gamma)), 1.5);
+    const double zenith = sqrt(cos(theta));
+
+    return (1.0 + configuration[0] * exp(configuration[1] / (cos(theta) + 0.01))) *
+            (configuration[2] + configuration[3] * expM + configuration[5] * rayM + configuration[6] * mieM + configuration[7] * zenith);
+}
+
+void arhosekskymodelstate_free(
+        ArHosekSkyModelState  * state
+        )
+{
+    free(state);
+}
+
+double arhosekskymodel_radiance(
+        ArHosekSkyModelState  * state,
+        double                  theta, 
+        double                  gamma, 
+        double                  wavelength
+        )
+{
+    int low_wl = (wavelength - 320.0 ) / 40.0;
+
+    if ( low_wl < 0 || low_wl >= 11 )
+        return 0.0f;
+
+    double interp = fmod((wavelength - 320.0 ) / 40.0, 1.0);
+
+    double val_low = 
+          ArHosekSkyModel_GetRadianceInternal(
+                state->configs[low_wl],
+                theta,
+                gamma
+              )
+        * state->radiances[low_wl]
+        * state->emission_correction_factor_sky[low_wl];
+
+    if ( interp < 1e-6 )
+        return val_low;
+
+    double result = ( 1.0 - interp ) * val_low;
+
+    if ( low_wl+1 < 11 )
+    {
+        result +=
+              interp
+            * ArHosekSkyModel_GetRadianceInternal(
+                    state->configs[low_wl+1],
+                    theta,
+                    gamma
+                  )
+            * state->radiances[low_wl+1]
+            * state->emission_correction_factor_sky[low_wl+1];
+    }
+
+    return result;
+}
+
+
+// xyz and rgb versions
+
+ArHosekSkyModelState  * arhosek_xyz_skymodelstate_alloc_init(
+        const double  turbidity, 
+        const double  albedo, 
+        const double  elevation
+        )
+{
+    ArHosekSkyModelState  * state = ALLOC(ArHosekSkyModelState);
+
+    state->solar_radius = TERRESTRIAL_SOLAR_RADIUS;
+    state->turbidity    = turbidity;
+    state->albedo       = albedo;
+    state->elevation    = elevation;
+    
+    for( unsigned int channel = 0; channel < 3; ++channel )
+    {
+        ArHosekSkyModel_CookConfiguration(
+            datasetsXYZ[channel], 
+            state->configs[channel], 
+            turbidity, 
+            albedo, 
+            elevation
+            );
+        
+        state->radiances[channel] = 
+        ArHosekSkyModel_CookRadianceConfiguration(
+            datasetsXYZRad[channel],
+            turbidity, 
+            albedo,
+            elevation
+            );
+    }
+    
+    return state;
+}
+
+CCL_NAMESPACE_END
+
diff --git a/intern/cycles/render/sky_model.h b/intern/cycles/render/sky_model.h
new file mode 100644
index 00000000000..4f0833aef5a
--- /dev/null
+++ b/intern/cycles/render/sky_model.h
@@ -0,0 +1,454 @@
+/*
+This source is published under the following 3-clause BSD license.
+
+Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * None of the names of the contributors may be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/* ============================================================================
+
+This file is part of a sample implementation of the analytical skylight and
+solar radiance models presented in the SIGGRAPH 2012 paper
+
+
+           "An Analytic Model for Full Spectral Sky-Dome Radiance"
+
+and the 2013 IEEE CG&A paper
+
+       "Adding a Solar Radiance Function to the Hosek Skylight Model"
+
+                                   both by 
+
+                       Lukas Hosek and Alexander Wilkie
+                Charles University in Prague, Czech Republic
+
+
+                        Version: 1.4a, February 22nd, 2013
+                        
+Version history:
+
+1.4a  February 22nd, 2013
+      Removed unnecessary and counter-intuitive solar radius parameters 
+      from the interface of the colourspace sky dome initialisation functions.
+
+1.4   February 11th, 2013
+      Fixed a bug which caused the relative brightness of the solar disc
+      and the sky dome to be off by a factor of about 6. The sun was too 
+      bright: this affected both normal and alien sun scenarios. The 
+      coefficients of the solar radiance function were changed to fix this.
+
+1.3   January 21st, 2013 (not released to the public)
+      Added support for solar discs that are not exactly the same size as
+      the terrestrial sun. Also added support for suns with a different
+      emission spectrum ("Alien World" functionality).
+
+1.2a  December 18th, 2012
+      Fixed a mistake and some inaccuracies in the solar radiance function
+      explanations found in ArHosekSkyModel.h. The actual source code is
+      unchanged compared to version 1.2.
+
+1.2   December 17th, 2012
+      Native RGB data and a solar radiance function that matches the turbidity
+      conditions were added.
+
+1.1   September 2012
+      The coefficients of the spectral model are now scaled so that the output
+      is given in physical units: W / (m^-2 * sr * nm). Also, the output of the
+      XYZ model is now no longer scaled to the range [0...1]. Instead, it is
+      the result of a simple conversion from spectral data via the CIE 2 degree
+      standard observer matching functions. Therefore, after multiplication
+      with 683 lm / W, the Y channel now corresponds to luminance in lm.
+     
+1.0   May 11th, 2012
+      Initial release.
+
+
+Please visit http://cgg.mff.cuni.cz/projects/SkylightModelling/ to check if
+an updated version of this code has been published!
+
+============================================================================ */
+
+
+/*
+
+This code is taken from ART, a rendering research system written in a
+mix of C99 / Objective C. Since ART is not a small system and is intended to 
+be inter-operable with other libraries, and since C does not have namespaces, 
+the structures and functions in ART all have to have somewhat wordy 
+canonical names that begin with Ar.../ar..., like those seen in this example.
+
+Usage information:
+==================
+
+
+Model initialisation
+--------------------
+
+A separate ArHosekSkyModelState has to be maintained for each spectral
+band you want to use the model for. So in a renderer with 'num_channels'
+bands, you would need something like
+
+    ArHosekSkyModelState  * skymodel_state[num_channels];
+
+You then have to allocate and initialise these states. In the following code
+snippet, we assume that 'albedo' is defined as
+
+    double  albedo[num_channels];
+
+with a ground albedo value between [0,1] for each channel. The solar elevation  
+is given in radians.
+
+    for ( unsigned int i = 0; i < num_channels; i++ )
+        skymodel_state[i] =
+            arhosekskymodelstate_alloc_init(
+                  turbidity,
+                  albedo[i],
+                  solarElevation
+                );
+
+Note that starting with version 1.3, there is also a second initialisation 
+function which generates skydome states for different solar emission spectra 
+and solar radii: 'arhosekskymodelstate_alienworld_alloc_init()'.
+
+See the notes about the "Alien World" functionality provided further down for a 
+discussion of the usefulness and limits of that second initalisation function.
+Sky model states that have been initialised with either function behave in a
+completely identical fashion during use and cleanup.
+
+Using the model to generate skydome samples
+-------------------------------------------
+
+Generating a skydome radiance spectrum "skydome_result" for a given location
+on the skydome determined via the angles theta and gamma works as follows:
+
+    double  skydome_result[num_channels];
+
+    for ( unsigned int i = 0; i < num_channels; i++ )
+        skydome_result[i] =
+            arhosekskymodel_radiance(
+                skymodel_state[i],
+                theta,
+                gamma,
+                channel_center[i]
+              );
+              
+The variable "channel_center" is assumed to hold the channel center wavelengths
+for each of the num_channels samples of the spectrum we are building.
+
+
+Cleanup after use
+-----------------
+
+After rendering is complete, the content of the sky model states should be
+disposed of via
+
+        for ( unsigned int i = 0; i < num_channels; i++ )
+            arhosekskymodelstate_free( skymodel_state[i] );
+
+
+CIE XYZ Version of the Model
+----------------------------
+
+Usage of the CIE XYZ version of the model is exactly the same, except that
+num_channels is of course always 3, and that ArHosekTristimSkyModelState and
+arhosek_tristim_skymodel_radiance() have to be used instead of their spectral
+counterparts.
+
+RGB Version of the Model
+------------------------
+
+The RGB version uses sRGB primaries with a linear gamma ramp. The same set of
+functions as with the XYZ data is used, except the model is initialized
+by calling arhosek_rgb_skymodelstate_alloc_init.
+
+Solar Radiance Function
+-----------------------
+
+For each position on the solar disc, this function returns the entire radiance 
+one sees - direct emission, as well as in-scattered light in the area of the 
+solar disc. The latter is important for low solar elevations - nice images of 
+the setting sun would not be possible without this. This is also the reason why 
+this function, just like the regular sky dome model evaluation function, needs 
+access to the sky dome data structures, as these provide information on 
+in-scattered radiance.
+
+CAVEAT #1: in this release, this function is only provided in spectral form!
+           RGB/XYZ versions to follow at a later date.
+
+CAVEAT #2: (fixed from release 1.3 onwards) 
+
+CAVEAT #3: limb darkening renders the brightness of the solar disc
+           inhomogeneous even for high solar elevations - only taking a single
+           sample at the centre of the sun will yield an incorrect power
+           estimate for the solar disc! Always take multiple random samples
+           across the entire solar disc to estimate its power!
+           
+CAVEAT #4: in this version, the limb darkening calculations still use a fairly
+           computationally expensive 5th order polynomial that was directly 
+           taken from astronomical literature. For the purposes of Computer
+           Graphics, this is needlessly accurate, though, and will be replaced 
+           by a cheaper approximation in a future release.
+
+"Alien World" functionality
+---------------------------
+
+The Hosek sky model can be used to roughly (!) predict the appearance of 
+outdoor scenes on earth-like planets, i.e. planets of a similar size and 
+atmospheric make-up. Since the spectral version of our model predicts sky dome 
+luminance patterns and solar radiance independently for each waveband, and 
+since the intensity of each waveband is solely dependent on the input radiance 
+from the star that the world in question is orbiting, it is trivial to re-scale 
+the wavebands to match a different star radiance.
+
+At least in theory, the spectral version of the model has always been capable 
+of this sort of thing, and the actual sky dome and solar radiance models were 
+actually not altered at all in this release. All we did was to add some support
+functionality for doing this more easily with the existing data and functions, 
+and to add some explanations.
+
+Just use 'arhosekskymodelstate_alienworld_alloc_init()' to initialise the sky
+model states (you will have to provide values for star temperature and solar 
+intensity compared to the terrestrial sun), and do everything else as you 
+did before.
+
+CAVEAT #1: we assume the emission of the star that illuminates the alien world 
+           to be a perfect blackbody emission spectrum. This is never entirely 
+           realistic - real star emission spectra are considerably more complex 
+           than this, mainly due to absorption effects in the outer layers of 
+           stars. However, blackbody spectra are a reasonable first assumption 
+           in a usage scenario like this, where 100% accuracy is simply not 
+           necessary: for rendering purposes, there are likely no visible 
+           differences between a highly accurate solution based on a more 
+           involved simulation, and this approximation.
+
+CAVEAT #2: we always use limb darkening data from our own sun to provide this
+           "appearance feature", even for suns of strongly different 
+           temperature. Which is presumably not very realistic, but (as with 
+           the unaltered blackbody spectrum from caveat #1) probably not a bad 
+           first guess, either. If you need more accuracy than we provide here,
+           please make inquiries with a friendly astro-physicst of your choice.
+
+CAVEAT #3: you have to provide a value for the solar intensity of the star 
+           which illuminates the alien world. For this, please bear in mind  
+           that there is very likely a comparatively tight range of absolute  
+           solar irradiance values for which an earth-like planet with an  
+           atmosphere like the one we assume in our model can exist in the  
+           first place!
+            
+           Too much irradiance, and the atmosphere probably boils off into 
+           space, too little, it freezes. Which means that stars of 
+           considerably different emission colour than our sun will have to be 
+           fairly different in size from it, to still provide a reasonable and 
+           inhabitable amount of irradiance. Red stars will need to be much 
+           larger than our sun, while white or blue stars will have to be 
+           comparatively tiny. The initialisation function handles this and 
+           computes a plausible solar radius for a given emission spectrum. In
+           terms of absolute radiometric values, you should probably not stray
+           all too far from a solar intensity value of 1.0.
+
+CAVEAT #4: although we now support different solar radii for the actual solar 
+           disc, the sky dome luminance patterns are *not* parameterised by 
+           this value - i.e. the patterns stay exactly the same for different 
+           solar radii! Which is of course not correct. But in our experience, 
+           solar discs up to several degrees in diameter (! - our own sun is 
+           half a degree across) do not cause the luminance patterns on the sky 
+           to change perceptibly. The reason we know this is that we initially 
+           used unrealistically large suns in our brute force path tracer, in 
+           order to improve convergence speeds (which in the beginning were 
+           abysmal). Later, we managed to do the reference renderings much 
+           faster even with realistically small suns, and found that there was 
+           no real difference in skydome appearance anyway. 
+           Conclusion: changing the solar radius should not be over-done, so  
+           close orbits around red supergiants are a no-no. But for the  
+           purposes of getting a fairly credible first impression of what an 
+           alien world with a reasonably sized sun would look like, what we are  
+           doing here is probably still o.k.
+
+HINT #1:   if you want to model the sky of an earth-like planet that orbits 
+           a binary star, just super-impose two of these models with solar 
+           intensity of ~0.5 each, and closely spaced solar positions. Light is
+           additive, after all. Tattooine, here we come... :-)
+
+           P.S. according to Star Wars canon, Tattooine orbits a binary
+           that is made up of a G and K class star, respectively. 
+           So ~5500K and ~4200K should be good first guesses for their 
+           temperature. Just in case you were wondering, after reading the
+           previous paragraph.
+*/
+
+CCL_NAMESPACE_BEGIN
+
+#ifndef _SKY_MODEL_H_
+#define _SKY_MODEL_H_
+
+typedef double ArHosekSkyModelConfiguration[9];
+
+
+//   Spectral version of the model
+
+/* ----------------------------------------------------------------------------
+
+    ArHosekSkyModelState struct
+    ---------------------------
+
+    This struct holds the pre-computation data for one particular albedo value.
+    Most fields are self-explanatory, but users should never directly 
+    manipulate any of them anyway. The only consistent way to manipulate such 
+    structs is via the functions 'arhosekskymodelstate_alloc_init' and 
+    'arhosekskymodelstate_free'.
+    
+    'emission_correction_factor_sky'
+    'emission_correction_factor_sun'
+
+        The original model coefficients were fitted against the emission of 
+        our local sun. If a different solar emission is desired (i.e. if the
+        model is being used to predict skydome appearance for an earth-like 
+        planet that orbits a different star), these correction factors, which 
+        are determined during the alloc_init step, are applied to each waveband 
+        separately (they default to 1.0 in normal usage). This is the simplest 
+        way to retrofit this sort of capability to the existing model. The 
+        different factors for sky and sun are needed since the solar disc may 
+        be of a different size compared to the terrestrial sun.
+
+---------------------------------------------------------------------------- */
+
+typedef struct ArHosekSkyModelState
+{
+    ArHosekSkyModelConfiguration  configs[11];
+    double                        radiances[11];
+    double                        turbidity;
+    double                        solar_radius;
+    double                        emission_correction_factor_sky[11];
+    double                        emission_correction_factor_sun[11];
+    double                        albedo;
+    double                        elevation;
+} 
+ArHosekSkyModelState;
+
+/* ----------------------------------------------------------------------------
+
+    arhosekskymodelstate_alloc_init() function
+    ------------------------------------------
+
+    Initialises an ArHosekSkyModelState struct for a terrestrial setting.
+
+---------------------------------------------------------------------------- */
+
+ArHosekSkyModelState  * arhosekskymodelstate_alloc_init(
+        const double  solar_elevation,
+        const double  atmospheric_turbidity,
+        const double  ground_albedo
+        );
+
+
+/* ----------------------------------------------------------------------------
+
+    arhosekskymodelstate_alienworld_alloc_init() function
+    -----------------------------------------------------
+
+    Initialises an ArHosekSkyModelState struct for an "alien world" setting
+    with a sun of a surface temperature given in 'kelvin'. The parameter
+    'solar_intensity' controls the overall brightness of the sky, relative
+    to the solar irradiance on Earth. A value of 1.0 yields a sky dome that
+    is, on average over the wavelenghts covered in the model (!), as bright
+    as the terrestrial sky in radiometric terms. 
+    
+    Which means that the solar radius has to be adjusted, since the 
+    emissivity of a solar surface with a given temperature is more or less 
+    fixed. So hotter suns have to be smaller to be equally bright as the 
+    terrestrial sun, while cooler suns have to be larger. Note that there are
+    limits to the validity of the luminance patterns of the underlying model:
+    see the discussion above for more on this. In particular, an alien sun with
+    a surface temperature of only 2000 Kelvin has to be very large if it is
+    to be as bright as the terrestrial sun - so large that the luminance 
+    patterns are no longer a really good fit in that case.
+    
+    If you need information about the solar radius that the model computes
+    for a given temperature (say, for light source sampling purposes), you 
+    have to query the 'solar_radius' variable of the sky model state returned 
+    *after* running this function.
+
+---------------------------------------------------------------------------- */
+
+ArHosekSkyModelState  * arhosekskymodelstate_alienworld_alloc_init(
+        const double  solar_elevation,
+        const double  solar_intensity,
+        const double  solar_surface_temperature_kelvin,
+        const double  atmospheric_turbidity,
+        const double  ground_albedo
+        );
+
+void arhosekskymodelstate_free(
+        ArHosekSkyModelState  * state
+        );
+
+double arhosekskymodel_radiance(
+        ArHosekSkyModelState  * state,
+        double                  theta, 
+        double                  gamma, 
+        double                  wavelength
+        );
+
+// CIE XYZ and RGB versions
+
+
+ArHosekSkyModelState  * arhosek_xyz_skymodelstate_alloc_init(
+        const double  turbidity, 
+        const double  albedo, 
+        const double  elevation
+        );
+
+
+ArHosekSkyModelState  * arhosek_rgb_skymodelstate_alloc_init(
+        const double  turbidity, 
+        const double  albedo, 
+        const double  elevation
+        );
+
+
+double arhosek_tristim_skymodel_radiance(
+        ArHosekSkyModelState  * state,
+        double                  theta,
+        double                  gamma, 
+        int                     channel
+        );
+
+//   Delivers the complete function: sky + sun, including limb darkening.
+//   Please read the above description before using this - there are several
+//   caveats!
+
+double arhosekskymodel_solar_radiance(
+        ArHosekSkyModelState      * state,
+        double                      theta,
+        double                      gamma,
+        double                      wavelength
+        );
+
+
+#endif // _SKY_MODEL_H_
+
+CCL_NAMESPACE_END
diff --git a/intern/cycles/render/sky_model_data.h b/intern/cycles/render/sky_model_data.h
new file mode 100644
index 00000000000..a292eeacff0
--- /dev/null
+++ b/intern/cycles/render/sky_model_data.h
@@ -0,0 +1,3866 @@
+/*
+This source is published under the following 3-clause BSD license.
+
+Copyright (c) 2012 - 2013, Lukas Hosek and Alexander Wilkie
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * None of the names of the contributors may be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/* ============================================================================
+
+This file is part of a sample implementation of the analytical skylight and
+solar radiance models presented in the SIGGRAPH 2012 paper
+
+
+           "An Analytic Model for Full Spectral Sky-Dome Radiance"
+
+and the 2013 IEEE CG&A paper
+
+       "Adding a Solar Radiance Function to the Hosek Skylight Model"
+
+                                   both by 
+
+                       Lukas Hosek and Alexander Wilkie
+                Charles University in Prague, Czech Republic
+
+
+                        Version: 1.4a, February 22nd, 2013
+                        
+Version history:
+
+1.4a  February 22nd, 2013
+      Removed unnecessary and counter-intuitive solar radius parameters 
+      from the interface of the colourspace sky dome initialisation functions.
+
+1.4   February 11th, 2013
+      Fixed a bug which caused the relative brightness of the solar disc
+      and the sky dome to be off by a factor of about 6. The sun was too 
+      bright: this affected both normal and alien sun scenarios. The 
+      coefficients of the solar radiance function were changed to fix this.
+
+1.3   January 21st, 2013 (not released to the public)
+      Added support for solar discs that are not exactly the same size as
+      the terrestrial sun. Also added support for suns with a different
+      emission spectrum ("Alien World" functionality).
+
+1.2a  December 18th, 2012
+      Fixed a mistake and some inaccuracies in the solar radiance function
+      explanations found in ArHosekSkyModel.h. The actual source code is
+      unchanged compared to version 1.2.
+
+1.2   December 17th, 2012
+      Native RGB data and a solar radiance function that matches the turbidity
+      conditions were added.
+
+1.1   September 2012
+      The coefficients of the spectral model are now scaled so that the output
+      is given in physical units: W / (m^-2 * sr * nm). Also, the output of the
+      XYZ model is now no longer scaled to the range [0...1]. Instead, it is
+      the result of a simple conversion from spectral data via the CIE 2 degree
+      standard observer matching functions. Therefore, after multiplication
+      with 683 lm / W, the Y channel now corresponds to luminance in lm.
+     
+1.0   May 11th, 2012
+      Initial release.
+
+
+Please visit http://cgg.mff.cuni.cz/projects/SkylightModelling/ to check if
+an updated version of this code has been published!
+
+============================================================================ */
+
+CCL_NAMESPACE_BEGIN
+
+/*
+
+This file contains the coefficient data for the XYZ colour space version of 
+the model.
+
+*/
+
+// Uses Sep 9 pattern / Aug 23 mean dataset
+
+double datasetXYZ1[] = 
+{
+	// albedo 0, turbidity 1
+	-1.117001e+000,
+	-1.867262e-001,
+	-1.113505e+001,
+	1.259865e+001,
+	-3.937339e-002,
+	1.167571e+000,
+	7.100686e-003,
+	3.592678e+000,
+	6.083296e-001,
+	-1.152006e+000,
+	-1.926669e-001,
+	6.152049e+000,
+	-4.770802e+000,
+	-8.704701e-002,
+	7.483626e-001,
+	3.372718e-002,
+	4.464592e+000,
+	4.036546e-001,
+	-1.072371e+000,
+	-2.696632e-001,
+	2.816168e-001,
+	1.820571e+000,
+	-3.742666e-001,
+	2.080607e+000,
+	-7.675295e-002,
+	-2.835366e+000,
+	1.129329e+000,
+	-1.109935e+000,
+	-1.532764e-001,
+	1.198787e+000,
+	-9.015183e-001,
+	5.173015e-003,
+	5.749178e-001,
+	1.075633e-001,
+	4.387949e+000,
+	2.650413e-001,
+	-1.052297e+000,
+	-2.229452e-001,
+	1.952347e+000,
+	5.727205e-001,
+	-4.885070e+000,
+	1.984016e+000,
+	-1.106197e-001,
+	-4.898361e-001,
+	8.907873e-001,
+	-1.070108e+000,
+	-1.600465e-001,
+	1.593886e+000,
+	-4.479251e-005,
+	-3.306541e+000,
+	9.390193e-001,
+	9.513168e-002,
+	2.343583e+000,
+	5.335404e-001,
+	// albedo 0, turbidity 2
+	-1.113253e+000,
+	-1.699600e-001,
+	-1.038822e+001,
+	1.137513e+001,
+	-4.040911e-002,
+	1.037455e+000,
+	4.991792e-002,
+	4.801919e+000,
+	6.302710e-001,
+	-1.135747e+000,
+	-1.678594e-001,
+	4.970755e+000,
+	-4.430230e+000,
+	-6.657408e-002,
+	3.636161e-001,
+	1.558009e-001,
+	6.013370e+000,
+	3.959601e-001,
+	-1.095892e+000,
+	-2.732595e-001,
+	7.666496e-001,
+	1.350731e+000,
+	-4.401401e-001,
+	2.470135e+000,
+	-1.707929e-001,
+	-3.260793e+000,
+	1.170337e+000,
+	-1.073668e+000,
+	-2.603929e-002,
+	-1.944589e-001,
+	4.575207e-001,
+	6.878164e-001,
+	-1.390770e-001,
+	3.690299e-001,
+	7.885781e+000,
+	1.877694e-001,
+	-1.070091e+000,
+	-2.798957e-001,
+	2.338478e+000,
+	-2.647221e+000,
+	-7.387808e+000,
+	2.329210e+000,
+	-1.644639e-001,
+	-2.003710e+000,
+	9.874527e-001,
+	-1.067120e+000,
+	-1.418866e-001,
+	1.254090e+000,
+	6.053048e+000,
+	-2.918892e+000,
+	5.322812e-001,
+	1.613053e-001,
+	3.018161e+000,
+	5.274090e-001,
+	// albedo 0, turbidity 3
+	-1.129483e+000,
+	-1.890619e-001,
+	-9.065101e+000,
+	9.659923e+000,
+	-3.607819e-002,
+	8.314359e-001,
+	8.181661e-002,
+	4.768868e+000,
+	6.339777e-001,
+	-1.146420e+000,
+	-1.883579e-001,
+	3.309173e+000,
+	-3.127882e+000,
+	-6.938176e-002,
+	3.987113e-001,
+	1.400581e-001,
+	6.283042e+000,
+	5.267076e-001,
+	-1.128348e+000,
+	-2.641305e-001,
+	1.223176e+000,
+	5.514952e-002,
+	-3.490649e-001,
+	1.997784e+000,
+	-4.123709e-002,
+	-2.251251e+000,
+	9.483466e-001,
+	-1.025820e+000,
+	1.404690e-002,
+	-1.187406e+000,
+	2.729900e+000,
+	5.877588e-001,
+	-2.761140e-001,
+	4.602633e-001,
+	8.305125e+000,
+	3.945001e-001,
+	-1.083957e+000,
+	-2.606679e-001,
+	2.207108e+000,
+	-7.202803e+000,
+	-5.968103e+000,
+	2.129455e+000,
+	-7.789512e-002,
+	-1.137688e+000,
+	8.871769e-001,
+	-1.062465e+000,
+	-1.512189e-001,
+	1.042881e+000,
+	1.427839e+001,
+	-4.242214e+000,
+	4.038100e-001,
+	1.997780e-001,
+	2.814449e+000,
+	5.803196e-001,
+	// albedo 0, turbidity 4
+	-1.175099e+000,
+	-2.410789e-001,
+	-1.108587e+001,
+	1.133404e+001,
+	-1.819300e-002,
+	6.772942e-001,
+	9.605043e-002,
+	4.231166e+000,
+	6.239972e-001,
+	-1.224207e+000,
+	-2.883527e-001,
+	3.002206e+000,
+	-2.649612e+000,
+	-4.795418e-002,
+	4.984398e-001,
+	3.251434e-002,
+	4.851611e+000,
+	6.551019e-001,
+	-1.136955e+000,
+	-2.423048e-001,
+	1.058823e+000,
+	-2.489236e-001,
+	-2.462179e-001,
+	1.933140e+000,
+	9.106828e-002,
+	-1.905869e-001,
+	8.171065e-001,
+	-1.014535e+000,
+	-8.262500e-003,
+	-1.448017e+000,
+	2.295788e+000,
+	3.510334e-001,
+	-1.477418e+000,
+	5.432449e-001,
+	5.762796e+000,
+	4.908751e-001,
+	-1.070666e+000,
+	-2.379780e-001,
+	1.844589e+000,
+	-5.442448e+000,
+	-4.012768e+000,
+	2.945275e+000,
+	9.854725e-003,
+	8.455959e-002,
+	8.145030e-001,
+	-1.071525e+000,
+	-1.777132e-001,
+	8.076590e-001,
+	9.925865e+000,
+	-3.324623e+000,
+	-6.367437e-001,
+	2.844581e-001,
+	2.248384e+000,
+	6.544022e-001,
+	// albedo 0, turbidity 5
+	-1.218818e+000,
+	-2.952382e-001,
+	-1.345975e+001,
+	1.347153e+001,
+	-6.814585e-003,
+	5.079068e-001,
+	1.197230e-001,
+	3.776949e+000,
+	5.836961e-001,
+	-1.409868e+000,
+	-5.114330e-001,
+	2.776539e+000,
+	-2.039001e+000,
+	-2.673769e-002,
+	4.145288e-001,
+	7.829342e-004,
+	2.275883e+000,
+	6.629691e-001,
+	-1.069151e+000,
+	-9.434247e-002,
+	7.293972e-001,
+	-1.222473e+000,
+	-1.533461e-001,
+	2.160357e+000,
+	4.626837e-002,
+	3.852415e+000,
+	8.593570e-001,
+	-1.021306e+000,
+	-1.149551e-001,
+	-1.108414e+000,
+	4.178343e+000,
+	4.013665e-001,
+	-2.222814e+000,
+	6.929462e-001,
+	1.392652e+000,
+	4.401662e-001,
+	-1.074251e+000,
+	-2.224002e-001,
+	1.372356e+000,
+	-8.858704e+000,
+	-3.922660e+000,
+	3.020018e+000,
+	-1.458724e-002,
+	1.511186e+000,
+	8.288064e-001,
+	-1.062048e+000,
+	-1.526582e-001,
+	4.921067e-001,
+	1.485522e+001,
+	-3.229936e+000,
+	-8.426604e-001,
+	3.916243e-001,
+	2.678994e+000,
+	6.689264e-001,
+	// albedo 0, turbidity 6
+	-1.257023e+000,
+	-3.364700e-001,
+	-1.527795e+001,
+	1.504223e+001,
+	2.717715e-003,
+	3.029910e-001,
+	1.636851e-001,
+	3.561663e+000,
+	5.283161e-001,
+	-1.635124e+000,
+	-7.329993e-001,
+	3.523939e+000,
+	-2.566337e+000,
+	-1.902543e-002,
+	5.505483e-001,
+	-6.242176e-002,
+	1.065992e+000,
+	6.654236e-001,
+	-9.295823e-001,
+	4.845834e-002,
+	-2.992990e-001,
+	-2.001327e-001,
+	-8.019339e-002,
+	1.807806e+000,
+	9.020277e-002,
+	5.095372e+000,
+	8.639936e-001,
+	-1.093740e+000,
+	-2.148608e-001,
+	-5.216240e-001,
+	2.119777e+000,
+	9.506454e-002,
+	-1.831439e+000,
+	6.961204e-001,
+	1.102084e-001,
+	4.384319e-001,
+	-1.044181e+000,
+	-1.849257e-001,
+	9.071246e-001,
+	-4.648901e+000,
+	-2.279385e+000,
+	2.356502e+000,
+	-4.169147e-002,
+	1.932557e+000,
+	8.296550e-001,
+	-1.061451e+000,
+	-1.458745e-001,
+	2.952267e-001,
+	8.967214e+000,
+	-3.726228e+000,
+	-5.022316e-001,
+	5.684877e-001,
+	3.102347e+000,
+	6.658443e-001,
+	// albedo 0, turbidity 7
+	-1.332391e+000,
+	-4.127769e-001,
+	-9.328643e+000,
+	9.046194e+000,
+	3.457775e-003,
+	3.377425e-001,
+	1.530909e-001,
+	3.301209e+000,
+	4.997917e-001,
+	-1.932002e+000,
+	-9.947777e-001,
+	-2.042329e+000,
+	3.586940e+000,
+	-5.642182e-002,
+	8.130478e-001,
+	-8.195988e-002,
+	1.118294e-001,
+	5.617231e-001,
+	-8.707374e-001,
+	1.286999e-001,
+	1.820054e+000,
+	-4.674706e+000,
+	3.317471e-003,
+	5.919018e-001,
+	1.975278e-001,
+	6.686519e+000,
+	9.631727e-001,
+	-1.070378e+000,
+	-3.030579e-001,
+	-9.041938e-001,
+	6.200201e+000,
+	1.232207e-001,
+	-3.650628e-001,
+	5.029403e-001,
+	-2.903162e+000,
+	3.811408e-001,
+	-1.063035e+000,
+	-1.637545e-001,
+	5.853072e-001,
+	-7.889906e+000,
+	-1.200641e+000,
+	1.035018e+000,
+	1.192093e-001,
+	3.267054e+000,
+	8.416151e-001,
+	-1.053655e+000,
+	-1.562286e-001,
+	2.423683e-001,
+	1.128575e+001,
+	-4.363262e+000,
+	-7.314160e-002,
+	5.642088e-001,
+	2.514023e+000,
+	6.670457e-001,
+	// albedo 0, turbidity 8
+	-1.366112e+000,
+	-4.718287e-001,
+	-7.876222e+000,
+	7.746900e+000,
+	-9.182309e-003,
+	4.716076e-001,
+	8.320252e-002,
+	3.165603e+000,
+	5.392334e-001,
+	-2.468204e+000,
+	-1.336340e+000,
+	-5.386723e+000,
+	7.072672e+000,
+	-8.329266e-002,
+	8.636876e-001,
+	-1.978177e-002,
+	-1.326218e-001,
+	2.979222e-001,
+	-9.653522e-001,
+	-2.373416e-002,
+	1.810250e+000,
+	-6.467262e+000,
+	1.410706e-001,
+	-4.753717e-001,
+	3.003095e-001,
+	6.551163e+000,
+	1.151083e+000,
+	-8.943186e-001,
+	-2.487152e-001,
+	-2.308960e-001,
+	8.512648e+000,
+	1.298402e-001,
+	1.034705e+000,
+	2.303509e-001,
+	-3.924095e+000,
+	2.982717e-001,
+	-1.146999e+000,
+	-2.318784e-001,
+	8.992419e-002,
+	-9.933614e+000,
+	-8.860920e-001,
+	-3.071656e-002,
+	2.852012e-001,
+	3.046199e+000,
+	8.599001e-001,
+	-1.032399e+000,
+	-1.645145e-001,
+	2.683599e-001,
+	1.327701e+001,
+	-4.407670e+000,
+	7.709869e-002,
+	4.951727e-001,
+	1.957277e+000,
+	6.630943e-001,
+	// albedo 0, turbidity 9
+	-1.469070e+000,
+	-6.135092e-001,
+	-6.506263e+000,
+	6.661315e+000,
+	-3.835383e-002,
+	7.150413e-001,
+	7.784318e-003,
+	2.820577e+000,
+	6.756784e-001,
+	-2.501583e+000,
+	-1.247404e+000,
+	-1.523462e+001,
+	1.633191e+001,
+	-1.204803e-002,
+	5.896471e-001,
+	-2.002023e-002,
+	1.144647e+000,
+	6.177874e-002,
+	-2.438672e+000,
+	-1.127291e+000,
+	5.731172e+000,
+	-1.021350e+001,
+	6.165610e-002,
+	-7.752641e-001,
+	4.708254e-001,
+	4.176847e+000,
+	1.200881e+000,
+	-1.513427e-001,
+	9.792731e-002,
+	-1.612349e+000,
+	9.814289e+000,
+	5.188921e-002,
+	1.716403e+000,
+	-7.039255e-002,
+	-2.815115e+000,
+	3.291874e-001,
+	-1.318511e+000,
+	-3.650554e-001,
+	4.221268e-001,
+	-9.294529e+000,
+	-4.397520e-002,
+	-8.100625e-001,
+	3.742719e-001,
+	1.834166e+000,
+	8.223450e-001,
+	-1.016009e+000,
+	-1.820264e-001,
+	1.278426e-001,
+	1.182696e+001,
+	-4.801528e+000,
+	4.947899e-001,
+	4.660378e-001,
+	1.601254e+000,
+	6.702359e-001,
+	// albedo 0, turbidity 10
+	-1.841310e+000,
+	-9.781779e-001,
+	-4.610903e+000,
+	4.824662e+000,
+	-5.100806e-002,
+	6.463776e-001,
+	-6.377724e-006,
+	2.216875e+000,
+	8.618530e-001,
+	-2.376373e+000,
+	-1.108657e+000,
+	-1.489799e+001,
+	1.546458e+001,
+	4.091025e-002,
+	9.761780e-002,
+	-1.048958e-002,
+	2.165834e+000,
+	-1.609171e-001,
+	-4.710318e+000,
+	-2.261963e+000,
+	6.947327e+000,
+	-1.034828e+001,
+	-1.325542e-001,
+	7.508674e-001,
+	2.247553e-001,
+	2.873142e+000,
+	1.297100e+000,
+	2.163750e-001,
+	-1.944345e-001,
+	-2.437860e+000,
+	1.011314e+001,
+	4.450500e-001,
+	3.111492e-001,
+	2.751323e-001,
+	-1.627906e+000,
+	2.531213e-001,
+	-1.258794e+000,
+	-3.524641e-001,
+	8.425444e-001,
+	-1.085313e+001,
+	-1.154381e+000,
+	-4.638014e-001,
+	-2.781115e-003,
+	4.344498e-001,
+	8.507091e-001,
+	-1.018938e+000,
+	-1.804153e-001,
+	-6.354054e-002,
+	1.573150e+001,
+	-4.386999e+000,
+	6.211115e-001,
+	5.294648e-001,
+	1.580749e+000,
+	6.586655e-001,
+	// albedo 1, turbidity 1
+	-1.116416e+000,
+	-1.917524e-001,
+	-1.068233e+001,
+	1.222221e+001,
+	-3.668978e-002,
+	1.054022e+000,
+	1.592132e-002,
+	3.180583e+000,
+	5.627370e-001,
+	-1.132341e+000,
+	-1.671286e-001,
+	5.976499e+000,
+	-4.227366e+000,
+	-9.542489e-002,
+	8.664938e-001,
+	8.351793e-003,
+	4.876068e+000,
+	4.492779e-001,
+	-1.087635e+000,
+	-3.173679e-001,
+	4.314407e-001,
+	1.100555e+000,
+	-4.410057e-001,
+	1.677253e+000,
+	-3.005925e-002,
+	-4.201249e+000,
+	1.070902e+000,
+	-1.083031e+000,
+	-8.847705e-002,
+	1.291773e+000,
+	4.546776e-001,
+	3.091894e-001,
+	7.261760e-001,
+	4.203659e-002,
+	5.990615e+000,
+	3.704756e-001,
+	-1.057899e+000,
+	-2.246706e-001,
+	2.329563e+000,
+	-1.219656e+000,
+	-5.335260e+000,
+	8.545378e-001,
+	-3.906209e-002,
+	-9.025499e-001,
+	7.797348e-001,
+	-1.073305e+000,
+	-1.522553e-001,
+	1.767063e+000,
+	1.904280e+000,
+	-3.101673e+000,
+	3.995856e-001,
+	2.905192e-002,
+	2.563977e+000,
+	5.753067e-001,
+	// albedo 1, turbidity 2
+	-1.113674e+000,
+	-1.759694e-001,
+	-9.754125e+000,
+	1.087391e+001,
+	-3.841093e-002,
+	9.524272e-001,
+	5.680219e-002,
+	4.227034e+000,
+	6.029571e-001,
+	-1.126496e+000,
+	-1.680281e-001,
+	5.332352e+000,
+	-4.575579e+000,
+	-6.761755e-002,
+	3.295335e-001,
+	1.194896e-001,
+	5.570901e+000,
+	4.536185e-001,
+	-1.103074e+000,
+	-2.681801e-001,
+	6.571479e-002,
+	2.396522e+000,
+	-4.551280e-001,
+	2.466331e+000,
+	-1.232022e-001,
+	-3.023201e+000,
+	1.086379e+000,
+	-1.053299e+000,
+	-2.697173e-002,
+	8.379121e-001,
+	-9.681458e-001,
+	5.890692e-001,
+	-4.872027e-001,
+	2.936929e-001,
+	7.510139e+000,
+	3.079122e-001,
+	-1.079553e+000,
+	-2.710448e-001,
+	2.462379e+000,
+	-3.713554e-001,
+	-8.534512e+000,
+	1.828242e+000,
+	-1.686398e-001,
+	-1.961340e+000,
+	8.941077e-001,
+	-1.069741e+000,
+	-1.396394e-001,
+	1.657868e+000,
+	3.236313e+000,
+	-2.706344e+000,
+	-2.948122e-001,
+	1.314816e-001,
+	2.868457e+000,
+	5.413403e-001,
+	// albedo 1, turbidity 3
+	-1.131649e+000,
+	-1.954455e-001,
+	-7.751595e+000,
+	8.685861e+000,
+	-4.910871e-002,
+	8.992952e-001,
+	4.710143e-002,
+	4.254818e+000,
+	6.821116e-001,
+	-1.156689e+000,
+	-1.884324e-001,
+	3.163519e+000,
+	-3.091522e+000,
+	-6.613927e-002,
+	-2.575883e-002,
+	1.640065e-001,
+	6.073643e+000,
+	4.453468e-001,
+	-1.079224e+000,
+	-2.621389e-001,
+	9.446437e-001,
+	1.448479e+000,
+	-3.969384e-001,
+	2.626638e+000,
+	-8.101186e-002,
+	-3.016355e+000,
+	1.076295e+000,
+	-1.080832e+000,
+	1.033057e-002,
+	-3.500156e-001,
+	-3.281419e-002,
+	5.655512e-001,
+	-1.156742e+000,
+	4.534710e-001,
+	8.774122e+000,
+	2.772869e-001,
+	-1.051202e+000,
+	-2.679975e-001,
+	2.719109e+000,
+	-2.190316e+000,
+	-6.878798e+000,
+	2.250481e+000,
+	-2.030252e-001,
+	-2.026527e+000,
+	9.701096e-001,
+	-1.089849e+000,
+	-1.598589e-001,
+	1.564748e+000,
+	6.869187e+000,
+	-3.053670e+000,
+	-6.110435e-001,
+	1.644472e-001,
+	2.370452e+000,
+	5.511770e-001,
+	// albedo 1, turbidity 4
+	-1.171419e+000,
+	-2.429746e-001,
+	-8.991334e+000,
+	9.571216e+000,
+	-2.772861e-002,
+	6.688262e-001,
+	7.683478e-002,
+	3.785611e+000,
+	6.347635e-001,
+	-1.228554e+000,
+	-2.917562e-001,
+	2.753986e+000,
+	-2.491780e+000,
+	-4.663434e-002,
+	3.118303e-001,
+	7.546506e-002,
+	4.463096e+000,
+	5.955071e-001,
+	-1.093124e+000,
+	-2.447767e-001,
+	9.097406e-001,
+	5.448296e-001,
+	-2.957824e-001,
+	2.024167e+000,
+	-5.152333e-004,
+	-1.069081e+000,
+	9.369565e-001,
+	-1.056994e+000,
+	1.569507e-002,
+	-8.217491e-001,
+	1.870818e+000,
+	7.061930e-001,
+	-1.483928e+000,
+	5.978206e-001,
+	6.864902e+000,
+	3.673332e-001,
+	-1.054871e+000,
+	-2.758129e-001,
+	2.712807e+000,
+	-5.950110e+000,
+	-6.554039e+000,
+	2.447523e+000,
+	-1.895171e-001,
+	-1.454292e+000,
+	9.131738e-001,
+	-1.100218e+000,
+	-1.746241e-001,
+	1.438505e+000,
+	1.115481e+001,
+	-3.266076e+000,
+	-8.837357e-001,
+	1.970100e-001,
+	1.991595e+000,
+	5.907821e-001,
+	// albedo 1, turbidity 5
+	-1.207267e+000,
+	-2.913610e-001,
+	-1.103767e+001,
+	1.140724e+001,
+	-1.416800e-002,
+	5.564047e-001,
+	8.476262e-002,
+	3.371255e+000,
+	6.221335e-001,
+	-1.429698e+000,
+	-5.374218e-001,
+	2.837524e+000,
+	-2.221936e+000,
+	-2.422337e-002,
+	9.313758e-002,
+	7.190250e-002,
+	1.869022e+000,
+	5.609035e-001,
+	-1.002274e+000,
+	-6.972810e-002,
+	4.031308e-001,
+	-3.932997e-001,
+	-1.521923e-001,
+	2.390646e+000,
+	-6.893990e-002,
+	2.999661e+000,
+	1.017843e+000,
+	-1.081168e+000,
+	-1.178666e-001,
+	-4.968080e-001,
+	3.919299e+000,
+	6.046866e-001,
+	-2.440615e+000,
+	7.891538e-001,
+	2.140835e+000,
+	2.740470e-001,
+	-1.050727e+000,
+	-2.307688e-001,
+	2.276396e+000,
+	-9.454407e+000,
+	-5.505176e+000,
+	2.992620e+000,
+	-2.450942e-001,
+	6.078372e-001,
+	9.606765e-001,
+	-1.103752e+000,
+	-1.810202e-001,
+	1.375044e+000,
+	1.589095e+001,
+	-3.438954e+000,
+	-1.265669e+000,
+	2.475172e-001,
+	1.680768e+000,
+	5.978056e-001,
+	// albedo 1, turbidity 6
+	-1.244324e+000,
+	-3.378542e-001,
+	-1.111001e+001,
+	1.137784e+001,
+	-7.896794e-003,
+	4.808023e-001,
+	9.249904e-002,
+	3.025816e+000,
+	5.880239e-001,
+	-1.593165e+000,
+	-7.027621e-001,
+	2.220896e+000,
+	-1.437709e+000,
+	-1.534738e-002,
+	6.286958e-002,
+	6.644555e-002,
+	1.091727e+000,
+	5.470080e-001,
+	-9.136506e-001,
+	1.344874e-002,
+	7.772636e-001,
+	-1.209396e+000,
+	-1.408978e-001,
+	2.433718e+000,
+	-1.041938e-001,
+	3.791244e+000,
+	1.037916e+000,
+	-1.134968e+000,
+	-1.803315e-001,
+	-9.267335e-001,
+	4.576670e+000,
+	6.851928e-001,
+	-2.805000e+000,
+	8.687208e-001,
+	1.161483e+000,
+	2.571688e-001,
+	-1.017037e+000,
+	-2.053943e-001,
+	2.361640e+000,
+	-9.887818e+000,
+	-5.122889e+000,
+	3.287088e+000,
+	-2.594102e-001,
+	8.578927e-001,
+	9.592340e-001,
+	-1.118723e+000,
+	-1.934942e-001,
+	1.226023e+000,
+	1.674140e+001,
+	-3.277335e+000,
+	-1.629809e+000,
+	2.765232e-001,
+	1.637713e+000,
+	6.113963e-001,
+	// albedo 1, turbidity 7
+	-1.314779e+000,
+	-4.119915e-001,
+	-1.241150e+001,
+	1.241578e+001,
+	2.344284e-003,
+	2.980837e-001,
+	1.414613e-001,
+	2.781731e+000,
+	4.998556e-001,
+	-1.926199e+000,
+	-1.020038e+000,
+	2.569200e+000,
+	-1.081159e+000,
+	-2.266833e-002,
+	3.588668e-001,
+	8.750078e-003,
+	-2.452171e-001,
+	4.796758e-001,
+	-7.780002e-001,
+	1.850647e-001,
+	4.445456e-002,
+	-2.409297e+000,
+	-7.816346e-002,
+	1.546790e+000,
+	-2.807227e-002,
+	5.998176e+000,
+	1.132396e+000,
+	-1.179326e+000,
+	-3.578330e-001,
+	-2.392933e-001,
+	6.467883e+000,
+	5.904596e-001,
+	-1.869975e+000,
+	8.045839e-001,
+	-2.498121e+000,
+	1.610633e-001,
+	-1.009956e+000,
+	-1.311896e-001,
+	1.726577e+000,
+	-1.219356e+001,
+	-3.466239e+000,
+	2.343602e+000,
+	-2.252205e-001,
+	2.573681e+000,
+	1.027109e+000,
+	-1.112460e+000,
+	-2.063093e-001,
+	1.233051e+000,
+	2.058946e+001,
+	-4.578074e+000,
+	-1.145643e+000,
+	3.160192e-001,
+	1.420159e+000,
+	5.860212e-001,
+	// albedo 1, turbidity 8
+	-1.371689e+000,
+	-4.914196e-001,
+	-1.076610e+001,
+	1.107405e+001,
+	-1.485077e-002,
+	5.936218e-001,
+	3.685482e-002,
+	2.599968e+000,
+	6.002204e-001,
+	-2.436997e+000,
+	-1.377939e+000,
+	2.130141e-002,
+	1.079593e+000,
+	-1.796232e-002,
+	-3.933248e-002,
+	1.610711e-001,
+	-6.901181e-001,
+	1.206416e-001,
+	-8.743368e-001,
+	7.331370e-002,
+	8.734259e-001,
+	-3.743126e+000,
+	-3.151167e-002,
+	1.297596e+000,
+	-7.634926e-002,
+	6.532873e+000,
+	1.435737e+000,
+	-9.810197e-001,
+	-3.521634e-001,
+	-2.855205e-001,
+	7.134674e+000,
+	6.839748e-001,
+	-1.394841e+000,
+	6.952036e-001,
+	-4.633104e+000,
+	-2.173401e-002,
+	-1.122958e+000,
+	-1.691536e-001,
+	1.382360e+000,
+	-1.102913e+001,
+	-2.608171e+000,
+	1.865111e+000,
+	-1.345154e-001,
+	3.112342e+000,
+	1.094134e+000,
+	-1.075586e+000,
+	-2.077415e-001,
+	1.171477e+000,
+	1.793270e+001,
+	-4.656858e+000,
+	-1.036839e+000,
+	3.338295e-001,
+	1.042793e+000,
+	5.739374e-001,
+	// albedo 1, turbidity 9
+	-1.465871e+000,
+	-6.364486e-001,
+	-8.833718e+000,
+	9.343650e+000,
+	-3.223600e-002,
+	7.552848e-001,
+	-3.121341e-006,
+	2.249164e+000,
+	8.094662e-001,
+	-2.448924e+000,
+	-1.270878e+000,
+	-4.823703e+000,
+	5.853058e+000,
+	-2.149127e-002,
+	3.581132e-002,
+	-1.230276e-003,
+	4.892553e-001,
+	-1.597657e-001,
+	-2.419809e+000,
+	-1.071337e+000,
+	1.575648e+000,
+	-4.983580e+000,
+	9.545185e-003,
+	5.032615e-001,
+	4.186266e-001,
+	4.634147e+000,
+	1.433517e+000,
+	-1.383278e-001,
+	-2.797095e-002,
+	-1.943067e-001,
+	6.679623e+000,
+	4.118280e-001,
+	-2.744289e-001,
+	-2.118722e-002,
+	-4.337025e+000,
+	1.505072e-001,
+	-1.341872e+000,
+	-2.518572e-001,
+	1.027009e+000,
+	-6.527103e+000,
+	-1.081271e+000,
+	1.015465e+000,
+	2.845789e-001,
+	2.470371e+000,
+	9.278120e-001,
+	-1.040640e+000,
+	-2.367454e-001,
+	1.100744e+000,
+	8.827253e+000,
+	-4.560794e+000,
+	-7.287017e-001,
+	2.842503e-001,
+	6.336593e-001,
+	6.327335e-001,
+	// albedo 1, turbidity 10
+	-1.877993e+000,
+	-1.025135e+000,
+	-4.311037e+000,
+	4.715016e+000,
+	-4.711631e-002,
+	6.335844e-001,
+	-7.665398e-006,
+	1.788017e+000,
+	9.001409e-001,
+	-2.281540e+000,
+	-1.137668e+000,
+	-1.036869e+001,
+	1.136254e+001,
+	1.961739e-002,
+	-9.836174e-002,
+	-6.734567e-003,
+	1.320918e+000,
+	-2.400807e-001,
+	-4.904054e+000,
+	-2.315781e+000,
+	5.735999e+000,
+	-8.626257e+000,
+	-1.255643e-001,
+	1.545446e+000,
+	1.396860e-001,
+	2.972897e+000,
+	1.429934e+000,
+	4.077067e-001,
+	-1.833688e-001,
+	-2.450939e+000,
+	9.119433e+000,
+	4.505361e-001,
+	-1.340828e+000,
+	3.973690e-001,
+	-1.785370e+000,
+	9.628711e-002,
+	-1.296052e+000,
+	-3.250526e-001,
+	1.813294e+000,
+	-1.031485e+001,
+	-1.388690e+000,
+	1.239733e+000,
+	-8.989196e-002,
+	-3.389637e-001,
+	9.639560e-001,
+	-1.062181e+000,
+	-2.423444e-001,
+	7.577592e-001,
+	1.566938e+001,
+	-4.462264e+000,
+	-5.742810e-001,
+	3.262259e-001,
+	9.461672e-001,
+	6.232887e-001,
+};
+
+double datasetXYZRad1[] = 
+{
+	// albedo 0, turbidity 1
+	1.560219e+000,
+	1.417388e+000,
+	1.206927e+000,
+	1.091949e+001,
+	5.931416e+000,
+	7.304788e+000,
+	// albedo 0, turbidity 2
+	1.533049e+000,
+	1.560532e+000,
+	3.685059e-001,
+	1.355040e+001,
+	5.543711e+000,
+	7.792189e+000,
+	// albedo 0, turbidity 3
+	1.471043e+000,
+	1.746088e+000,
+	-9.299697e-001,
+	1.720362e+001,
+	5.473384e+000,
+	8.336416e+000,
+	// albedo 0, turbidity 4
+	1.355991e+000,
+	2.109348e+000,
+	-3.295855e+000,
+	2.264843e+001,
+	5.454607e+000,
+	9.304656e+000,
+	// albedo 0, turbidity 5
+	1.244963e+000,
+	2.547533e+000,
+	-5.841485e+000,
+	2.756879e+001,
+	5.576104e+000,
+	1.043287e+001,
+	// albedo 0, turbidity 6
+	1.175532e+000,
+	2.784634e+000,
+	-7.212225e+000,
+	2.975347e+001,
+	6.472980e+000,
+	1.092331e+001,
+	// albedo 0, turbidity 7
+	1.082973e+000,
+	3.118094e+000,
+	-8.934293e+000,
+	3.186879e+001,
+	8.473885e+000,
+	1.174019e+001,
+	// albedo 0, turbidity 8
+	9.692500e-001,
+	3.349574e+000,
+	-1.003810e+001,
+	3.147654e+001,
+	1.338931e+001,
+	1.272547e+001,
+	// albedo 0, turbidity 9
+	8.547044e-001,
+	3.151538e+000,
+	-9.095567e+000,
+	2.554995e+001,
+	2.273219e+001,
+	1.410398e+001,
+	// albedo 0, turbidity 10
+	7.580340e-001,
+	2.311153e+000,
+	-5.170814e+000,
+	1.229669e+001,
+	3.686529e+001,
+	1.598882e+001,
+	// albedo 1, turbidity 1
+	1.664273e+000,
+	1.574468e+000,
+	1.422078e+000,
+	9.768247e+000,
+	1.447338e+001,
+	1.644988e+001,
+	// albedo 1, turbidity 2
+	1.638295e+000,
+	1.719586e+000,
+	5.786675e-001,
+	1.239846e+001,
+	1.415419e+001,
+	1.728605e+001,
+	// albedo 1, turbidity 3
+	1.572623e+000,
+	1.921559e+000,
+	-7.714802e-001,
+	1.609246e+001,
+	1.420954e+001,
+	1.825908e+001,
+	// albedo 1, turbidity 4
+	1.468395e+000,
+	2.211970e+000,
+	-2.845869e+000,
+	2.075027e+001,
+	1.524822e+001,
+	1.937622e+001,
+	// albedo 1, turbidity 5
+	1.355047e+000,
+	2.556469e+000,
+	-4.960920e+000,
+	2.460237e+001,
+	1.648360e+001,
+	2.065648e+001,
+	// albedo 1, turbidity 6
+	1.291642e+000,
+	2.742036e+000,
+	-6.061967e+000,
+	2.602002e+001,
+	1.819144e+001,
+	2.116712e+001,
+	// albedo 1, turbidity 7
+	1.194565e+000,
+	2.972120e+000,
+	-7.295779e+000,
+	2.691805e+001,
+	2.124880e+001,
+	2.201819e+001,
+	// albedo 1, turbidity 8
+	1.083631e+000,
+	3.047021e+000,
+	-7.766096e+000,
+	2.496261e+001,
+	2.744264e+001,
+	2.291875e+001,
+	// albedo 1, turbidity 9
+	9.707994e-001,
+	2.736459e+000,
+	-6.308284e+000,
+	1.760860e+001,
+	3.776291e+001,
+	2.392150e+001,
+	// albedo 1, turbidity 10
+	8.574294e-001,
+	1.865155e+000,
+	-2.364707e+000,
+	4.337793e+000,
+	5.092831e+001,
+	2.523432e+001,
+};
+
+double datasetXYZ2[] = 
+{
+	// albedo 0, turbidity 1
+	-1.127942e+000,
+	-1.905548e-001,
+	-1.252356e+001,
+	1.375799e+001,
+	-3.624732e-002,
+	1.055453e+000,
+	1.385036e-002,
+	4.176970e+000,
+	5.928345e-001,
+	-1.155260e+000,
+	-1.778135e-001,
+	6.216056e+000,
+	-5.254116e+000,
+	-8.787445e-002,
+	8.434621e-001,
+	4.025734e-002,
+	6.195322e+000,
+	3.111856e-001,
+	-1.125624e+000,
+	-3.217593e-001,
+	5.043919e-001,
+	1.686284e+000,
+	-3.536071e-001,
+	1.476321e+000,
+	-7.899019e-002,
+	-4.522531e+000,
+	1.271691e+000,
+	-1.081801e+000,
+	-1.033234e-001,
+	9.995550e-001,
+	7.482946e-003,
+	-6.776018e-002,
+	1.463141e+000,
+	9.492021e-002,
+	5.612723e+000,
+	1.298846e-001,
+	-1.075320e+000,
+	-2.402711e-001,
+	2.141284e+000,
+	-1.203359e+000,
+	-4.945188e+000,
+	1.437221e+000,
+	-8.096750e-002,
+	-1.028378e+000,
+	1.004164e+000,
+	-1.073337e+000,
+	-1.516517e-001,
+	1.639379e+000,
+	2.304669e+000,
+	-3.214244e+000,
+	1.286245e+000,
+	5.613957e-002,
+	2.480902e+000,
+	4.999363e-001,
+	// albedo 0, turbidity 2
+	-1.128399e+000,
+	-1.857793e-001,
+	-1.089863e+001,
+	1.172984e+001,
+	-3.768099e-002,
+	9.439285e-001,
+	4.869335e-002,
+	4.845114e+000,
+	6.119211e-001,
+	-1.114002e+000,
+	-1.399280e-001,
+	4.963800e+000,
+	-4.685500e+000,
+	-7.780879e-002,
+	4.049736e-001,
+	1.586297e-001,
+	7.770264e+000,
+	3.449006e-001,
+	-1.185472e+000,
+	-3.403543e-001,
+	6.588322e-001,
+	1.133713e+000,
+	-4.118674e-001,
+	2.061191e+000,
+	-1.882768e-001,
+	-4.372586e+000,
+	1.223530e+000,
+	-1.002272e+000,
+	2.000703e-002,
+	7.073269e-002,
+	1.485075e+000,
+	5.005589e-001,
+	4.301494e-001,
+	3.626541e-001,
+	7.921098e+000,
+	1.574766e-001,
+	-1.121006e+000,
+	-3.007777e-001,
+	2.242051e+000,
+	-4.571561e+000,
+	-7.761071e+000,
+	2.053404e+000,
+	-1.524018e-001,
+	-1.886162e+000,
+	1.018208e+000,
+	-1.058864e+000,
+	-1.358673e-001,
+	1.389667e+000,
+	8.633409e+000,
+	-3.437249e+000,
+	7.295429e-001,
+	1.514700e-001,
+	2.842513e+000,
+	5.014325e-001,
+	// albedo 0, turbidity 3
+	-1.144464e+000,
+	-2.043799e-001,
+	-1.020188e+001,
+	1.071247e+001,
+	-3.256693e-002,
+	7.860205e-001,
+	6.872719e-002,
+	4.824771e+000,
+	6.259836e-001,
+	-1.170104e+000,
+	-2.118626e-001,
+	4.391405e+000,
+	-4.198900e+000,
+	-7.111559e-002,
+	3.890442e-001,
+	1.024831e-001,
+	6.282535e+000,
+	5.365688e-001,
+	-1.129171e+000,
+	-2.552880e-001,
+	2.238298e-001,
+	7.314295e-001,
+	-3.562730e-001,
+	1.881931e+000,
+	-3.078716e-002,
+	-1.039120e+000,
+	9.096301e-001,
+	-1.042294e+000,
+	4.450203e-003,
+	-5.116033e-001,
+	2.627589e+000,
+	6.098996e-001,
+	-1.264638e-001,
+	4.325281e-001,
+	7.080503e+000,
+	4.583646e-001,
+	-1.082293e+000,
+	-2.723056e-001,
+	2.065076e+000,
+	-8.143133e+000,
+	-7.892212e+000,
+	2.142231e+000,
+	-7.106240e-002,
+	-1.122398e+000,
+	8.338505e-001,
+	-1.071715e+000,
+	-1.426568e-001,
+	1.095351e+000,
+	1.729783e+001,
+	-3.851931e+000,
+	4.360514e-001,
+	2.114440e-001,
+	2.970832e+000,
+	5.944389e-001,
+	// albedo 0, turbidity 4
+	-1.195909e+000,
+	-2.590449e-001,
+	-1.191037e+001,
+	1.207947e+001,
+	-1.589842e-002,
+	6.297846e-001,
+	9.054772e-002,
+	4.285959e+000,
+	5.933752e-001,
+	-1.245763e+000,
+	-3.316637e-001,
+	4.293660e+000,
+	-3.694011e+000,
+	-4.699947e-002,
+	4.843684e-001,
+	2.130425e-002,
+	4.097549e+000,
+	6.530809e-001,
+	-1.148742e+000,
+	-1.902509e-001,
+	-2.393233e-001,
+	-2.441254e-001,
+	-2.610918e-001,
+	1.846988e+000,
+	3.532866e-002,
+	2.660106e+000,
+	8.358294e-001,
+	-1.016080e+000,
+	-7.444960e-002,
+	-5.053436e-001,
+	4.388855e+000,
+	6.054987e-001,
+	-1.208300e+000,
+	5.817215e-001,
+	2.543570e+000,
+	4.726568e-001,
+	-1.072027e+000,
+	-2.101440e-001,
+	1.518378e+000,
+	-1.060119e+001,
+	-6.016546e+000,
+	2.649475e+000,
+	-5.166992e-002,
+	1.571269e+000,
+	8.344622e-001,
+	-1.072365e+000,
+	-1.511201e-001,
+	7.478010e-001,
+	1.900732e+001,
+	-3.950387e+000,
+	-3.473907e-001,
+	3.797211e-001,
+	2.782949e+000,
+	6.296808e-001,
+	// albedo 0, turbidity 5
+	-1.239423e+000,
+	-3.136289e-001,
+	-1.351100e+001,
+	1.349468e+001,
+	-7.070423e-003,
+	5.012315e-001,
+	1.106008e-001,
+	3.803619e+000,
+	5.577948e-001,
+	-1.452524e+000,
+	-5.676944e-001,
+	2.993153e+000,
+	-2.277288e+000,
+	-2.168954e-002,
+	3.056720e-001,
+	1.152338e-002,
+	1.852697e+000,
+	6.427228e-001,
+	-1.061421e+000,
+	-4.590521e-002,
+	6.057022e-001,
+	-1.096835e+000,
+	-1.504952e-001,
+	2.344921e+000,
+	-5.491832e-002,
+	5.268322e+000,
+	9.082253e-001,
+	-1.042373e+000,
+	-1.769498e-001,
+	-1.075388e+000,
+	3.831712e+000,
+	3.154140e-001,
+	-2.416458e+000,
+	7.909032e-001,
+	-1.492892e-002,
+	3.854049e-001,
+	-1.064159e+000,
+	-1.892684e-001,
+	1.438685e+000,
+	-8.166362e+000,
+	-3.616364e+000,
+	3.275206e+000,
+	-1.203825e-001,
+	2.039491e+000,
+	8.688057e-001,
+	-1.070120e+000,
+	-1.569508e-001,
+	4.124760e-001,
+	1.399683e+001,
+	-3.547085e+000,
+	-1.046326e+000,
+	4.973825e-001,
+	2.791231e+000,
+	6.503286e-001,
+	// albedo 0, turbidity 6
+	-1.283579e+000,
+	-3.609518e-001,
+	-1.335397e+001,
+	1.315248e+001,
+	-4.431938e-004,
+	3.769526e-001,
+	1.429824e-001,
+	3.573613e+000,
+	4.998696e-001,
+	-1.657952e+000,
+	-7.627948e-001,
+	1.958222e+000,
+	-7.949816e-001,
+	-2.882837e-002,
+	5.356149e-001,
+	-5.191946e-002,
+	8.869955e-001,
+	6.263320e-001,
+	-9.527600e-001,
+	6.494189e-002,
+	5.361303e-001,
+	-2.129590e+000,
+	-9.258630e-002,
+	1.604776e+000,
+	5.067770e-002,
+	6.376055e+000,
+	9.138052e-001,
+	-1.080827e+000,
+	-2.523120e-001,
+	-7.154262e-001,
+	4.120085e+000,
+	1.878228e-001,
+	-1.492158e+000,
+	6.881655e-001,
+	-1.446611e+000,
+	4.040631e-001,
+	-1.054075e+000,
+	-1.665498e-001,
+	9.191052e-001,
+	-6.636943e+000,
+	-1.894826e+000,
+	2.107810e+000,
+	-3.680499e-002,
+	2.655452e+000,
+	8.413840e-001,
+	-1.061127e+000,
+	-1.448849e-001,
+	2.667493e-001,
+	1.034103e+001,
+	-4.285769e+000,
+	-3.874504e-001,
+	5.998752e-001,
+	3.132426e+000,
+	6.652753e-001,
+	// albedo 0, turbidity 7
+	-1.347345e+000,
+	-4.287832e-001,
+	-9.305553e+000,
+	9.133813e+000,
+	-3.173527e-003,
+	3.977564e-001,
+	1.151420e-001,
+	3.320564e+000,
+	4.998134e-001,
+	-1.927296e+000,
+	-9.901372e-001,
+	-2.593499e+000,
+	4.087421e+000,
+	-5.833993e-002,
+	8.158929e-001,
+	-4.681279e-002,
+	2.423716e-001,
+	4.938052e-001,
+	-9.470092e-001,
+	7.325237e-002,
+	2.064735e+000,
+	-5.167540e+000,
+	-1.313751e-002,
+	4.832169e-001,
+	1.126295e-001,
+	6.970522e+000,
+	1.035022e+000,
+	-1.022557e+000,
+	-2.762616e-001,
+	-9.375748e-001,
+	6.696739e+000,
+	2.200765e-001,
+	-1.133253e-001,
+	5.492505e-001,
+	-3.109391e+000,
+	3.321914e-001,
+	-1.087444e+000,
+	-1.836263e-001,
+	6.225024e-001,
+	-8.576765e+000,
+	-1.107637e+000,
+	7.859427e-001,
+	9.910909e-002,
+	3.112938e+000,
+	8.596261e-001,
+	-1.051544e+000,
+	-1.546262e-001,
+	2.371731e-001,
+	1.200502e+001,
+	-4.527291e+000,
+	7.268862e-002,
+	5.571478e-001,
+	2.532873e+000,
+	6.662000e-001,
+	// albedo 0, turbidity 8
+	-1.375576e+000,
+	-4.840019e-001,
+	-8.121290e+000,
+	8.058140e+000,
+	-1.445661e-002,
+	5.123314e-001,
+	5.813321e-002,
+	3.203219e+000,
+	5.442318e-001,
+	-2.325221e+000,
+	-1.241463e+000,
+	-7.063430e+000,
+	8.741369e+000,
+	-7.829950e-002,
+	8.844273e-001,
+	-3.471106e-002,
+	1.740583e-001,
+	2.814079e-001,
+	-1.228700e+000,
+	-2.013412e-001,
+	2.949042e+000,
+	-7.371945e+000,
+	1.071753e-001,
+	-2.491970e-001,
+	2.265223e-001,
+	6.391504e+000,
+	1.172389e+000,
+	-7.601786e-001,
+	-1.680631e-001,
+	-7.584444e-001,
+	8.541356e+000,
+	8.222291e-002,
+	6.729633e-001,
+	3.206615e-001,
+	-3.700940e+000,
+	2.710054e-001,
+	-1.191166e+000,
+	-2.672347e-001,
+	2.927498e-001,
+	-9.713613e+000,
+	-4.783721e-001,
+	2.352803e-001,
+	2.161949e-001,
+	2.691481e+000,
+	8.745447e-001,
+	-1.030135e+000,
+	-1.653301e-001,
+	2.263443e-001,
+	1.296157e+001,
+	-4.650644e+000,
+	7.055709e-003,
+	5.091975e-001,
+	2.000370e+000,
+	6.603839e-001,
+	// albedo 0, turbidity 9
+	-1.508018e+000,
+	-6.460933e-001,
+	-6.402745e+000,
+	6.545995e+000,
+	-3.750320e-002,
+	6.921803e-001,
+	3.309819e-003,
+	2.797527e+000,
+	6.978446e-001,
+	-2.333308e+000,
+	-1.167837e+000,
+	-1.746787e+001,
+	1.868630e+001,
+	-8.948229e-003,
+	5.621946e-001,
+	-3.402626e-002,
+	1.217943e+000,
+	1.149865e-002,
+	-2.665953e+000,
+	-1.226307e+000,
+	7.169725e+000,
+	-1.159434e+001,
+	3.583420e-002,
+	-3.074378e-001,
+	3.412248e-001,
+	4.422122e+000,
+	1.283791e+000,
+	-9.705116e-002,
+	8.312991e-002,
+	-2.160462e+000,
+	1.028235e+001,
+	3.543357e-002,
+	1.032049e+000,
+	1.058310e-001,
+	-2.972898e+000,
+	2.418628e-001,
+	-1.329617e+000,
+	-3.699557e-001,
+	5.560117e-001,
+	-9.730113e+000,
+	9.938865e-002,
+	-3.071488e-001,
+	2.510691e-001,
+	1.777111e+000,
+	8.705142e-001,
+	-1.019387e+000,
+	-1.893247e-001,
+	1.194079e-001,
+	1.239436e+001,
+	-4.799224e+000,
+	2.940213e-001,
+	4.841268e-001,
+	1.529724e+000,
+	6.582615e-001,
+	// albedo 0, turbidity 10
+	-1.896737e+000,
+	-1.005442e+000,
+	-6.411032e+000,
+	6.548220e+000,
+	-3.227596e-002,
+	5.717262e-001,
+	-8.115192e-006,
+	2.296704e+000,
+	9.000749e-001,
+	-2.411116e+000,
+	-1.225587e+000,
+	-1.753629e+001,
+	1.829393e+001,
+	1.247555e-002,
+	2.364616e-001,
+	-5.114637e-003,
+	1.603778e+000,
+	-2.224156e-001,
+	-4.707121e+000,
+	-2.074977e+000,
+	7.942300e+000,
+	-1.132407e+001,
+	-5.415654e-002,
+	5.446811e-001,
+	1.032493e-001,
+	4.010235e+000,
+	1.369802e+000,
+	1.010482e-001,
+	-4.013305e-001,
+	-2.674579e+000,
+	9.779409e+000,
+	1.782506e-001,
+	7.053045e-001,
+	4.200002e-001,
+	-2.400671e+000,
+	1.953165e-001,
+	-1.243526e+000,
+	-3.391255e-001,
+	8.848882e-001,
+	-9.789025e+000,
+	-3.997324e-001,
+	-9.546227e-001,
+	-1.044017e-001,
+	6.010593e-001,
+	8.714462e-001,
+	-1.014633e+000,
+	-1.730009e-001,
+	-7.738934e-002,
+	1.390903e+001,
+	-4.847307e+000,
+	1.076059e+000,
+	5.685743e-001,
+	1.572992e+000,
+	6.561432e-001,
+	// albedo 1, turbidity 1
+	-1.122998e+000,
+	-1.881183e-001,
+	-1.030709e+001,
+	1.158932e+001,
+	-4.079495e-002,
+	9.603774e-001,
+	3.079436e-002,
+	4.009235e+000,
+	5.060745e-001,
+	-1.134790e+000,
+	-1.539688e-001,
+	5.478405e+000,
+	-4.217270e+000,
+	-1.043858e-001,
+	7.165008e-001,
+	1.524765e-002,
+	6.473623e+000,
+	4.207882e-001,
+	-1.134957e+000,
+	-3.513318e-001,
+	7.393837e-001,
+	1.354415e+000,
+	-4.764078e-001,
+	1.690441e+000,
+	-5.492640e-002,
+	-5.563523e+000,
+	1.145743e+000,
+	-1.058344e+000,
+	-5.758503e-002,
+	1.168230e+000,
+	3.269824e-001,
+	1.795193e-001,
+	7.849011e-001,
+	7.441853e-002,
+	6.904804e+000,
+	2.818790e-001,
+	-1.075194e+000,
+	-2.355813e-001,
+	2.463685e+000,
+	-1.536505e+000,
+	-7.505771e+000,
+	9.619712e-001,
+	-6.465851e-002,
+	-1.355492e+000,
+	8.489847e-001,
+	-1.079030e+000,
+	-1.465328e-001,
+	1.773838e+000,
+	2.310131e+000,
+	-3.136065e+000,
+	3.507952e-001,
+	4.435014e-002,
+	2.819225e+000,
+	5.689008e-001,
+	// albedo 1, turbidity 2
+	-1.125833e+000,
+	-1.870849e-001,
+	-9.555833e+000,
+	1.059713e+001,
+	-4.225402e-002,
+	9.164663e-001,
+	4.338796e-002,
+	4.400980e+000,
+	6.056119e-001,
+	-1.127440e+000,
+	-1.551891e-001,
+	4.755621e+000,
+	-4.408806e+000,
+	-7.851763e-002,
+	2.268284e-001,
+	1.460070e-001,
+	7.048003e+000,
+	3.525997e-001,
+	-1.143788e+000,
+	-3.170178e-001,
+	5.480669e-001,
+	2.041830e+000,
+	-4.532139e-001,
+	2.302233e+000,
+	-1.887419e-001,
+	-4.489221e+000,
+	1.250967e+000,
+	-1.032849e+000,
+	7.376031e-003,
+	5.666073e-001,
+	-2.312203e-001,
+	4.862894e-001,
+	-1.748294e-001,
+	3.572870e-001,
+	8.380522e+000,
+	1.302333e-001,
+	-1.093728e+000,
+	-2.786977e-001,
+	2.641272e+000,
+	-1.507494e+000,
+	-8.731243e+000,
+	1.684055e+000,
+	-2.023377e-001,
+	-2.176398e+000,
+	1.013249e+000,
+	-1.076578e+000,
+	-1.456205e-001,
+	1.693935e+000,
+	2.945003e+000,
+	-2.822673e+000,
+	-2.520033e-001,
+	1.517034e-001,
+	2.649109e+000,
+	5.179094e-001,
+	// albedo 1, turbidity 3
+	-1.146417e+000,
+	-2.119353e-001,
+	-7.187525e+000,
+	8.058599e+000,
+	-5.256438e-002,
+	8.375733e-001,
+	3.887093e-002,
+	4.222111e+000,
+	6.695347e-001,
+	-1.173674e+000,
+	-2.067025e-001,
+	2.899359e+000,
+	-2.804918e+000,
+	-8.473899e-002,
+	3.944225e-003,
+	1.340641e-001,
+	6.160887e+000,
+	4.527141e-001,
+	-1.090098e+000,
+	-2.599633e-001,
+	9.180856e-001,
+	1.092710e+000,
+	-4.215019e-001,
+	2.427660e+000,
+	-9.277667e-002,
+	-2.123523e+000,
+	1.058159e+000,
+	-1.084460e+000,
+	8.056181e-003,
+	-2.453510e-001,
+	6.619567e-001,
+	4.668118e-001,
+	-9.526719e-001,
+	4.648454e-001,
+	8.001572e+000,
+	3.054194e-001,
+	-1.053728e+000,
+	-2.765784e-001,
+	2.792388e+000,
+	-3.489517e+000,
+	-8.150535e+000,
+	2.195757e+000,
+	-2.017234e-001,
+	-2.128017e+000,
+	9.326589e-001,
+	-1.099348e+000,
+	-1.593939e-001,
+	1.568292e+000,
+	7.247853e+000,
+	-2.933000e+000,
+	-5.890481e-001,
+	1.724440e-001,
+	2.433484e+000,
+	5.736558e-001,
+	// albedo 1, turbidity 4
+	-1.185983e+000,
+	-2.581184e-001,
+	-7.761056e+000,
+	8.317053e+000,
+	-3.351773e-002,
+	6.676667e-001,
+	5.941733e-002,
+	3.820727e+000,
+	6.324032e-001,
+	-1.268591e+000,
+	-3.398067e-001,
+	2.348503e+000,
+	-2.023779e+000,
+	-5.368458e-002,
+	1.083282e-001,
+	8.402858e-002,
+	3.910254e+000,
+	5.577481e-001,
+	-1.071353e+000,
+	-1.992459e-001,
+	7.878387e-001,
+	1.974702e-001,
+	-3.033058e-001,
+	2.335298e+000,
+	-8.205259e-002,
+	7.954454e-001,
+	9.972312e-001,
+	-1.089513e+000,
+	-3.104364e-002,
+	-5.995746e-001,
+	2.330281e+000,
+	6.581939e-001,
+	-1.821467e+000,
+	6.679973e-001,
+	5.090195e+000,
+	3.125161e-001,
+	-1.040214e+000,
+	-2.570934e-001,
+	2.660489e+000,
+	-6.506045e+000,
+	-7.053586e+000,
+	2.763153e+000,
+	-2.433632e-001,
+	-7.648176e-001,
+	9.452937e-001,
+	-1.116052e+000,
+	-1.831993e-001,
+	1.457694e+000,
+	1.163608e+001,
+	-3.216426e+000,
+	-1.045594e+000,
+	2.285002e-001,
+	1.817407e+000,
+	5.810396e-001,
+	// albedo 1, turbidity 5
+	-1.230134e+000,
+	-3.136264e-001,
+	-8.909301e+000,
+	9.145006e+000,
+	-1.055387e-002,
+	4.467317e-001,
+	1.016826e-001,
+	3.342964e+000,
+	5.633840e-001,
+	-1.442907e+000,
+	-5.593147e-001,
+	2.156447e+000,
+	-1.241657e+000,
+	-3.512130e-002,
+	3.050274e-001,
+	1.797175e-002,
+	1.742358e+000,
+	5.977153e-001,
+	-1.027627e+000,
+	-6.481539e-002,
+	4.351975e-001,
+	-1.051677e+000,
+	-2.030672e-001,
+	1.942684e+000,
+	-3.615993e-002,
+	4.050266e+000,
+	9.801624e-001,
+	-1.082110e+000,
+	-1.578209e-001,
+	-3.397511e-001,
+	4.163851e+000,
+	6.650368e-001,
+	-1.841730e+000,
+	7.062544e-001,
+	6.789881e-001,
+	3.172623e-001,
+	-1.047447e+000,
+	-1.977560e-001,
+	2.183364e+000,
+	-8.805249e+000,
+	-5.483962e+000,
+	2.551309e+000,
+	-1.779640e-001,
+	1.519501e+000,
+	9.212536e-001,
+	-1.111853e+000,
+	-1.935736e-001,
+	1.394408e+000,
+	1.392405e+001,
+	-3.465430e+000,
+	-1.068432e+000,
+	2.388671e-001,
+	1.455336e+000,
+	6.233425e-001,
+	// albedo 1, turbidity 6
+	-1.262238e+000,
+	-3.546341e-001,
+	-1.008703e+001,
+	1.020084e+001,
+	-1.852187e-003,
+	3.537580e-001,
+	1.239199e-001,
+	3.056093e+000,
+	5.132052e-001,
+	-1.613810e+000,
+	-7.355585e-001,
+	2.760123e+000,
+	-1.685253e+000,
+	-2.517552e-002,
+	2.914258e-001,
+	4.743448e-003,
+	8.689596e-001,
+	5.674192e-001,
+	-9.462336e-001,
+	2.950767e-002,
+	-2.613816e-001,
+	-7.398653e-001,
+	-1.315558e-001,
+	1.901042e+000,
+	-6.447844e-002,
+	4.969341e+000,
+	1.027342e+000,
+	-1.111481e+000,
+	-2.194054e-001,
+	-9.004538e-002,
+	3.983442e+000,
+	4.871278e-001,
+	-1.965315e+000,
+	7.956121e-001,
+	-2.363225e-001,
+	2.718037e-001,
+	-1.036397e+000,
+	-1.827106e-001,
+	1.964747e+000,
+	-8.870759e+000,
+	-4.208011e+000,
+	2.461215e+000,
+	-2.158905e-001,
+	1.561676e+000,
+	9.436866e-001,
+	-1.113769e+000,
+	-1.947819e-001,
+	1.300720e+000,
+	1.516476e+001,
+	-4.088732e+000,
+	-1.069384e+000,
+	2.836434e-001,
+	1.671451e+000,
+	6.229612e-001,
+	// albedo 1, turbidity 7
+	-1.328069e+000,
+	-4.244047e-001,
+	-8.417040e+000,
+	8.552244e+000,
+	-6.813504e-003,
+	4.127422e-001,
+	9.619897e-002,
+	2.854227e+000,
+	5.059880e-001,
+	-1.927552e+000,
+	-1.025290e+000,
+	9.529576e-001,
+	4.255950e-001,
+	-3.738779e-002,
+	2.584586e-001,
+	4.911004e-002,
+	-2.640913e-001,
+	4.138626e-001,
+	-8.488094e-001,
+	1.435988e-001,
+	6.356807e-001,
+	-2.895732e+000,
+	-8.473961e-002,
+	1.701305e+000,
+	-1.323908e-001,
+	6.499338e+000,
+	1.210928e+000,
+	-1.128313e+000,
+	-3.397048e-001,
+	-4.043140e-001,
+	6.265097e+000,
+	5.482395e-001,
+	-2.057614e+000,
+	8.884087e-001,
+	-2.943879e+000,
+	9.760301e-002,
+	-1.039764e+000,
+	-1.494772e-001,
+	1.781915e+000,
+	-1.153012e+001,
+	-3.379232e+000,
+	2.517231e+000,
+	-2.764393e-001,
+	2.588849e+000,
+	1.052120e+000,
+	-1.108447e+000,
+	-2.012251e-001,
+	1.198640e+000,
+	1.925331e+001,
+	-4.423892e+000,
+	-1.257122e+000,
+	3.395690e-001,
+	1.481220e+000,
+	5.880175e-001,
+	// albedo 1, turbidity 8
+	-1.374185e+000,
+	-4.967434e-001,
+	-7.401318e+000,
+	7.724021e+000,
+	-2.345723e-002,
+	5.979653e-001,
+	2.436346e-002,
+	2.658970e+000,
+	6.014891e-001,
+	-2.310933e+000,
+	-1.290290e+000,
+	-1.301909e+000,
+	2.557806e+000,
+	-3.744449e-002,
+	8.982861e-002,
+	1.090613e-001,
+	-4.398363e-001,
+	1.184329e-001,
+	-1.124730e+000,
+	-9.921830e-002,
+	1.366902e+000,
+	-4.172489e+000,
+	-5.078016e-002,
+	1.393597e+000,
+	-9.323843e-002,
+	6.452721e+000,
+	1.435913e+000,
+	-8.468477e-001,
+	-2.744819e-001,
+	-4.347200e-001,
+	6.713362e+000,
+	6.127133e-001,
+	-1.685634e+000,
+	7.360941e-001,
+	-4.535502e+000,
+	-2.920866e-002,
+	-1.165242e+000,
+	-2.008697e-001,
+	1.438778e+000,
+	-1.008936e+001,
+	-2.214771e+000,
+	2.102909e+000,
+	-1.763085e-001,
+	2.859075e+000,
+	1.093470e+000,
+	-1.074614e+000,
+	-2.066374e-001,
+	1.131891e+000,
+	1.630063e+001,
+	-4.801441e+000,
+	-1.112590e+000,
+	3.595785e-001,
+	1.122227e+000,
+	5.794610e-001,
+	// albedo 1, turbidity 9
+	-1.521515e+000,
+	-6.835604e-001,
+	-5.571044e+000,
+	6.028774e+000,
+	-4.253715e-002,
+	6.875746e-001,
+	-5.279456e-006,
+	2.180150e+000,
+	8.487705e-001,
+	-2.240415e+000,
+	-1.171166e+000,
+	-7.182771e+000,
+	8.417068e+000,
+	-1.932866e-002,
+	1.101887e-001,
+	-1.098862e-002,
+	6.242195e-001,
+	-2.393875e-001,
+	-2.712354e+000,
+	-1.198830e+000,
+	3.180200e+000,
+	-6.768130e+000,
+	-2.563386e-003,
+	7.984607e-001,
+	2.764376e-001,
+	4.695358e+000,
+	1.557045e+000,
+	-3.655172e-002,
+	-2.142321e-002,
+	-9.138120e-001,
+	7.932786e+000,
+	3.516542e-001,
+	-7.994343e-001,
+	1.786761e-001,
+	-4.208399e+000,
+	1.820576e-002,
+	-1.368610e+000,
+	-2.656212e-001,
+	1.249397e+000,
+	-8.317818e+000,
+	-8.962772e-001,
+	1.423249e+000,
+	1.478381e-001,
+	2.191660e+000,
+	1.007748e+000,
+	-1.041753e+000,
+	-2.453366e-001,
+	1.061102e+000,
+	1.130172e+001,
+	-4.739312e+000,
+	-9.223334e-001,
+	2.982776e-001,
+	6.162931e-001,
+	6.080302e-001,
+	// albedo 1, turbidity 10
+	-1.989159e+000,
+	-1.095160e+000,
+	-2.915550e+000,
+	3.275339e+000,
+	-5.735765e-002,
+	5.742174e-001,
+	-7.683288e-006,
+	1.763400e+000,
+	9.001342e-001,
+	-2.070020e+000,
+	-1.086338e+000,
+	-1.095898e+001,
+	1.206960e+001,
+	3.780123e-002,
+	-1.774699e-002,
+	-5.881348e-004,
+	1.333819e+000,
+	-2.605423e-001,
+	-5.249653e+000,
+	-2.383040e+000,
+	6.160406e+000,
+	-9.097138e+000,
+	-1.955319e-001,
+	1.651785e+000,
+	6.016463e-004,
+	3.021824e+000,
+	1.493574e+000,
+	4.685432e-001,
+	-2.358662e-001,
+	-2.666433e+000,
+	9.685763e+000,
+	5.804928e-001,
+	-1.521875e+000,
+	5.668989e-001,
+	-1.548136e+000,
+	1.688642e-002,
+	-1.296891e+000,
+	-3.449031e-001,
+	1.928548e+000,
+	-1.167560e+001,
+	-1.627615e+000,
+	1.355603e+000,
+	-1.929074e-001,
+	-6.568952e-001,
+	1.009774e+000,
+	-1.067288e+000,
+	-2.410392e-001,
+	7.147961e-001,
+	1.783840e+001,
+	-4.374399e+000,
+	-6.588777e-001,
+	3.329831e-001,
+	1.012066e+000,
+	6.118645e-001,
+};
+
+double datasetXYZRad2[] = 
+{
+	// albedo 0, turbidity 1
+	1.632341e+000,
+	1.395230e+000,
+	1.375634e+000,
+	1.238193e+001,
+	5.921102e+000,
+	7.766508e+000,
+	// albedo 0, turbidity 2
+	1.597115e+000,
+	1.554617e+000,
+	3.932382e-001,
+	1.505284e+001,
+	5.725234e+000,
+	8.158155e+000,
+	// albedo 0, turbidity 3
+	1.522034e+000,
+	1.844545e+000,
+	-1.322862e+000,
+	1.918382e+001,
+	5.440769e+000,
+	8.837119e+000,
+	// albedo 0, turbidity 4
+	1.403048e+000,
+	2.290852e+000,
+	-4.013792e+000,
+	2.485100e+001,
+	5.521888e+000,
+	9.845547e+000,
+	// albedo 0, turbidity 5
+	1.286364e+000,
+	2.774498e+000,
+	-6.648221e+000,
+	2.964151e+001,
+	5.923777e+000,
+	1.097075e+001,
+	// albedo 0, turbidity 6
+	1.213544e+000,
+	3.040195e+000,
+	-8.092676e+000,
+	3.186082e+001,
+	6.789782e+000,
+	1.158899e+001,
+	// albedo 0, turbidity 7
+	1.122622e+000,
+	3.347465e+000,
+	-9.649016e+000,
+	3.343824e+001,
+	9.347715e+000,
+	1.231374e+001,
+	// albedo 0, turbidity 8
+	1.007356e+000,
+	3.543858e+000,
+	-1.053520e+001,
+	3.239842e+001,
+	1.483962e+001,
+	1.331718e+001,
+	// albedo 0, turbidity 9
+	8.956642e-001,
+	3.278700e+000,
+	-9.254933e+000,
+	2.557923e+001,
+	2.489677e+001,
+	1.476166e+001,
+	// albedo 0, turbidity 10
+	7.985143e-001,
+	2.340404e+000,
+	-4.928274e+000,
+	1.141787e+001,
+	3.961501e+001,
+	1.682448e+001,
+	// albedo 1, turbidity 1
+	1.745162e+000,
+	1.639467e+000,
+	1.342721e+000,
+	1.166033e+001,
+	1.490124e+001,
+	1.774031e+001,
+	// albedo 1, turbidity 2
+	1.708439e+000,
+	1.819144e+000,
+	2.834399e-001,
+	1.448066e+001,
+	1.459214e+001,
+	1.858679e+001,
+	// albedo 1, turbidity 3
+	1.631720e+000,
+	2.094799e+000,
+	-1.378825e+000,
+	1.843198e+001,
+	1.463173e+001,
+	1.962881e+001,
+	// albedo 1, turbidity 4
+	1.516536e+000,
+	2.438729e+000,
+	-3.624121e+000,
+	2.298621e+001,
+	1.599782e+001,
+	2.070027e+001,
+	// albedo 1, turbidity 5
+	1.405863e+000,
+	2.785191e+000,
+	-5.705236e+000,
+	2.645121e+001,
+	1.768330e+001,
+	2.191903e+001,
+	// albedo 1, turbidity 6
+	1.344052e+000,
+	2.951807e+000,
+	-6.683851e+000,
+	2.744271e+001,
+	1.985706e+001,
+	2.229452e+001,
+	// albedo 1, turbidity 7
+	1.245827e+000,
+	3.182923e+000,
+	-7.822960e+000,
+	2.791395e+001,
+	2.327254e+001,
+	2.315910e+001,
+	// albedo 1, turbidity 8
+	1.132305e+000,
+	3.202593e+000,
+	-8.008429e+000,
+	2.521093e+001,
+	3.000014e+001,
+	2.405306e+001,
+	// albedo 1, turbidity 9
+	1.020330e+000,
+	2.820556e+000,
+	-6.238704e+000,
+	1.709276e+001,
+	4.077916e+001,
+	2.509949e+001,
+	// albedo 1, turbidity 10
+	9.031570e-001,
+	1.863917e+000,
+	-1.955738e+000,
+	3.032665e+000,
+	5.434290e+001,
+	2.641780e+001,
+};
+
+double datasetXYZ3[] = 
+{
+	// albedo 0, turbidity 1
+	-1.310023e+000,
+	-4.407658e-001,
+	-3.640340e+001,
+	3.683292e+001,
+	-8.124762e-003,
+	5.297961e-001,
+	1.188633e-002,
+	3.138320e+000,
+	5.134778e-001,
+	-1.424100e+000,
+	-5.501606e-001,
+	-1.753510e+001,
+	1.822769e+001,
+	-1.539272e-002,
+	6.366826e-001,
+	2.661996e-003,
+	2.659915e+000,
+	4.071138e-001,
+	-1.103436e+000,
+	-1.884105e-001,
+	6.425322e+000,
+	-6.910579e+000,
+	-2.019861e-002,
+	3.553271e-001,
+	-1.589061e-002,
+	5.345985e+000,
+	8.790218e-001,
+	-1.186200e+000,
+	-4.307514e-001,
+	-3.957947e+000,
+	5.979352e+000,
+	-5.348869e-002,
+	1.736117e+000,
+	3.491346e-002,
+	-2.692261e+000,
+	5.610506e-001,
+	-1.006038e+000,
+	-1.305995e-001,
+	4.473513e+000,
+	-3.806719e+000,
+	1.419407e-001,
+	-2.148238e-002,
+	-5.081185e-002,
+	3.735362e+000,
+	5.358280e-001,
+	-1.078507e+000,
+	-1.633754e-001,
+	-3.812368e+000,
+	4.381700e+000,
+	2.988122e-002,
+	1.754224e+000,
+	1.472376e-001,
+	3.722798e+000,
+	4.999157e-001,
+	// albedo 0, turbidity 2
+	-1.333582e+000,
+	-4.649908e-001,
+	-3.359528e+001,
+	3.404375e+001,
+	-9.384242e-003,
+	5.587511e-001,
+	5.726310e-003,
+	3.073145e+000,
+	5.425529e-001,
+	-1.562624e+000,
+	-7.107068e-001,
+	-1.478170e+001,
+	1.559839e+001,
+	-1.462375e-002,
+	5.050133e-001,
+	2.516017e-002,
+	1.604696e+000,
+	2.902403e-001,
+	-8.930158e-001,
+	4.068077e-002,
+	1.373481e+000,
+	-2.342752e+000,
+	-2.098058e-002,
+	6.248686e-001,
+	-5.258363e-002,
+	7.058214e+000,
+	1.150373e+000,
+	-1.262823e+000,
+	-4.818353e-001,
+	8.892610e-004,
+	1.923120e+000,
+	-4.979718e-002,
+	1.040693e+000,
+	1.558103e-001,
+	-2.852480e+000,
+	2.420691e-001,
+	-9.968383e-001,
+	-1.200648e-001,
+	1.324342e+000,
+	-9.430889e-001,
+	1.931098e-001,
+	4.436916e-001,
+	-7.320456e-002,
+	4.215931e+000,
+	7.898019e-001,
+	-1.078185e+000,
+	-1.718192e-001,
+	-1.720191e+000,
+	2.358918e+000,
+	2.765637e-002,
+	1.260245e+000,
+	2.021941e-001,
+	3.395483e+000,
+	5.173628e-001,
+	// albedo 0, turbidity 3
+	-1.353023e+000,
+	-4.813523e-001,
+	-3.104920e+001,
+	3.140156e+001,
+	-9.510741e-003,
+	5.542030e-001,
+	8.135471e-003,
+	3.136646e+000,
+	5.215989e-001,
+	-1.624704e+000,
+	-7.990201e-001,
+	-2.167125e+001,
+	2.246341e+001,
+	-1.163533e-002,
+	5.415746e-001,
+	2.618378e-002,
+	1.139214e+000,
+	3.444357e-001,
+	-7.983610e-001,
+	1.417476e-001,
+	9.914841e+000,
+	-1.081503e+001,
+	-1.218845e-002,
+	3.411392e-001,
+	-6.137698e-002,
+	7.445848e+000,
+	1.180080e+000,
+	-1.266679e+000,
+	-4.288977e-001,
+	-5.818701e+000,
+	6.986437e+000,
+	-8.180711e-002,
+	1.397403e+000,
+	2.016916e-001,
+	-1.275731e+000,
+	2.592773e-001,
+	-1.009707e+000,
+	-1.537754e-001,
+	3.496378e+000,
+	-3.013726e+000,
+	2.421150e-001,
+	-2.831925e-001,
+	3.003395e-002,
+	3.702862e+000,
+	7.746320e-001,
+	-1.075646e+000,
+	-1.768747e-001,
+	-1.347762e+000,
+	1.989004e+000,
+	1.375836e-002,
+	1.764810e+000,
+	1.330018e-001,
+	3.230864e+000,
+	6.626210e-001,
+	// albedo 0, turbidity 4
+	-1.375269e+000,
+	-5.103569e-001,
+	-3.442661e+001,
+	3.478703e+001,
+	-8.460009e-003,
+	5.408643e-001,
+	4.813323e-003,
+	3.016078e+000,
+	5.062069e-001,
+	-1.821679e+000,
+	-9.766461e-001,
+	-1.926488e+001,
+	1.997912e+001,
+	-9.822567e-003,
+	3.649556e-001,
+	4.316092e-002,
+	8.930190e-001,
+	4.166527e-001,
+	-6.633542e-001,
+	1.997841e-001,
+	2.395592e+000,
+	-3.117175e+000,
+	-1.080884e-002,
+	8.983814e-001,
+	-1.375825e-001,
+	6.673463e+000,
+	1.115663e+000,
+	-1.303240e+000,
+	-3.612712e-001,
+	8.292959e-002,
+	3.381364e-001,
+	-6.078648e-002,
+	3.229247e-001,
+	3.680987e-001,
+	7.046755e-001,
+	3.144924e-001,
+	-9.952598e-001,
+	-2.039076e-001,
+	4.026851e-001,
+	2.686684e-001,
+	1.640712e-001,
+	5.186341e-001,
+	-1.205520e-002,
+	2.659613e+000,
+	8.030394e-001,
+	-1.098579e+000,
+	-2.151992e-001,
+	6.558198e-001,
+	-7.436900e-004,
+	-1.421817e-003,
+	1.073701e+000,
+	1.886875e-001,
+	2.536857e+000,
+	6.673923e-001,
+	// albedo 0, turbidity 5
+	-1.457986e+000,
+	-5.906842e-001,
+	-3.812464e+001,
+	3.838539e+001,
+	-6.024357e-003,
+	4.741484e-001,
+	1.209223e-002,
+	2.818432e+000,
+	5.012433e-001,
+	-1.835728e+000,
+	-1.003405e+000,
+	-6.848129e+000,
+	7.601943e+000,
+	-1.277375e-002,
+	4.785598e-001,
+	3.366853e-002,
+	1.097701e+000,
+	4.636635e-001,
+	-8.491348e-001,
+	9.466365e-003,
+	-2.685226e+000,
+	2.004060e+000,
+	-1.168708e-002,
+	6.752316e-001,
+	-1.543371e-001,
+	5.674759e+000,
+	1.039534e+000,
+	-1.083379e+000,
+	-1.506790e-001,
+	7.328236e-001,
+	-5.095568e-001,
+	-8.609153e-002,
+	4.448820e-001,
+	4.174662e-001,
+	1.481556e+000,
+	3.942551e-001,
+	-1.117089e+000,
+	-3.337605e-001,
+	2.502281e-001,
+	4.036323e-001,
+	2.673899e-001,
+	2.829817e-001,
+	2.242450e-002,
+	2.043207e+000,
+	7.706902e-001,
+	-1.071648e+000,
+	-2.126200e-001,
+	6.069466e-001,
+	-1.456290e-003,
+	-5.515960e-001,
+	1.046755e+000,
+	1.985021e-001,
+	2.290245e+000,
+	6.876058e-001,
+	// albedo 0, turbidity 6
+	-1.483903e+000,
+	-6.309647e-001,
+	-4.380213e+001,
+	4.410537e+001,
+	-5.712161e-003,
+	5.195992e-001,
+	2.028428e-003,
+	2.687114e+000,
+	5.098321e-001,
+	-2.053976e+000,
+	-1.141473e+000,
+	5.109183e-001,
+	8.060391e-002,
+	-1.033983e-002,
+	4.066532e-001,
+	4.869627e-002,
+	1.161722e+000,
+	4.039525e-001,
+	-6.348185e-001,
+	7.651292e-002,
+	-1.031327e+001,
+	1.007598e+001,
+	-2.083688e-002,
+	7.359516e-001,
+	-2.029459e-001,
+	5.013257e+000,
+	1.077649e+000,
+	-1.228630e+000,
+	-1.650496e-001,
+	4.077157e-002,
+	-7.189167e-001,
+	-5.092220e-002,
+	2.959814e-001,
+	5.111496e-001,
+	2.540433e+000,
+	3.615330e-001,
+	-1.041883e+000,
+	-3.278413e-001,
+	-6.691911e-002,
+	1.307364e+000,
+	2.166663e-001,
+	3.000595e-001,
+	-3.157136e-003,
+	1.389208e+000,
+	7.999026e-001,
+	-1.103556e+000,
+	-2.443602e-001,
+	4.705347e-001,
+	-9.296482e-004,
+	-5.309920e-001,
+	9.654511e-001,
+	2.142587e-001,
+	2.244723e+000,
+	6.839976e-001,
+	// albedo 0, turbidity 7
+	-1.555684e+000,
+	-6.962113e-001,
+	-4.647983e+001,
+	4.674270e+001,
+	-5.034895e-003,
+	4.755090e-001,
+	-9.502561e-007,
+	2.626569e+000,
+	5.056194e-001,
+	-1.998288e+000,
+	-1.124720e+000,
+	-1.629586e+000,
+	2.187993e+000,
+	-8.284384e-003,
+	3.845258e-001,
+	5.726240e-002,
+	1.185644e+000,
+	4.255812e-001,
+	-1.032570e+000,
+	-2.513850e-001,
+	-3.721112e+000,
+	3.506967e+000,
+	-2.186561e-002,
+	9.436049e-001,
+	-2.451412e-001,
+	4.725724e+000,
+	1.039256e+000,
+	-8.597532e-001,
+	9.073332e-002,
+	-2.553741e+000,
+	1.993237e+000,
+	-4.390891e-002,
+	-2.046928e-001,
+	5.515623e-001,
+	1.909127e+000,
+	3.948212e-001,
+	-1.210482e+000,
+	-4.477622e-001,
+	-2.267805e-001,
+	1.219488e+000,
+	1.336186e-001,
+	6.866897e-001,
+	2.808997e-002,
+	1.600403e+000,
+	7.816409e-001,
+	-1.078168e+000,
+	-2.699261e-001,
+	2.537282e-001,
+	3.820684e-001,
+	-4.425103e-001,
+	5.298235e-001,
+	2.185217e-001,
+	1.728679e+000,
+	6.882743e-001,
+	// albedo 0, turbidity 8
+	-1.697968e+000,
+	-8.391488e-001,
+	-5.790105e+001,
+	5.814120e+001,
+	-3.404760e-003,
+	4.265140e-001,
+	-1.796301e-006,
+	2.368442e+000,
+	5.324429e-001,
+	-2.141552e+000,
+	-1.172230e+000,
+	1.677872e+001,
+	-1.641470e+001,
+	-5.732425e-003,
+	2.002199e-001,
+	6.841834e-002,
+	1.485338e+000,
+	3.215763e-001,
+	-1.442946e+000,
+	-7.264245e-001,
+	-9.503706e+000,
+	9.650462e+000,
+	-2.120995e-002,
+	1.419263e+000,
+	-2.893098e-001,
+	3.860731e+000,
+	1.120857e+000,
+	-5.696752e-001,
+	3.411279e-001,
+	-2.931035e-001,
+	-6.512552e-001,
+	-1.068437e-001,
+	-1.085661e+000,
+	6.107549e-001,
+	1.459503e+000,
+	3.210336e-001,
+	-1.313839e+000,
+	-5.921371e-001,
+	-2.332222e-001,
+	1.648196e+000,
+	2.492787e-001,
+	1.381033e+000,
+	-1.993392e-002,
+	9.812560e-001,
+	8.316329e-001,
+	-1.087464e+000,
+	-3.195534e-001,
+	2.902095e-001,
+	3.383709e-001,
+	-8.798482e-001,
+	1.494668e-002,
+	2.529703e-001,
+	1.452644e+000,
+	6.693870e-001,
+	// albedo 0, turbidity 9
+	-2.068582e+000,
+	-1.118605e+000,
+	-5.081598e+001,
+	5.097486e+001,
+	-3.280669e-003,
+	4.067371e-001,
+	-2.544951e-006,
+	2.179497e+000,
+	5.778017e-001,
+	-1.744693e+000,
+	-8.537207e-001,
+	2.234361e+001,
+	-2.208318e+001,
+	-5.932616e-003,
+	1.035049e-001,
+	5.742772e-002,
+	1.977880e+000,
+	2.124846e-001,
+	-3.287515e+000,
+	-2.140268e+000,
+	-1.249566e+001,
+	1.240091e+001,
+	-2.409349e-002,
+	1.397821e+000,
+	-2.371627e-001,
+	2.771192e+000,
+	1.170496e+000,
+	5.502311e-001,
+	1.046630e+000,
+	2.193517e+000,
+	-2.220400e+000,
+	-1.064394e-001,
+	-1.017926e+000,
+	4.795457e-001,
+	1.030644e+000,
+	3.177516e-001,
+	-1.719734e+000,
+	-9.536198e-001,
+	-6.586821e-001,
+	1.386361e+000,
+	-2.513065e-002,
+	1.187011e+000,
+	6.542539e-002,
+	5.296055e-001,
+	8.082660e-001,
+	-1.005700e+000,
+	-3.028096e-001,
+	4.470957e-002,
+	1.007760e+000,
+	-8.119016e-001,
+	3.153338e-002,
+	2.311321e-001,
+	1.182208e+000,
+	6.824758e-001,
+	// albedo 0, turbidity 10
+	-2.728867e+000,
+	-1.580388e+000,
+	-3.079627e+001,
+	3.092586e+001,
+	-4.197673e-003,
+	3.154759e-001,
+	-3.897675e-006,
+	1.920567e+000,
+	6.664791e-001,
+	-1.322495e+000,
+	-7.249275e-001,
+	1.477660e+001,
+	-1.468154e+001,
+	-9.044857e-003,
+	5.624314e-002,
+	6.498392e-002,
+	2.047389e+000,
+	6.367540e-002,
+	-6.102376e+000,
+	-3.473018e+000,
+	-9.926071e+000,
+	9.637797e+000,
+	-1.097909e-002,
+	1.103498e+000,
+	-2.424521e-001,
+	2.520748e+000,
+	1.240260e+000,
+	1.351796e+000,
+	1.018588e+000,
+	2.009081e+000,
+	-1.333394e+000,
+	-1.979125e-001,
+	-3.318292e-001,
+	4.476624e-001,
+	9.095235e-001,
+	2.955611e-001,
+	-1.774467e+000,
+	-1.079880e+000,
+	-8.084680e-002,
+	2.577697e-001,
+	-1.149295e-001,
+	4.975303e-001,
+	2.931611e-003,
+	-3.803171e-001,
+	8.002794e-001,
+	-9.898401e-001,
+	-2.542513e-001,
+	-7.530911e-002,
+	1.870355e+000,
+	-1.521918e+000,
+	2.405164e-001,
+	2.964615e-001,
+	1.334800e+000,
+	6.789053e-001,
+	// albedo 1, turbidity 1
+	-1.279730e+000,
+	-4.290674e-001,
+	-4.277972e+001,
+	4.343305e+001,
+	-6.541826e-003,
+	4.945086e-001,
+	1.425338e-002,
+	2.685244e+000,
+	5.011313e-001,
+	-1.449506e+000,
+	-5.766374e-001,
+	-1.688496e+001,
+	1.781118e+001,
+	-1.121649e-002,
+	3.545020e-001,
+	2.287338e-002,
+	1.904281e+000,
+	4.936998e-001,
+	-1.021980e+000,
+	-1.897574e-001,
+	2.482462e+000,
+	-2.941725e+000,
+	-1.570448e-002,
+	7.532578e-001,
+	-4.256800e-002,
+	5.239660e+000,
+	4.983116e-001,
+	-1.162608e+000,
+	-3.428049e-001,
+	3.974358e+000,
+	-1.527935e+000,
+	-3.919201e-002,
+	8.758593e-001,
+	7.291363e-002,
+	-3.455257e+000,
+	8.007426e-001,
+	-9.929985e-001,
+	-8.712006e-002,
+	-7.397313e-001,
+	1.348372e+000,
+	9.511685e-002,
+	3.233584e-001,
+	-7.549148e-002,
+	5.806452e+000,
+	4.990042e-001,
+	-1.084996e+000,
+	-1.739767e-001,
+	1.580475e-001,
+	9.088180e-001,
+	6.871433e-002,
+	5.933079e-001,
+	1.188921e-001,
+	3.074079e+000,
+	4.999327e-001,
+	// albedo 1, turbidity 2
+	-1.317009e+000,
+	-4.661946e-001,
+	-4.255347e+001,
+	4.312782e+001,
+	-5.727235e-003,
+	4.285447e-001,
+	2.189854e-002,
+	2.608310e+000,
+	5.190700e-001,
+	-1.469236e+000,
+	-6.282139e-001,
+	-1.241404e+001,
+	1.348765e+001,
+	-1.204770e-002,
+	5.070285e-001,
+	-7.280216e-004,
+	1.491533e+000,
+	3.635064e-001,
+	-9.713808e-001,
+	-8.138038e-002,
+	3.709854e-001,
+	-1.041174e+000,
+	-1.814075e-002,
+	5.060860e-001,
+	-2.053756e-002,
+	6.161431e+000,
+	1.093736e+000,
+	-1.159057e+000,
+	-3.698074e-001,
+	2.711209e+000,
+	-6.006479e-001,
+	-4.896926e-002,
+	9.273957e-001,
+	1.137712e-001,
+	-3.496828e+000,
+	2.867109e-001,
+	-1.011601e+000,
+	-8.201890e-002,
+	2.105725e-001,
+	4.597520e-001,
+	1.478925e-001,
+	2.138940e-001,
+	-5.660670e-002,
+	6.057755e+000,
+	7.859121e-001,
+	-1.078020e+000,
+	-1.811580e-001,
+	1.646622e-001,
+	8.348426e-001,
+	1.149064e-001,
+	4.985738e-001,
+	1.376605e-001,
+	2.746607e+000,
+	4.999626e-001,
+	// albedo 1, turbidity 3
+	-1.325672e+000,
+	-4.769313e-001,
+	-4.111215e+001,
+	4.168293e+001,
+	-6.274997e-003,
+	4.649469e-001,
+	1.119411e-002,
+	2.631267e+000,
+	5.234546e-001,
+	-1.619391e+000,
+	-8.000253e-001,
+	-1.534098e+001,
+	1.632706e+001,
+	-1.012023e-002,
+	4.242255e-001,
+	2.931597e-002,
+	8.925807e-001,
+	3.314765e-001,
+	-7.356979e-001,
+	1.368406e-001,
+	2.972579e+000,
+	-3.535359e+000,
+	-1.318948e-002,
+	4.607620e-001,
+	-7.182778e-002,
+	6.254100e+000,
+	1.236299e+000,
+	-1.316217e+000,
+	-4.194427e-001,
+	3.489902e-002,
+	1.289849e+000,
+	-4.755960e-002,
+	1.138222e+000,
+	1.975992e-001,
+	-8.991542e-001,
+	2.290572e-001,
+	-9.502188e-001,
+	-1.172703e-001,
+	1.405202e+000,
+	-3.061919e-001,
+	1.058772e-001,
+	-3.760592e-001,
+	-1.983179e-002,
+	3.562353e+000,
+	7.895959e-001,
+	-1.100117e+000,
+	-1.900567e-001,
+	4.925030e-001,
+	5.250225e-001,
+	1.576804e-001,
+	1.042701e+000,
+	7.330743e-002,
+	2.796064e+000,
+	6.749783e-001,
+	// albedo 1, turbidity 4
+	-1.354183e+000,
+	-5.130625e-001,
+	-4.219268e+001,
+	4.271772e+001,
+	-5.365373e-003,
+	4.136743e-001,
+	1.235172e-002,
+	2.520122e+000,
+	5.187269e-001,
+	-1.741434e+000,
+	-9.589761e-001,
+	-8.230339e+000,
+	9.296799e+000,
+	-9.600162e-003,
+	4.994969e-001,
+	2.955452e-002,
+	3.667099e-001,
+	3.526999e-001,
+	-6.917347e-001,
+	2.154887e-001,
+	-8.760264e-001,
+	2.334121e-001,
+	-1.909621e-002,
+	4.748033e-001,
+	-1.138514e-001,
+	6.515360e+000,
+	1.225097e+000,
+	-1.293189e+000,
+	-4.218700e-001,
+	1.620952e+000,
+	-7.858597e-001,
+	-3.769410e-002,
+	6.636786e-001,
+	3.364945e-001,
+	-5.341017e-001,
+	2.128347e-001,
+	-9.735521e-001,
+	-1.325495e-001,
+	1.007517e+000,
+	2.598258e-001,
+	6.762169e-002,
+	1.421018e-003,
+	-6.915987e-002,
+	3.185897e+000,
+	8.641956e-001,
+	-1.094800e+000,
+	-1.962062e-001,
+	5.755591e-001,
+	2.906259e-001,
+	2.625748e-001,
+	7.644049e-001,
+	1.347492e-001,
+	2.677126e+000,
+	6.465460e-001,
+	// albedo 1, turbidity 5
+	-1.393063e+000,
+	-5.578338e-001,
+	-4.185249e+001,
+	4.233504e+001,
+	-5.435640e-003,
+	4.743765e-001,
+	7.422477e-003,
+	2.442801e+000,
+	5.211707e-001,
+	-1.939487e+000,
+	-1.128509e+000,
+	-8.974257e+000,
+	9.978383e+000,
+	-7.965597e-003,
+	2.948830e-001,
+	4.436763e-002,
+	2.839868e-001,
+	3.440424e-001,
+	-6.011562e-001,
+	2.354877e-001,
+	-3.079820e+000,
+	2.585094e+000,
+	-2.002701e-002,
+	7.793909e-001,
+	-1.598414e-001,
+	5.834678e+000,
+	1.202856e+000,
+	-1.315676e+000,
+	-3.903446e-001,
+	1.701900e+000,
+	-1.304609e+000,
+	-1.045121e-002,
+	2.747707e-001,
+	4.143967e-001,
+	3.197102e-001,
+	2.637580e-001,
+	-9.618628e-001,
+	-1.625841e-001,
+	1.187138e+000,
+	1.497802e-001,
+	-5.590954e-006,
+	3.178475e-002,
+	-4.153145e-002,
+	2.496096e+000,
+	8.195082e-001,
+	-1.111554e+000,
+	-2.365546e-001,
+	7.831875e-001,
+	2.018684e-001,
+	2.074369e-001,
+	7.395978e-001,
+	1.225730e-001,
+	1.876478e+000,
+	6.821167e-001,
+	// albedo 1, turbidity 6
+	-1.427879e+000,
+	-5.994879e-001,
+	-3.531016e+001,
+	3.581581e+001,
+	-6.431497e-003,
+	4.554192e-001,
+	7.348731e-004,
+	2.334619e+000,
+	5.233377e-001,
+	-1.998177e+000,
+	-1.206633e+000,
+	-2.146510e+001,
+	2.242237e+001,
+	-5.857596e-003,
+	2.755663e-001,
+	6.384795e-002,
+	1.358244e-001,
+	3.328437e-001,
+	-6.440630e-001,
+	2.058571e-001,
+	2.155499e+000,
+	-2.587968e+000,
+	-1.840023e-002,
+	8.826555e-001,
+	-2.222452e-001,
+	5.847073e+000,
+	1.228387e+000,
+	-1.229071e+000,
+	-3.360441e-001,
+	-3.429599e-001,
+	6.179469e-001,
+	2.029610e-003,
+	8.899319e-002,
+	5.041624e-001,
+	1.882964e-001,
+	2.252040e-001,
+	-1.022905e+000,
+	-2.101621e-001,
+	1.915689e+000,
+	-6.498794e-001,
+	-3.463651e-002,
+	8.954605e-002,
+	-6.797854e-002,
+	2.417705e+000,
+	8.568618e-001,
+	-1.082538e+000,
+	-2.007723e-001,
+	4.731009e-001,
+	4.077267e-001,
+	1.324289e-001,
+	6.514880e-001,
+	1.702912e-001,
+	2.309383e+000,
+	6.600895e-001,
+	// albedo 1, turbidity 7
+	-1.472139e+000,
+	-6.499815e-001,
+	-3.428465e+001,
+	3.469659e+001,
+	-5.747023e-003,
+	4.174167e-001,
+	1.688597e-003,
+	2.323046e+000,
+	5.395191e-001,
+	-2.161176e+000,
+	-1.353089e+000,
+	-2.226827e+001,
+	2.329138e+001,
+	-5.583808e-003,
+	2.364793e-001,
+	6.096656e-002,
+	1.944666e-003,
+	2.861624e-001,
+	-6.593044e-001,
+	1.393558e-001,
+	4.698373e+000,
+	-5.193883e+000,
+	-1.998390e-002,
+	1.095635e+000,
+	-2.391254e-001,
+	5.598103e+000,
+	1.236193e+000,
+	-1.195717e+000,
+	-2.972715e-001,
+	4.648953e-002,
+	3.024588e-001,
+	5.003313e-003,
+	-3.754741e-001,
+	5.247265e-001,
+	-1.381312e-001,
+	2.493896e-001,
+	-1.020139e+000,
+	-2.253524e-001,
+	3.548437e-001,
+	7.030485e-001,
+	-2.107076e-002,
+	4.581395e-001,
+	-3.243757e-002,
+	2.453259e+000,
+	8.323623e-001,
+	-1.098770e+000,
+	-2.435780e-001,
+	8.761614e-001,
+	1.941613e-001,
+	-1.990692e-001,
+	3.761139e-001,
+	1.657412e-001,
+	1.590503e+000,
+	6.741417e-001,
+	// albedo 1, turbidity 8
+	-1.648007e+000,
+	-8.205121e-001,
+	-4.435106e+001,
+	4.479801e+001,
+	-4.181353e-003,
+	3.854830e-001,
+	-1.842385e-006,
+	2.000281e+000,
+	5.518363e-001,
+	-2.140986e+000,
+	-1.282239e+000,
+	-3.979213e+000,
+	4.672459e+000,
+	-5.008582e-003,
+	2.421920e-001,
+	6.253602e-002,
+	6.612713e-001,
+	2.555851e-001,
+	-1.300502e+000,
+	-5.137898e-001,
+	5.179821e-001,
+	-4.032341e-001,
+	-2.066785e-002,
+	1.087929e+000,
+	-2.615309e-001,
+	4.225887e+000,
+	1.229237e+000,
+	-6.963340e-001,
+	9.241060e-002,
+	6.936356e-002,
+	-3.588571e-001,
+	-5.461843e-002,
+	-5.616643e-001,
+	5.484166e-001,
+	-4.776267e-002,
+	2.414935e-001,
+	-1.233179e+000,
+	-4.325498e-001,
+	6.479813e-001,
+	8.368356e-001,
+	2.458875e-001,
+	6.464752e-001,
+	-2.897097e-002,
+	1.561773e+000,
+	8.518598e-001,
+	-1.051023e+000,
+	-2.533690e-001,
+	1.004294e+000,
+	3.028083e-001,
+	-1.520108e+000,
+	1.607013e-001,
+	1.619975e-001,
+	1.131094e+000,
+	6.706655e-001,
+	// albedo 1, turbidity 9
+	-1.948249e+000,
+	-1.097383e+000,
+	-4.453697e+001,
+	4.494902e+001,
+	-3.579939e-003,
+	3.491605e-001,
+	-2.500253e-006,
+	1.740442e+000,
+	6.188022e-001,
+	-2.154253e+000,
+	-1.209559e+000,
+	4.144894e+000,
+	-3.562411e+000,
+	-5.638843e-003,
+	1.067169e-001,
+	7.594858e-002,
+	1.005280e+000,
+	1.072543e-001,
+	-2.513259e+000,
+	-1.507208e+000,
+	-1.602979e+000,
+	1.404154e+000,
+	-5.560750e-003,
+	1.240490e+000,
+	-2.852117e-001,
+	3.485252e+000,
+	1.349321e+000,
+	-7.832214e-002,
+	3.655626e-001,
+	3.856288e-001,
+	6.867894e-001,
+	-1.609523e-001,
+	-6.704306e-001,
+	5.357301e-001,
+	-6.457935e-001,
+	1.479503e-001,
+	-1.354784e+000,
+	-5.454375e-001,
+	8.797469e-001,
+	-1.466514e+000,
+	7.134420e-001,
+	5.934903e-001,
+	-2.911178e-002,
+	8.643737e-001,
+	9.030724e-001,
+	-1.048324e+000,
+	-2.738736e-001,
+	8.783074e-001,
+	3.246188e+000,
+	-4.435369e+000,
+	1.251791e-001,
+	1.783486e-001,
+	1.064657e+000,
+	6.522878e-001,
+	// albedo 1, turbidity 10
+	-2.770408e+000,
+	-1.618911e+000,
+	-2.504031e+001,
+	2.531674e+001,
+	-4.239279e-003,
+	3.241013e-001,
+	-3.764484e-006,
+	1.586843e+000,
+	7.035906e-001,
+	-1.913500e+000,
+	-1.144014e+000,
+	-1.080587e+001,
+	1.153677e+001,
+	-1.003197e-002,
+	1.577515e-001,
+	5.217789e-002,
+	1.225278e+000,
+	5.172771e-003,
+	-5.293208e+000,
+	-2.876463e+000,
+	2.087053e+000,
+	-3.201552e+000,
+	3.892964e-003,
+	5.323930e-001,
+	-2.034512e-001,
+	2.617760e+000,
+	1.273597e+000,
+	9.060340e-001,
+	3.773409e-001,
+	-6.399945e-001,
+	3.213979e+000,
+	-9.112172e-002,
+	6.494055e-001,
+	3.953280e-001,
+	5.047796e-001,
+	2.998695e-001,
+	-1.482179e+000,
+	-6.778310e-001,
+	1.161775e+000,
+	-3.004872e+000,
+	4.774797e-001,
+	-4.969248e-001,
+	-3.512074e-003,
+	-1.307190e+000,
+	7.927378e-001,
+	-9.863181e-001,
+	-1.803364e-001,
+	5.810824e-001,
+	4.580570e+000,
+	-3.863454e+000,
+	5.328174e-001,
+	2.272821e-001,
+	1.771114e+000,
+	6.791814e-001,
+};
+
+double datasetXYZRad3[] = 
+{
+	// albedo 0, turbidity 1
+	1.168084e+000,
+	2.156455e+000,
+	-3.980314e+000,
+	1.989302e+001,
+	1.328335e+001,
+	1.435621e+001,
+	// albedo 0, turbidity 2
+	1.135488e+000,
+	2.294701e+000,
+	-4.585886e+000,
+	2.090208e+001,
+	1.347840e+001,
+	1.467658e+001,
+	// albedo 0, turbidity 3
+	1.107408e+000,
+	2.382765e+000,
+	-5.112357e+000,
+	2.147823e+001,
+	1.493128e+001,
+	1.460882e+001,
+	// albedo 0, turbidity 4
+	1.054193e+000,
+	2.592891e+000,
+	-6.115000e+000,
+	2.268967e+001,
+	1.635672e+001,
+	1.518999e+001,
+	// albedo 0, turbidity 5
+	1.006946e+000,
+	2.705420e+000,
+	-6.698930e+000,
+	2.291830e+001,
+	1.834324e+001,
+	1.570651e+001,
+	// albedo 0, turbidity 6
+	9.794044e-001,
+	2.742440e+000,
+	-6.805283e+000,
+	2.225271e+001,
+	2.050797e+001,
+	1.563130e+001,
+	// albedo 0, turbidity 7
+	9.413577e-001,
+	2.722009e+000,
+	-6.760707e+000,
+	2.098242e+001,
+	2.342588e+001,
+	1.605011e+001,
+	// albedo 0, turbidity 8
+	8.917923e-001,
+	2.592780e+000,
+	-6.152635e+000,
+	1.774141e+001,
+	2.858324e+001,
+	1.657910e+001,
+	// albedo 0, turbidity 9
+	8.288391e-001,
+	2.153434e+000,
+	-4.118327e+000,
+	1.078118e+001,
+	3.681710e+001,
+	1.738139e+001,
+	// albedo 0, turbidity 10
+	7.623528e-001,
+	1.418187e+000,
+	-8.845235e-001,
+	7.590129e-001,
+	4.629859e+001,
+	1.921657e+001,
+	// albedo 1, turbidity 1
+	1.352858e+000,
+	2.048862e+000,
+	-2.053393e+000,
+	1.405874e+001,
+	3.045344e+001,
+	3.044430e+001,
+	// albedo 1, turbidity 2
+	1.330497e+000,
+	2.126497e+000,
+	-2.466296e+000,
+	1.467559e+001,
+	3.090738e+001,
+	3.069707e+001,
+	// albedo 1, turbidity 3
+	1.286344e+000,
+	2.200436e+000,
+	-2.877228e+000,
+	1.492701e+001,
+	3.236288e+001,
+	3.077223e+001,
+	// albedo 1, turbidity 4
+	1.234428e+000,
+	2.289628e+000,
+	-3.404699e+000,
+	1.499436e+001,
+	3.468390e+001,
+	3.084842e+001,
+	// albedo 1, turbidity 5
+	1.178660e+000,
+	2.306071e+000,
+	-3.549159e+000,
+	1.411006e+001,
+	3.754188e+001,
+	3.079730e+001,
+	// albedo 1, turbidity 6
+	1.151366e+000,
+	2.333005e+000,
+	-3.728627e+000,
+	1.363374e+001,
+	3.905894e+001,
+	3.092599e+001,
+	// albedo 1, turbidity 7
+	1.101593e+000,
+	2.299422e+000,
+	-3.565787e+000,
+	1.196745e+001,
+	4.188472e+001,
+	3.102755e+001,
+	// albedo 1, turbidity 8
+	1.038322e+000,
+	2.083539e+000,
+	-2.649585e+000,
+	8.037389e+000,
+	4.700869e+001,
+	3.065948e+001,
+	// albedo 1, turbidity 9
+	9.596146e-001,
+	1.671470e+000,
+	-8.751538e-001,
+	1.679772e+000,
+	5.345784e+001,
+	3.054520e+001,
+	// albedo 1, turbidity 10
+	8.640731e-001,
+	9.858301e-001,
+	1.854956e+000,
+	-6.798097e+000,
+	5.936468e+001,
+	3.110255e+001,
+};
+
+
+
+double* datasetsXYZ[] =
+{
+	datasetXYZ1,
+	datasetXYZ2,
+	datasetXYZ3
+};
+
+double* datasetsXYZRad[] =
+{
+	datasetXYZRad1,
+	datasetXYZRad2,
+	datasetXYZRad3
+};
+
+CCL_NAMESPACE_END
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index 6da5738f73d..0e84ebb1634 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -62,7 +62,6 @@ void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene
 		svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0));
 	}
 	
-	bool sunsky_done = false;
 	bool use_multi_closure = device->info.advanced_shading;
 
 	for(i = 0; i < scene->shaders.size(); i++) {
@@ -77,11 +76,8 @@ void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene
 
 		SVMCompiler compiler(scene->shader_manager, scene->image_manager,
 			use_multi_closure);
-		compiler.sunsky = (sunsky_done)? NULL: &dscene->data.sunsky;
 		compiler.background = ((int)i == scene->default_background);
 		compiler.compile(shader, svm_nodes, i);
-		if(!compiler.sunsky)
-			sunsky_done = true;
 	}
 
 	dscene->svm_nodes.copy((uint4*)&svm_nodes[0], svm_nodes.size());
@@ -111,7 +107,6 @@ SVMCompiler::SVMCompiler(ShaderManager *shader_manager_, ImageManager *image_man
 {
 	shader_manager = shader_manager_;
 	image_manager = image_manager_;
-	sunsky = NULL;
 	max_stack_use = 0;
 	current_type = SHADER_TYPE_SURFACE;
 	current_shader = NULL;
diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index 98e416a676e..9693e54ce75 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -29,7 +29,6 @@ CCL_NAMESPACE_BEGIN
 class Device;
 class DeviceScene;
 class ImageManager;
-struct KernelSunSky;
 class Scene;
 class ShaderGraph;
 class ShaderInput;
@@ -77,7 +76,6 @@ public:
 
 	ImageManager *image_manager;
 	ShaderManager *shader_manager;
-	KernelSunSky *sunsky;
 	bool background;
 
 protected:
author	Thomas Dinges <blender@dingto.org>	2013-08-28 18:11:28 +0400
committer	Thomas Dinges <blender@dingto.org>	2013-08-28 18:11:28 +0400
commit	d539bd46729b3cdb85483f34f4aa362f2b64195a (patch)
tree	9807785dddb1b92cc4fe1b82b8358cc60b09a80c /intern
parent	1a6b364c284c1d919e0184b18465d9b673d330c6 (diff)
parent	8b955e9b19dd8616f61c27d5e9d2d80d66dacd96 (diff)