X-Git-Url: http://pileus.org/git/?p=~andy%2Frsl;a=blobdiff_plain;f=nsig.h;h=b742ae73f104f67cdee2541c72a56fa60d6337e4;hp=63e44a51e6b1f692d9fc76eae801748b834402bb;hb=3160d8126d66792a65d592019880db8b4e734e84;hpb=012916676d26251849e408aaf574458e196df2c4

diff --git a/nsig.h b/nsig.h
index 63e44a5..b742ae7 100644
--- a/nsig.h
+++ b/nsig.h
@@ -22,10 +22,26 @@
 #define NSIG_DTB_VEL       3 
 #define NSIG_DTB_WID       4
 #define NSIG_DTB_ZDR       5
+#define NSIG_DTB_UCR2      8
+#define NSIG_DTB_CR2       9
+#define NSIG_DTB_VEL2     10
+#define NSIG_DTB_WID2     11
+#define NSIG_DTB_ZDR2     12
 #define NSIG_DTB_KDP      14
+#define NSIG_DTB_KDP2     15
 #define NSIG_DTB_PHIDP    16
+#define NSIG_DTB_VELC     17 
 #define NSIG_DTB_SQI      18
 #define NSIG_DTB_RHOHV    19
+#define NSIG_DTB_RHOHV2   20
+#define NSIG_DTB_DBZ2     21
+#define NSIG_DTB_VELC2    22
+#define NSIG_DTB_SQI2     23
+#define NSIG_DTB_PHIDP2   24
+#define NSIG_DTB_HCLASS   55
+#define NSIG_DTB_HCLASS2  56
+#define NSIG_DTB_ZDRC     57
+#define NSIG_DTB_ZDRC2    58
 
 /* Product type code ,value for byte 12 in product configuration 
  * struct, III-35
@@ -376,7 +392,7 @@ typedef struct {
    * Used for warning, shearline, and track only */
   twob iresults_count;
 
-#define PROD_END_PAD (20)
+#define PROD_END_PAD 20
   char ipad_end[PROD_END_PAD];
 #else
   char  color_unscan;      /* Color used for unscanned area. */
@@ -597,18 +613,50 @@ typedef struct {
 /*============================================================*/
 /*============================================================*/
 
+#ifdef NSIG_VER2
+typedef struct {
+  twob low_prf; /* Hertz */
+  twob low_prf_frac; /* Fraction part, scaled by 2**-16 */
+  twob low_prf_sample_size;
+  twob low_prf_range_averaging; /* In bins */
+  twob thresh_refl_unfolding; /* Threshold for reflectivity unfolding in 1/100 dB */
+  twob thresh_vel_unfolding; /* Threshold for velocity unfolding in 1/100 dB */
+  twob thresh_sw_unfolding; /* Threshold for width unfolding in 1/100 dB */
+  char spare[18];
+} NSIG_Task_dsp_mode_batch;
+#endif
+/*============================================================*/
+/*============================================================*/
+
+#ifdef NSIG_VER2
+typedef struct {
+  fourb mask_word_0;
+  fourb ext_hdr_type;
+  fourb mask_word_1;
+  fourb mask_word_2;
+  fourb mask_word_3;
+  fourb mask_word_4;
+} NSIG_Dsp_data_mask;
+#endif
+/*============================================================*/
+/*============================================================*/
+
 
 /* Task dsp info 3.3.2.2, page III-22 */
 typedef struct {
 #ifdef NSIG_VER2
   twob   dsp_num;
   fourb   dsp_type;
+  NSIG_Dsp_data_mask  data_mask_cur;
+  NSIG_Dsp_data_mask  data_mask_orig;
+  NSIG_Task_dsp_mode_batch task_dsp_mode;
+  char spare[52];
 #else
   twob   dsp_num;
   twob   dsp_type;
-#endif
   fourb  data_mask;
   fourb  aux_data_def[32];
+#endif
   fourb  prf;
   fourb  pwid;
   twob   prf_mode;
@@ -625,8 +673,14 @@ typedef struct {
 #endif
   twob   atten_gain;
 #ifdef NSIG_VER2
-  twob igas_atten ;		/* 100000 * db/km */
-#define TASK_DSP_INFO_PAD (148)
+  twob  igas_atten;		/* 100000 * db/km */
+  twob  clutter_map_flag;
+  twob  xmt_phase_seq;
+  fourb ray_hdr_mask;
+  twob  time_series_playback;
+  twob  spare2;
+  char  custom_ray_hdr_name[16];
+#define TASK_DSP_INFO_PAD 120
   char ipad_end[TASK_DSP_INFO_PAD];
 #else
   char   spare[150];