1 --- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
2 +++ rsl-mine/wsr88d_m31.c 2009-05-10 12:58:17.000000000 +0000
4 Range (*invf)(float x);
6 int vol_index, waveform;
9 enum waveforms {surveillance=1, doppler_ambres, doppler_no_ambres, batch};
12 if (wsr88d_ray.ray_hdr.dbptr_ref > 0) {
13 vol_index = wsr88d_get_vol_index(wsr88d_ray.ref->data_hdr.dataname);
15 - case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
16 - case VR_INDEX: f = VR_F; invf = VR_INVF; break;
17 - case SW_INDEX: f = SW_F; invf = SW_INVF; break;
18 - default: f = DZ_F; invf = DZ_INVF; break;
19 + case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
20 + case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
21 + case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
22 + default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
24 /* If this is reflectivity, check the waveform type to make sure
25 * it isn't from a Doppler split cut.
27 radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
28 radar->v[vol_index]->h.f = f;
29 radar->v[vol_index]->h.invf = invf;
30 + radar->v[vol_index]->h.type_str = type_str;
32 if (radar->v[vol_index]->sweep[isweep] == NULL) {
33 radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
35 if (wsr88d_ray.ray_hdr.dbptr_vel > 0) {
36 vol_index = wsr88d_get_vol_index(wsr88d_ray.vel->data_hdr.dataname);
38 - case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
39 - case VR_INDEX: f = VR_F; invf = VR_INVF; break;
40 - case SW_INDEX: f = SW_F; invf = SW_INVF; break;
41 - default: f = DZ_F; invf = DZ_INVF; break;
42 + case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
43 + case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
44 + case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
45 + default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
47 if (radar->v[vol_index] == NULL) {
48 radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
49 radar->v[vol_index]->h.f = f;
50 radar->v[vol_index]->h.invf = invf;
51 + radar->v[vol_index]->h.type_str = type_str;
53 if (radar->v[vol_index]->sweep[isweep] == NULL) {
54 radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
56 if (wsr88d_ray.ray_hdr.dbptr_sw > 0) {
57 vol_index = wsr88d_get_vol_index(wsr88d_ray.sw->data_hdr.dataname);
59 - case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
60 - case VR_INDEX: f = VR_F; invf = VR_INVF; break;
61 - case SW_INDEX: f = SW_F; invf = SW_INVF; break;
62 - default: f = DZ_F; invf = DZ_INVF; break;
63 + case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
64 + case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
65 + case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
66 + default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
68 if (radar->v[vol_index] == NULL) {
69 radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
70 radar->v[vol_index]->h.f = f;
71 radar->v[vol_index]->h.invf = invf;
72 + radar->v[vol_index]->h.type_str = type_str;
74 if (radar->v[vol_index]->sweep[isweep] == NULL) {
75 radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);