Changeset 25046 for trunk/psModules/src/concepts/pmConcepts.c

Timestamp:

Aug 10, 2009, 5:03:08 PM (17 years ago)

Author:

Paul Price

Message:

Don't use VARFACTOR any more --- covariance matrix takes care of this.

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -377 +377 @@
         conceptRegisterS32("CELL.XWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
         conceptRegisterS32("CELL.YWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, NULL, true, PM_FPA_LEVEL_CELL);
-        conceptRegisterF32("CELL.VARFACTOR", "Variance factor for conversion from large to small scales", NULL, NULL, NULL, true, PM_FPA_LEVEL_CELL);
 
         // CELL.TRIMSEC
@@ -485 +484 @@
         concept[length - 1] = '\0';
 
-        // special variants:
-        if (!strcmp(concept, "FPA.DATE")) {
-          psTime *fpaTime = psMetadataLookupPtr(NULL, fpa->concepts, "FPA.TIME");
-          if (!fpaTime) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Missing concept FPA.TIME needed for FPA.DATE");
-            psFree(string);
-            return NULL;
-          }
-          psString dateTimeString = psTimeToISO(fpaTime); // String representation
-          psList *dateTime = psStringSplit(dateTimeString, "T", true);
-          psFree(dateTimeString);
-          psString dateString = psMemIncrRefCounter(psListGet(dateTime, PS_LIST_HEAD)); // The date string
-          psFree (dateTime);
-
-          if (!psStringSubstitute(&string, dateString, "{FPA.DATE}")) {
-              psError(PS_ERR_UNKNOWN, false, "Unable to replace concept %s", concept);
-              psFree(string); 
-              psFree(dateString);
-              return NULL; 
-          }
-          psFree (dateString);
-          continue;
-        }
+        // special variants:
+        if (!strcmp(concept, "FPA.DATE")) {
+          psTime *fpaTime = psMetadataLookupPtr(NULL, fpa->concepts, "FPA.TIME");
+          if (!fpaTime) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Missing concept FPA.TIME needed for FPA.DATE");
+            psFree(string);
+            return NULL;
+          }
+          psString dateTimeString = psTimeToISO(fpaTime); // String representation
+          psList *dateTime = psStringSplit(dateTimeString, "T", true);
+          psFree(dateTimeString);
+          psString dateString = psMemIncrRefCounter(psListGet(dateTime, PS_LIST_HEAD)); // The date string
+          psFree (dateTime);
+
+          if (!psStringSubstitute(&string, dateString, "{FPA.DATE}")) {
+              psError(PS_ERR_UNKNOWN, false, "Unable to replace concept %s", concept);
+              psFree(string);
+              psFree(dateString);
+              return NULL;
+          }
+          psFree (dateString);
+          continue;
+        }
 
         psTrace("psModules.concepts", 7, "Interpolating concept %s", concept);