X-Git-Url: http://pileus.org/git/?p=~andy%2Frsl;a=blobdiff_plain;f=rsl.h;fp=rsl.h;h=41cb299f3348ec337ad48b87daa34b6776f6b4e8;hp=2e326540c36fa9b0f1b1f46b526c889b61707329;hb=01560cc947c59aa600473158dfe26ea0dfaf0823;hpb=da18c5859f2c4b449544ed9c5d2a96a53d43f377

diff --git a/rsl.h b/rsl.h
index 2e32654..41cb299 100644
--- a/rsl.h
+++ b/rsl.h
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#define RSL_VERSION_STR "v1.43"
+#define RSL_VERSION_STR "v1.44"
 
 /**********************************************************************/
 /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
@@ -46,7 +46,7 @@
 /*            so you shouldn't have to modify anything here.          */
 /**********************************************************************/
 #ifndef COLORDIR
-#define COLORDIR "/usr/local/trmm/lib/colors"
+#define COLORDIR "/home/kelley/trmm/lib/colors"
 #endif
 
 /* These are the color table indexes. See RSL_set/get_color_table. */
@@ -402,6 +402,8 @@ typedef struct {
                       *33 = S2_INDEX = Spectrum Width  for VCP 121 second Doppler cut.
                       *34 = V3_INDEX = Radial Velocity for VCP 121 third Doppler cut.
                       *35 = S3_INDEX = Spectrum Width  for VCP 121 third Doppler cut.
+                      *42 = ET_INDEX = Total Power Enhanced (Sigmet)
+                      *43 = EZ_INDEX = Clutter Corr. Reflectivity Enhanced (Sigmet)
                 */
 
 } Radar;
@@ -496,7 +498,7 @@ typedef struct {
  * rsl_qfield by adding a '1' for each new volume index.
  */
 
-#define MAX_RADAR_VOLUMES 42
+#define MAX_RADAR_VOLUMES 44
 
 #define DZ_INDEX 0
 #define VR_INDEX 1
@@ -540,6 +542,8 @@ typedef struct {
 #define SD_INDEX 39
 #define ZZ_INDEX 40
 #define RD_INDEX 41
+#define ET_INDEX 42
+#define EZ_INDEX 43
 
 
 /* Prototypes for functions. */
@@ -851,7 +855,8 @@ static char *RSL_ftype[] = {"DZ", "VR", "SW", "CZ", "ZT", "DR",
                             "TI", "DX", "CH", "AH", "CV", "AV",
                             "SQ", "VS", "VL", "VG", "VT", "NP",
                             "HC", "VC", "V2", "S2", "V3", "S3",
-                            "CR", "CC", "PR", "SD", "ZZ", "RD"};
+                            "CR", "CC", "PR", "SD", "ZZ", "RD",
+                            "ET", "EZ"};
 
 static  float (*RSL_f_list[])(Range x) = {DZ_F, VR_F, SW_F, CZ_F, ZT_F, DR_F,
                                           LR_F, ZD_F, DM_F, RH_F, PH_F, XZ_F,
@@ -859,7 +864,8 @@ static  float (*RSL_f_list[])(Range x) = {DZ_F, VR_F, SW_F, CZ_F, ZT_F, DR_F,
                                           TI_F, DX_F, CH_F, AH_F, CV_F, AV_F,
                                           SQ_F, VS_F, VL_F, VG_F, VT_F, NP_F,
                                           HC_F, VC_F, VR_F, SW_F, VR_F, SW_F,
-                                          DZ_F, CZ_F, PH_F, SD_F, DZ_F, DZ_F};
+                                          DZ_F, CZ_F, PH_F, SD_F, DZ_F, DZ_F,
+                                          ZT_F, DZ_F};
 
 static  Range (*RSL_invf_list[])(float x)
          = {DZ_INVF, VR_INVF, SW_INVF, CZ_INVF, ZT_INVF, DR_INVF, 
@@ -868,7 +874,8 @@ static  Range (*RSL_invf_list[])(float x)
             TI_INVF, DX_INVF, CH_INVF, AH_INVF, CV_INVF, AV_INVF,
             SQ_INVF, VS_INVF, VL_INVF, VG_INVF, VT_INVF, NP_INVF,
             HC_INVF, VC_INVF, VR_INVF, SW_INVF, VR_INVF, SW_INVF,
-            DZ_INVF, CZ_INVF, PH_INVF, SD_INVF, DZ_INVF, DZ_INVF};
+            DZ_INVF, CZ_INVF, PH_INVF, SD_INVF, DZ_INVF, DZ_INVF,
+            ZT_INVF, DZ_INVF};
 #endif
 /* Secret routines that are quite useful and useful to developers. */
 void radar_load_date_time(Radar *radar);
@@ -883,6 +890,13 @@ Hash_table *construct_sweep_hash_table(Sweep *s);
 double       angle_diff(float x, float y);
 int rsl_query_field(char *c_field);
 
+/* Functions for controlling handling of WSR-88D split cuts. */
+void RSL_wsr88d_merge_split_cuts_on();
+void RSL_wsr88d_merge_split_cuts_off();
+void RSL_wsr88d_keep_short_refl();
+int wsr88d_merge_split_cuts_is_set();
+
+Radar *wsr88d_merge_split_cuts(Radar *radar);
 
 /* Debugging prototypes. */
 void poke_around_volume(Volume *v);