Skip to content
Snippets Groups Projects
Select Git revision
  • main default protected
1 result
Blame Permalink
revised_nagg.patch 72.35 KiB 
diff --git a/src/nagg.h b/src/nagg.h
index cc40e3d..aaaf194 100644
--- a/src/nagg.h
+++ b/src/nagg.h
@@ -51,10 +51,11 @@
 #define NAGG_GRANVER_size       15	/* Granule version info size */
 #define NAGG_DATE_size     	 8	/* Granule date info size */
 #define NAGG_TIME_size     	14	/* Granule time info size */
+#define NAGG_PSN_size		 4      /* Granule platform short name (spacecraft) size */
 #define NAGG_Granule_info_max	20000	/* Max number of granules managed */
 #define NAGG_Product_list_max	42	/* Max number of products requested */
 #define NAGG_outputfiles_max	42	/* Max number of output file names */
-#define NPP_Product_max        123	/* Max number of NPP Products */
+#define NPP_Product_max        124	/* Max number of NPP Products */ /* add fs cris */
 #define NPP_Geo_Location_max	20	/* Max number of NPP Geolocations products */
 #define NPP_EQ_GEO_Products_max  3      /* Max number of GEO products with terrain corrected equivalents */
 #define NAGG_Granules_selected_max 20000 /* Max number of granules selected */
@@ -154,11 +155,12 @@ struct granule_t {
 						     */
     iet_t   granule_start_time_IET;        	    /*granule start time. micro-sec since 1958 jan 1. */
     iet_t   granule_end_time_IET;          	    /*granule end time */
-    char    beginning_date[NAGG_DATE_size+1];  /*granule beginning date */
-    char    beginning_time[NAGG_TIME_size+1];  /*granule beginning time */
-    char    ending_time[NAGG_TIME_size+1];     /*granule ending time */
+    char    beginning_date[NAGG_DATE_size+1];       /*granule beginning date */
+    char    beginning_time[NAGG_TIME_size+1];       /*granule beginning time */
+    char    ending_time[NAGG_TIME_size+1];          /*granule ending time */
     uint64_t    orbit_number;			    /*orbit number */
     const char	*geofile;			    /*geolocation filename */
+    char    platform_sname[NAGG_PSN_size+1];        /*platform short name (spacecraft) */
     const char	*file_in;       		    /*file in which the granule is */
 };
 
@@ -183,7 +185,7 @@ struct nppfileinfo_t {
     int	 nproduct_id;			/* number of products in the file */
     char product_id_list[DPID_NUM_MAX][DPID_size];
     char geolocation_id[DPID_size];
-    char *spacecraft;
+    char spacecraft[NAGG_PSN_size+1];
     char *Start_date;
     char Start_time[Data_time_size];
     char Stop_time[Data_time_size];
diff --git a/src/nagg_get_granules.c b/src/nagg_get_granules.c
index dbd687a..4584f10 100644
--- a/src/nagg_get_granules.c
+++ b/src/nagg_get_granules.c
@@ -32,6 +32,7 @@ typedef struct {
     int granule_input_index;
     hid_t grpid;
     char *geofile;
+    char platform_sname[NAGG_PSN_size+1];
     granule_t **granArr;
     /* number of granules added to the granule table */
     int gran_num;
@@ -45,9 +46,10 @@ static int g_gran_num;
 static int process_input_files(char **file_list, int number_of_files,
                char **products_list, int nproducts, geolocation_t geofiles_arg,
                char *geoproduct, char **geofile_list, int *geo_file_number,
-               granule_p_t *granule_info_p, unsigned long max_granules);
+               granule_p_t granule_info_p, unsigned long max_granules);
 static int get_geofile_refs(char *geoproduct, char *geofile_buf, 
                             geolocation_t geofiles_arg, hid_t file, GranF_data *grp_dat_p);
+
 static int get_input_file_granules(hid_t grp, char **products_list, int nproducts, 
                                    int *nproducts_found, GranF_data *grp_dat_p); 
 static int get_input_file_geo_granules(hid_t grp, char *geoproduct, GranF_data *grp_dat_p);
@@ -55,6 +57,7 @@ void add_file_to_geofile_list(int addpath, char *geofilepath, int *geo_file_numb
                               char **geofile_list, GranF_data *grp_dat_p);
 static int check_products_found(char **products_list, int nproducts, char *geoproduct); 
 static int get_n_geo_ref_value(hid_t file, char *geofile_buf);
+static int get_platform_value(hid_t file, char *platform_buf);
 static int get_group_granules (hid_t loc_id, const char *name, void *operator_data);
 static int get_granule_info (hid_t loc_id, const char *name, void *operator_data);
 static int get_string_attribute_value(hid_t loc_id, const char * dsetname, 
@@ -351,7 +354,7 @@ static int
 process_input_files(char **file_list, int number_of_files,
     char **products_list, int nproducts, geolocation_t geofiles_arg,
     char *geoproduct, char **geofile_list, int *geo_file_number,
-    granule_p_t *granule_info_p, unsigned long max_granules) 
+    granule_p_t granule_info_p, unsigned long max_granules)
 {
     int status = SUCCEED;
     int i, j;
@@ -360,6 +363,7 @@ process_input_files(char **file_list, int number_of_files,
     hid_t subgrp = -1;  /* File and group identifiers */
     char *geofilepath = NULL;
     char *geofile_buf = NULL;
+    char *platform_buf=NULL;
     htri_t retval;
     char *pos = NULL;
     int nproducts_found = 0;
@@ -435,7 +439,17 @@ process_input_files(char **file_list, int number_of_files,
             NAGG_ERROR("process_input_files(): Failed to get geofile reference from product file.\n");
             goto done; 
         }
- 
+
+        /*
+         * get the 3 character spacecraft code from the input file's 
+         * Platform_Short_Name attribute. The attribute should always exist
+         * so it's an error if it's missing.
+         */
+        if ((status = get_platform_value(file, grp_dat.platform_sname)) < 0) {
+            NAGG_ERROR("process_input_files(): Failed to get platform reference from product file.\n");
+            goto done;
+        }
+        
         /* for debugging, add all granules.  This will add all product
            and geoproduct granules in the input file as well as in the GEO files*/
         if(get_option_debug) {
@@ -918,6 +932,51 @@ done:
 }
 
 /*-------------------------------------------------------------------------
+ * Function:   get_platform_value
+ *
+ * Purpose:    get 3 character spacecraft ID code from Platform_Short_Name
+ *             attribute in input file
+ *
+ * Parameters:
+ *    file:          IN: id of file containing Platform_Short_Name attribute
+ *    platform_buf:  IN-OUT: buffer to return value
+ *
+ * Return:     0 if successful, -1 otherwise
+ *-------------------------------------------------------------------------
+ */
+static int
+get_platform_value(hid_t file, char *platform_buf)
+{
+    int status = SUCCEED;
+    hid_t   attr;
+    hid_t   atype, atype_mem;    /* Attribute type */
+    H5T_class_t  type_class;
+
+    if((attr = H5Aopen(file, "Platform_Short_Name", H5P_DEFAULT)) < 0) {
+        fprintf(stderr, "Failed to open attribute /Platform_Short_Name.\n");
+        status = FAIL;
+        goto done;
+    } else if(( atype = H5Aget_type(attr))< 0) {
+        fprintf(stderr, "Failed to get type for attribute /Platform_Short_Name.\n");
+        status = FAIL;
+    } else if((type_class = H5Tget_class(atype)) < 0) {
+        fprintf(stderr, "Failed to get type class for attribute /Platform_Short_Name.\n");
+        status = FAIL;
+    } else if ((atype_mem = H5Tget_native_type(atype, H5T_DIR_ASCEND)) < 0) {
+        fprintf(stderr, "Failed to get type class for attribute /Platform_Short_Name.\n");
+        status = FAIL;
+    } else if ((status  = H5Aread(attr, atype_mem, platform_buf)) < 0) {
+        fprintf(stderr, "Failed to read attribute /Platform_Short_Name.\n");
+        status = FAIL;
+    }
+
+    status = H5Aclose(attr);
+done:
+    return status;
+}
+
+
+/*-------------------------------------------------------------------------
  * Function:   get_last_created_geofile
  *
  * Purpose:    Get the filename with the latest creation time from multiple 
@@ -1304,6 +1363,16 @@ get_geo_granules(hid_t file, char *geofile, char *geoproduct,
     GranF_data grp_dat;
 
     /*
+     * get the 3 character spacecraft code from the input file's 
+     * N_Platform_Short_Name attribute. The attribute should always exist
+     * so it's an error if it's missing.
+     */
+    if ((status = get_platform_value(file, grp_dat.platform_sname)) < 0) {
+        NAGG_ERROR("get_geo_granules(): Failed to get platform reference from product file.\n");
+        goto done;
+    }
+        
+    /*
      * Open each subgroup of /Data_Products, get attributes of each Gran_n dataset
      * and add each granule to the list.
      */
@@ -1505,8 +1574,14 @@ static int get_group_granules (hid_t loc_id, const char *name, void *operator_da
              * the path is relative or absolute in the case of the testfiles
              * depends on which was used for configure.  Using just the file
              * name so make check will not fail. 
+             * Advance pointer to character after '/' if it is found, otherwise
+             * set it to granf_dat->filepath to print the filename.
              */
-            pos = 1 + strrchr(granf_dat->filepath, '/');
+            if (pos = strrchr(granf_dat->filepath, '/'))
+                pos +=1;
+            else
+                pos = granf_dat->filepath;
+
             NAGG_ERROR("get_group_granules():  The /Data_Products/");            
             fprintf(stderr, "%s group in the file %s has fewer than the %d granules claimed in its %s/AggregateNumberGranules attribute.\n", name, pos, aggr_num_granules, aggrName);
             goto done;
@@ -1564,7 +1639,7 @@ get_granule_info (hid_t loc_id, const char *name, void *operator_data)
 	status = FAIL;
 	goto done;
     }
-    granf_dat->granArr[g_gran_num] = (granule_t *)HDmalloc(sizeof(granule_t));
+    granf_dat->granArr[g_gran_num] = (granule_t *)HDcalloc(1, sizeof(granule_t));
     if (granf_dat->granArr[g_gran_num] == NULL) {
         fprintf(stderr, "Error allocating memory for granule_info_array[%d].\n", g_gran_num);
         status = FAIL;
@@ -1604,6 +1679,9 @@ get_granule_info (hid_t loc_id, const char *name, void *operator_data)
         }
     }
 
+    HDstrncpy(granf_dat->granArr[g_gran_num]->platform_sname,
+              granf_dat->platform_sname, NAGG_PSN_size+1);
+
     if((status = get_string_attribute_value(dset, name, "N_Granule_Version",
         granf_dat->granArr[g_gran_num]->granule_version, H5P_DEFAULT)) < 0)
        goto done;
@@ -1761,12 +1839,12 @@ nagg_print_granules(granule_t *granArr[], int number_of_granules)
 
     /* print header first time only. */
     printf("Printing Granules Read\n");
-    printf("Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Filename, Geo Filename\n");
+    printf("Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Platform Short Name, Filename, Geo Filename\n");
     }
 
     for(i = 0; i<number_of_granules; ++i) {
 
-        printf("%s, %s, %s, %d, %s, %d, %llu, %llu, %s, %s, %s, %llu, %s, %s\n",
+        printf("%s, %s, %s, %d, %s, %d, %llu, %llu, %s, %s, %s, %llu, %s, %s, %s\n",
            granArr[i]->granule_id,
            granArr[i]->product_id,
            granArr[i]->product_name,
@@ -1779,6 +1857,7 @@ nagg_print_granules(granule_t *granArr[], int number_of_granules)
            granArr[i]->beginning_time,
            granArr[i]->ending_time,
            granArr[i]->orbit_number,
+           granArr[i]->platform_sname,
            granArr[i]->file_in,
            stringval(granArr[i]->geofile));
 
diff --git a/src/nagg_main.c b/src/nagg_main.c
index df5f9ab..e0a63e1 100644
--- a/src/nagg_main.c
+++ b/src/nagg_main.c
@@ -83,9 +83,9 @@ nagg_report(const char *outfile, int ngranules)
 int
 main(int argc, char * const argv[]){
     granule_p_t granule_info;
-    granule_p_t *sensor_p;		/* sensor data granule */
-    granule_p_t *geo_p;			/* Geolocation granule */
-    granule_p_t *next_p;		/* Next granule in granule table*/
+    granule_p_t sensor_p;		/* sensor data granule */
+    granule_p_t geo_p;			/* Geolocation granule */
+    granule_p_t next_p;		/* Next granule in granule table*/
     granule_p_t *granules_selected;
     					/* selected granules to be written */
     int		total_granules_file;	/* total granules per file */
@@ -103,6 +103,9 @@ main(int argc, char * const argv[]){
     char       *max_granules_ptr;
     unsigned long max_granules_info;
     unsigned long max_granules_selected;
+    const char *spcrft="j01";
+
+    spcrft=getenv("CRAFT");
 
     max_granules_ptr = getenv("NAGG_MAX_GRANULES");
     if (max_granules_ptr) {
@@ -113,7 +116,7 @@ main(int argc, char * const argv[]){
         max_granules_selected = NAGG_Granules_selected_max;
     }
     granule_info_array = (granule_t *)HDcalloc(max_granules_info, sizeof(granule_t *));
-    granules_selected = (granule_t *)HDcalloc(max_granules_selected, sizeof(granule_t *));
+    granules_selected = (granule_t **)HDcalloc(max_granules_selected, sizeof(granule_t *));
     /* initialization */
     granule_info = granule_info_array;
     /* initialization */
@@ -191,7 +194,7 @@ main(int argc, char * const argv[]){
     /*=============================*/
     /* sort the granules info list */
     /*=============================*/
-    nagg_sort_granules(granule_info, number_of_granules);
+    nagg_sort_granules(granule_info_array, number_of_granules);
 #ifdef DEBUG
     printf("After return from nagg_sort_granules, dumping granule_info:\n");
     printf("number_of_granules=%d\n", number_of_granules);
diff --git a/src/nagg_product.c b/src/nagg_product.c
index 1401e6e..d3ebbc4 100644
--- a/src/nagg_product.c
+++ b/src/nagg_product.c
@@ -56,6 +56,7 @@ nppproduct_t product_table[NPP_Product_max] =
 "SATMR",        "ATMS-REMAP-SDR",        		31997000,	"GATRO",
 "SATMS",        "ATMS-SDR",                        	31997000, 	"GATMO",
 "SCRIS",        "CrIS-SDR",                             31997000, 	"GCRSO",
+"SCRIF",        "CrIS-FS-SDR",                          31997000,       "GCRSO",
 "SOMPS",        "OMPS-NP-SDR",                	        37405000, 	"GONPO",
 "SOMTC",        "OMPS-TC-SDR",                 	        37405000, 	"GOTCO",
 "SOMSC",        "OMPS-TC-Cal-SDR",     		        2700000000ULL, 	"GOSCO",
diff --git a/src/nagg_select_granules.c b/src/nagg_select_granules.c
index 9b8f3c8..a7d60c9 100644
--- a/src/nagg_select_granules.c
+++ b/src/nagg_select_granules.c
@@ -121,7 +121,7 @@ static int add_tmp_granule(granule_p_t granule_info_p[], int number_of_granules,
 
     oldp = granule_info_p[number_of_granules-1];
 
-    if (NULL==(newp=(granule_p_t)HDmalloc(sizeof(granule_t)))){
+    if (NULL==(newp=(granule_p_t)HDcalloc(1, sizeof(granule_t)))){
 	NAGG_ERROR("add_tmp_granule(): malloc failed\n");
 	return(FAIL);
     };
@@ -343,7 +343,7 @@ compose_output_fname(granule_p_t selected_granules[], int number_of_granules,
     granule_p_t	firstgranule_p=NULL, lastgranule_p;
     char   buf[64];
     const char *const_pt;
-    int    i;
+    int    i, j = 0;
     int	   total_products;	/* Sensor plus possible Geolocation */
     int	   noutfiles=0;		/* number of output file names generated. */
     int	   ret_code=SUCCEED;
@@ -397,7 +397,10 @@ compose_output_fname(granule_p_t selected_granules[], int number_of_granules,
 
     /* Gather information to generate the Tail. */
     /* get spacecraft from 1st granule */
-    newfile.spacecraft = "npp"; /*not available now. set to "npp" */
+    do {
+        newfile.spacecraft[j] = tolower(firstgranule_p->platform_sname[j]);
+    } while (j++ < NAGG_PSN_size);
+    newfile.spacecraft[j] = 0;
 
     /* get Start_date, Start_time and orbilastgranule_p number from 1st granule.
      * Format of time in granules is: HHMMSS.ssssssZ.
@@ -418,7 +421,7 @@ compose_output_fname(granule_p_t selected_granules[], int number_of_granules,
     /* get Stop_time from last granule for this file */
     HDcpyFileTimeFromGranTime(newfile.Stop_time, lastgranule_p->ending_time);
 
-    /* CalculaTe Creation_date (current date/time in UTC)*/
+    /* Calculate Creation_date (current date/time in UTC)*/
     {
 	struct  timeval now;
 	struct  tm	*tm;
@@ -430,7 +433,7 @@ compose_output_fname(granule_p_t selected_granules[], int number_of_granules,
 	    goto done;
 	}
 	/* user %06ld for tv_usec which is a long */
-	sprintf(buf, "%04d%02d%02d%02d%02d%02d%06ld",
+	snprintf(buf, Creation_date_size + 1, "%04d%02d%02d%02d%02d%02d%06ld",
 	    1900+tm->tm_year, 1+tm->tm_mon, tm->tm_mday,
 	    tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec);
 	HDmemcpy(newfile.Creation_date, buf, Creation_date_size);
diff --git a/test/testfiles/redro1-dump.txt b/test/testfiles/redro1-dump.txt
index b6bb778..0db4f68 100644
--- a/test/testfiles/redro1-dump.txt
+++ b/test/testfiles/redro1-dump.txt
@@ -15,36 +15,36 @@ Produced   1 granules in GCRIO-REDRO_npp_d20030125_t0709519_e0710217_b00014_cYYY
 Produced   1 granules in GCRIO-REDRO_npp_d20030125_t0710239_e0710537_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Produced   1 granules in GCRIO-REDRO_npp_d20030125_t0710559_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Printing Granules Read
-Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Filename, Geo Filename
-NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703253_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703253_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014043, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, GCRIO-REDRO_npp_d20030125_t0703253_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, GCRIO-REDRO_npp_d20030125_t0703253_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0704292_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0704292_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014682, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, GCRIO-REDRO_npp_d20030125_t0704292_e0705012_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, GCRIO-REDRO_npp_d20030125_t0704292_e0705012_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015002, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, GCRIO-REDRO_npp_d20030125_t0705012_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, GCRIO-REDRO_npp_d20030125_t0705012_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0706057_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0706057_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015642, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0706079_e0706377_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0706079_e0706377_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015962, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0706399_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0706399_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0707417_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0707417_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016602, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707439_e0708137_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707439_e0708137_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016922, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708159_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708159_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0709177_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0709177_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017562, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0709199_e0709497_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0709199_e0709497_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017882, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0709519_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0709519_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0710537_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0710537_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018522, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710559_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710559_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Platform Short Name, Filename, Geo Filename
+NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703253_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703253_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014043, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703253_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703253_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0704292_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0704292_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014682, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0704292_e0705012_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0704292_e0705012_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015002, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0705012_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0705012_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0706057_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0706057_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015642, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0706079_e0706377_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0706079_e0706377_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015962, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0706399_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0706399_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0707417_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0707417_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016602, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707439_e0708137_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707439_e0708137_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016922, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708159_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708159_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0709177_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0709177_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017562, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0709199_e0709497_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0709199_e0709497_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017882, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0709519_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0709519_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0710537_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0710537_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018522, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710559_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710559_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
diff --git a/test/testfiles/redro3-dump.txt b/test/testfiles/redro3-dump.txt
index 6e5e560..b0e97f4 100644
--- a/test/testfiles/redro3-dump.txt
+++ b/test/testfiles/redro3-dump.txt
@@ -5,36 +5,36 @@ Produced   3 granules in GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYY
 Produced   3 granules in GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Produced   2 granules in GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Printing Granules Read
-Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Filename, Geo Filename
-NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014043, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014682, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015002, REDRO, CrIMSS-EDR, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015642, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015962, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016602, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016922, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017562, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017882, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018522, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Platform Short Name, Filename, Geo Filename
+NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014043, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014682, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015002, REDRO, CrIMSS-EDR, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, GCRIO-REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015642, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015962, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016602, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016922, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017562, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017882, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018522, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, GCRIO-REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
diff --git a/test/testfiles/redro3S-dump.txt b/test/testfiles/redro3S-dump.txt
index 512fa6c..b25c0a8 100644
--- a/test/testfiles/redro3S-dump.txt
+++ b/test/testfiles/redro3S-dump.txt
@@ -11,36 +11,36 @@ Produced   3 granules in GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDH
 Produced   2 granules in REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Produced   2 granules in GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Printing Granules Read
-Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Filename, Geo Filename
-NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212014043, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212014682, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212015002, REDRO, CrIMSS-EDR, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212015642, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212015962, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212016602, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212016922, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212017562, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212017882, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212018522, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
-NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Platform Short Name, Filename, Geo Filename
+NPP001212013723, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212014043, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, REDRO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212013723, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169405306000, 1422169437303000, 20030125, 070253.306000Z, 070325.303000Z, 993, NPP, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014043, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169437303000, 1422169469300000, 20030125, 070325.303000Z, 070357.300000Z, 993, NPP, GCRIO_npp_d20030125_t0702533_e0703573_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014363, REDRO, CrIMSS-EDR, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212014682, REDRO, CrIMSS-EDR, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212015002, REDRO, CrIMSS-EDR, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, REDRO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212014363, GCRIO, CrIMSS-EDR-GEO-TC, 0, N/A, -1, 1422169469300000, 1422169501297000, 20030125, 070357.300000Z, 070429.297000Z, 993, NPP, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212014682, GCRIO, CrIMSS-EDR-GEO-TC, 1, N/A, -1, 1422169501297000, 1422169533294000, 20030125, 070429.297000Z, 070501.294000Z, 993, NPP, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015002, GCRIO, CrIMSS-EDR-GEO-TC, 2, N/A, -1, 1422169533294000, 1422169565291000, 20030125, 070501.294000Z, 070533.291000Z, 993, NPP, GCRIO_npp_d20030125_t0703573_e0705332_b00993_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015322, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212015642, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212015962, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, REDRO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212015322, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169567941156, 1422169597741156, 20030125, 070535.941156Z, 070605.741156Z, 14, NPP, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015642, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169599941156, 1422169629741156, 20030125, 070607.941156Z, 070637.741156Z, 14, NPP, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212015962, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169631941156, 1422169661741156, 20030125, 070639.941156Z, 070709.741156Z, 14, NPP, GCRIO_npp_d20030125_t0705359_e0707097_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016282, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212016602, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212016922, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, REDRO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212016282, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169663941156, 1422169693741156, 20030125, 070711.941156Z, 070741.741156Z, 14, NPP, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016602, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169695941156, 1422169725741156, 20030125, 070743.941156Z, 070813.741156Z, 14, NPP, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212016922, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169727941156, 1422169757741156, 20030125, 070815.941156Z, 070845.741156Z, 14, NPP, GCRIO_npp_d20030125_t0707119_e0708457_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017242, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212017562, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212017882, REDRO, CrIMSS-EDR, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, REDRO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212017242, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169759941156, 1422169789741156, 20030125, 070847.941156Z, 070917.741156Z, 14, NPP, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017562, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169791941156, 1422169821741156, 20030125, 070919.941156Z, 070949.741156Z, 14, NPP, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212017882, GCRIO, CrIMSS-EDR-GEO-TC, 2, A1, 1, 1422169823941156, 1422169853741156, 20030125, 070951.941156Z, 071021.741156Z, 14, NPP, GCRIO_npp_d20030125_t0708479_e0710217_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018202, REDRO, CrIMSS-EDR, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212018522, REDRO, CrIMSS-EDR, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, REDRO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
+NPP001212018202, GCRIO, CrIMSS-EDR-GEO-TC, 0, A1, 1, 1422169855941156, 1422169885741156, 20030125, 071023.941156Z, 071053.741156Z, 14, NPP, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP001212018522, GCRIO, CrIMSS-EDR-GEO-TC, 1, A1, 1, 1422169887941156, 1422169917741156, 20030125, 071055.941156Z, 071125.741156Z, 14, NPP, GCRIO_npp_d20030125_t0710239_e0711257_b00014_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
diff --git a/test/testfiles/satms_tatms2m-dump.txt b/test/testfiles/satms_tatms2m-dump.txt
index 5597e87..45f99d3 100644
--- a/test/testfiles/satms_tatms2m-dump.txt
+++ b/test/testfiles/satms_tatms2m-dump.txt
@@ -2,19 +2,19 @@ Produced   2 granules in GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b0225
 Produced   2 granules in GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Produced   1 granules in GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5
 Printing Granules Read
-Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Filename, Geo Filename
-NPP000141695514, SATMS, ATMS-SDR, 0, A1, 1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 2250, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141695834, SATMS, ATMS-SDR, 1, A1, 1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 2250, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141695514, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 2250, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141695834, GATMO, ATMS-SDR-GEO, 1, A1, 1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 2250, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-N/A, TATMS, ATMS-TDR, 0, N/A, -1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 993, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-N/A, TATMS, ATMS-TDR, 1, N/A, -1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 993, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696154, SATMS, ATMS-SDR, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696474, SATMS, ATMS-SDR, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696154, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696474, GATMO, ATMS-SDR-GEO, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696154, TATMS, ATMS-TDR, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696474, TATMS, ATMS-TDR, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696794, SATMS, ATMS-SDR, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696794, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
-NPP000141696794, TATMS, ATMS-TDR, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+Granule ID, DPID, Product Name, Gran Index, Granule Version, Granule Version Number, Granule Start Time IET,Gran End Time IET, Beginning Date, Beginning Time, Ending Time, Beginning Orbit Number, Platform Short Name, Filename, Geo Filename
+NPP000141695514, SATMS, ATMS-SDR, 0, A1, 1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141695834, SATMS, ATMS-SDR, 1, A1, 1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141695514, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141695834, GATMO, ATMS-SDR-GEO, 1, A1, 1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+N/A, TATMS, ATMS-TDR, 0, N/A, -1, 1712188786351413, 1712188817973018, 20120403, 235912.351413Z, 235943.973018Z, 993, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+N/A, TATMS, ATMS-TDR, 1, N/A, -1, 1712188818351406, 1712188849973022, 20120403, 235944.351406Z, 000015.973022Z, 993, NPP, GATMO-SATMS-TATMS_npp_d20120403_t2359123_e0000159_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696154, SATMS, ATMS-SDR, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696474, SATMS, ATMS-SDR, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696154, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696474, GATMO, ATMS-SDR-GEO, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696154, TATMS, ATMS-TDR, 0, A1, 1, 1712188850351402, 1712188881973026, 20120404, 000016.351402Z, 000047.973026Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696474, TATMS, ATMS-TDR, 1, A1, 1, 1712188882351406, 1712188913973014, 20120404, 000048.351406Z, 000119.973014Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0000163_e0001199_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696794, SATMS, ATMS-SDR, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696794, GATMO, ATMS-SDR-GEO, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
+NPP000141696794, TATMS, ATMS-TDR, 0, A1, 1, 1712188914351402, 1712188945973019, 20120404, 000120.351402Z, 000151.973019Z, 2250, NPP, GATMO-SATMS-TATMS_npp_d20120404_t0001203_e0001519_b02250_cYYYYMMDDHHMMSSssssss_XXXX_XXX.h5, (null)
diff --git a/test/testfiles/usage.txt b/test/testfiles/usage.txt
index d711d0e..2e7e400 100644
--- a/test/testfiles/usage.txt
+++ b/test/testfiles/usage.txt
@@ -27,6 +27,7 @@ IICMS     VIIRS-CM-IP-SUB                 	  85350000  GMODO
 SATMR     ATMS-REMAP-SDR                  	  31997000  GATRO
 SATMS     ATMS-SDR                        	  31997000  GATMO
 SCRIS     CrIS-SDR                        	  31997000  GCRSO
+SCRIF     CrIS-FS-SDR                     	  31997000  GCRSO
 SOMPS     OMPS-NP-SDR                     	  37405000  GONPO
 SOMTC     OMPS-TC-SDR                     	  37405000  GOTCO
 SOMSC     OMPS-TC-Cal-SDR                 	2700000000  GOSCO