htrdr

commit f23ffee33ceae969dc30ed615942dbd219b1bb6a
parent c6b3b5ace0ebfdf16ec4a1da54a222344d1c2360
Author: Najda Villefranque <najda.villefranque@gmail.com>
Date:   Wed, 27 May 2020 19:37:02 +0200

Corrected Lsun for image mode

Diffstat:
M
src/htrdr.c
 | 
10
+++++-----
M
src/htrdr_compute_radiance_sw.c
 | 
7
+++++--

2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/htrdr.c b/src/htrdr.c
@@ -490,16 +490,16 @@ htrdr_init
     htsky_args.is_long_wave = 0 ; 
     htsky_args.wlen_range[0] = args->wlen_sw_range[0];
     htsky_args.wlen_range[1] = args->wlen_sw_range[1];
-    htrdr->is_image=0;
-  } else {
-    htsky_args.is_long_wave = 1 ;
-    htsky_args.wlen_range[0] = args->wlen_lw_range[0];
-    htsky_args.wlen_range[1] = args->wlen_lw_range[1];
     if(args->wlen_sw_range[0] > args->wlen_sw_range[1]) { /* image */
       htrdr->is_image = 1 ;
     } else {
       htrdr->is_image = 0 ;
     }
+  } else {
+    htsky_args.is_long_wave = 1 ;
+    htsky_args.wlen_range[0] = args->wlen_lw_range[0];
+    htsky_args.wlen_range[1] = args->wlen_lw_range[1];
+    htrdr->is_image=0;
   }
 
   res = htsky_create(&htrdr->logger, htrdr->allocator, &htsky_args, &htrdr->sky);
diff --git a/src/htrdr_compute_radiance_sw.c b/src/htrdr_compute_radiance_sw.c
@@ -299,8 +299,11 @@ htrdr_compute_radiance_sw
   htsky_get_spectral_band_bounds(htrdr->sky, iband, band_bounds);
   ASSERT(band_bounds[0] <= wlen  && wlen <= band_bounds[1]);
   sun_solid_angle = htrdr_sun_get_solid_angle(htrdr->sun);
-  /* L_sun = htrdr_sun_get_radiance(htrdr->sun, wlen);*/
-  L_sun = planck_monochromatic(wlen_m, temperature);
+  if (htrdr->is_image) {
+    L_sun = htrdr_sun_get_radiance(htrdr->sun, wlen);
+  } else {
+    L_sun = planck_monochromatic(wlen_m, temperature);
+  }
   d3_set(pos, pos_in);
   d3_set(dir, dir_in);