Changes from Bart (2011-02-01)

[~andy/rsl] / wsr88d_to_radar.c

diff --git a/wsr88d_to_radar.c b/wsr88d_to_radar.c
index 9ef0597417bc21344adb0a37c8a180cc88934e16..0ea067219429969864605de1575a88b037f46206 100644 (file)
--- a/wsr88d_to_radar.c
+++ b/wsr88d_to_radar.c
@@ -223,6 +223,7 @@ Radar *RSL_wsr88d_to_radar(char *infile, char *call_or_first_tape_file)
   Wsr88d_tape_header wsr88d_tape_header;
   int n;
   int nsweep;
+  int i;
   int iv;
   int nvolumes;
   int volume_mask[] = {WSR88D_DZ, WSR88D_VR, WSR88D_SW};
@@ -300,14 +301,15 @@ Radar *RSL_wsr88d_to_radar(char *infile, char *call_or_first_tape_file)
    */
   if (n > 0) {
       strncpy(version, wsr88d_file_header.title.filename, 8);
-      if (strncmp(version,"AR2V0004",8) == 0 ||
-             strncmp(version,"AR2V0003",8) ==0 ||
-             strncmp(version,"AR2V0002",8) == 0) {
-         expected_msgtype = 31;
+      if (strncmp(version,"AR2V0006",8) == 0 ||
+          strncmp(version,"AR2V0004",8) == 0 ||
+          strncmp(version,"AR2V0003",8) == 0 ||
+          strncmp(version,"AR2V0002",8) == 0) {
+          expected_msgtype = 31;
       }
       else if (strncmp(version,"ARCHIVE2",8) == 0 ||
-             strncmp(version,"AR2V0001",8) == 0) {
-         expected_msgtype = 1;
+          strncmp(version,"AR2V0001",8) == 0) {
+          expected_msgtype = 1;
       }
   }
 
@@ -386,6 +388,14 @@ Radar *RSL_wsr88d_to_radar(char *infile, char *call_or_first_tape_file)
                    }
              }
            }
+           if (nsweep == 0) {
+                 /* Get Volume Coverage Pattern number for radar header. */
+                 i=0;
+                 while (i < MAX_RAYS_IN_SWEEP && wsr88d_sweep.ray[i] == NULL) i++;
+                 if (i < MAX_RAYS_IN_SWEEP) radar->h.vcp = wsr88d_get_volume_coverage(
+                   wsr88d_sweep.ray[i]);
+               }
+
            free_and_clear_sweep(&wsr88d_sweep, 0, MAX_RAYS_IN_SWEEP);
       }