Bladeren bron

i.modis.qc: comment unproductive flag checking for MOD09CMG (trunk, https://trac.osgeo.org/grass/changeset/62503)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@62504 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 jaren geleden
bovenliggende
commit
d7c75172dc
2 gewijzigde bestanden met toevoegingen van 14 en 6 verwijderingen
  1. 12 4
      imagery/i.modis.qc/main.c
  2. 2 2
      imagery/i.modis.qc/mod09CMGa.c

+ 12 - 4
imagery/i.modis.qc/main.c

@@ -346,14 +346,22 @@ int main(int argc, char *argv[])
     }
     }
     
     
     /*mod09A1 stateqa or mod09CMG stateqa*/
     /*mod09A1 stateqa or mod09CMG stateqa*/
-    if ((strcmp(qcflag, "cirrus_detected") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+/* - What is this block for?
+    G_debug(1, "qcflag: %s - product %s", qcflag, product);
+    if ((strcmp(qcflag, "cloud_state") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "cloud_shadow") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "cloud_shadow") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
-	(strcmp(qcflag, "cloud_state") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
-	(strcmp(qcflag, "internal_cloud_algorithm") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) ))||
+	(strcmp(qcflag, "land_water") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "aerosol_quantity") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "cirrus_detected") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "internal_cloud_algorithm") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "internal_fire_algorithm") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "internal_fire_algorithm") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "internal_snow_mask") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
 	(strcmp(qcflag, "internal_snow_mask") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
-	(strcmp(qcflag, "mod35_snow_ice") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )))
+	(strcmp(qcflag, "mod35_snow_ice") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "pixel_is_adjacent_to_cloud") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "BRDF_correction_performed") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) ||
+	(strcmp(qcflag, "internal_snow_mask") && ( !(strcmp(product, "mod09A1s")) || !(strcmp(product, "mod09CMGs")) )) )
 	G_fatal_error(_("This bit flag is only available for MOD09A1s @ 500m or MOD09CMG @ 5000m products"));
 	G_fatal_error(_("This bit flag is only available for MOD09A1s @ 500m or MOD09CMG @ 5000m products"));
+*/
 
 
     /*mod09CMG*/
     /*mod09CMG*/
     if ((strcmp(qcflag, "icm_cloudy") && !(strcmp(product, "mod09CMGi"))) ||
     if ((strcmp(qcflag, "icm_cloudy") && !(strcmp(product, "mod09CMGi"))) ||

+ 2 - 2
imagery/i.modis.qc/mod09CMGa.c

@@ -1,8 +1,8 @@
 /* MODLAND QA Bits 500m long int bits[0-1]
 /* MODLAND QA Bits 500m long int bits[0-1]
  * 00 -> class 0: Corrected product produced at ideal quality -- all bands
  * 00 -> class 0: Corrected product produced at ideal quality -- all bands
- * 01 -> class 1: Corrected product produced at less than idel quality -- some or all bands
+ * 01 -> class 1: Corrected product produced at less than ideal quality -- some or all bands
  * 10 -> class 2: Corrected product NOT produced due to cloud effect -- all bands
  * 10 -> class 2: Corrected product NOT produced due to cloud effect -- all bands
- * 11 -> class 3: Corrected product NOT produced due to other reasons -- some or all bands mayb be fill value (Note that a value of [11] overrides a value of [01])
+ * 11 -> class 3: Corrected product NOT produced due to other reasons -- some or all bands maybe fill value (Note that a value of [11] overrides a value of [01])
  */  
  */  
 
 
 #include <grass/raster.h>
 #include <grass/raster.h>