RSL v1.42

[~andy/rsl] / nsig_to_radar.c

diff --git a/nsig_to_radar.c b/nsig_to_radar.c
index 88788e46dba3b2ff6ae1e6535ae5cd0686cfadfa..03d739f75fe5b339ae31f5945bfde81e7e422d52 100644 (file)
--- a/nsig_to_radar.c
+++ b/nsig_to_radar.c
@@ -240,17 +240,6 @@ RSL_nsig_to_radar
   if (radar_verbose_flag)
     fprintf(stderr, "Read %d bytes for rec2.\n", n);
 
-   /** Test for scan mode -- If scan is a RHI will return NULL  **/
-   /** because RSL can't handle RHI's.  In the future, replace  **/
-   /** NULL will a routine to convert RHI's to RSL Format       **/
-   ant_scan_mode =NSIG_I2(prod_file->rec2.task_config.scan_info.ant_scan_mode);
-   if(ant_scan_mode == 2)
-      {
-      if (radar_verbose_flag)
-      fprintf(stderr, "RHI scan detected. Unable to process, returning NULL.\n");
-      /*      return NULL; */
-      }
-  
   /* Count the bits set in 'data_mask' to determine the number
    * of parameters present.
    */
@@ -630,6 +619,14 @@ RSL_nsig_to_radar
         ifield = HC_INDEX;
         f      = HC_F; 
         invf   = HC_INVF;
+      case NSIG_DTB_DBZ2:
+        ifield = CZ_INDEX;
+        f      = CZ_F; 
+        invf   = CZ_INVF;
+      case NSIG_DTB_ZDRC2:
+        ifield = ZD_INDEX;
+        f      = ZD_F; 
+        invf   = ZD_INVF;
         break;
       default:
         fprintf(stderr,"Unknown field type: %d  Skipping it.\n", data_type);
@@ -734,7 +731,7 @@ RSL_nsig_to_radar
           ray->h.wavelength  = wave/100.0;     /* meters */
           ray->h.nyq_vel     = max_vel;        /* m/s */
           if (elev == 0.) elev = sweep->h.elev;
-          ray->h.elev        = elev;
+          ray->h.elev        = (nsig_from_bang(ray_p->h.end_elev)+nsig_from_bang(ray_p->h.beg_elev))/2.0;
           /* Compute mean azimuth angle for ray. */
           az1 = nsig_from_bang(ray_p->h.beg_azm);
           az2 = nsig_from_bang(ray_p->h.end_azm);