Changeset 11144

Timestamp:

Jan 18, 2007, 3:19:34 PM (19 years ago)

Author:

Paul Price

Message:

Removing pmConceptsFilterIDfromConcept, which is obsolete now that FPA.FILTER is interpolated on read.

Location:

trunk/psModules/src

Files:

• camera/pmFPAfile.c (modified) (1 diff)
• camera/pmFPAfileDefine.c (modified) (1 diff)
• concepts/pmConceptsPhotcode.c (modified) (1 diff)
• concepts/pmConceptsPhotcode.h (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -252 +252 @@
         }
     }
-    if (strstr (newName, "{FILTER.ID}") != NULL) {
-        if (file->fpa != NULL) {
-            char *filterID = pmConceptsFilterIDfromConcept ("FPA.FILTER", file->fpa->concepts, file->camera);
-            if (filterID && *filterID) {
-                psStringSubstitute(&newName, filterID, "{FILTER.ID}");
-            }
-        }
-    }
     return newName;
 }

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -700 +700 @@
         }
 
+        // XXX: 'function' unncesssary now that it's not required for filter?
         if (!strcasecmp (option, "filter")) {
-            options->filter = NULL;
-            if (function) {
-                if (!strcasecmp (function, "FILTER.ID")) {
-                    options->filter = pmConceptsFilterIDfromConcept (concept, input->concepts, config->camera);
-                }
-            } else {
-                options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
-            }
-            if (options->filter == NULL)
+            if (function)
+                psAbort ("psModules", "no detrend constraint function for filter");
+            options->filter = psMetadataLookupPtr (&status, input->concepts, concept);
+            if (!status)
                 psAbort ("psModules", "failed to find filter");
 

trunk/psModules/src/concepts/pmConceptsPhotcode.c

@@ -40 +40 @@
     return photcode;
 }
-
-char *pmConceptsFilterIDfromConcept (char *concept, psMetadata *concepts, psMetadata *camera)
-{
-
-    bool status;
-
-    char *filterName = psMetadataLookupStr (&status, concepts, concept);
-    if (!status)
-        psAbort ("psModules", "missing concept %s", concept);
-    psMetadata *filterTable = psMetadataLookupPtr (&status, camera, "FILTER.ID");
-    if (!status)
-        psAbort ("ppImage", "missing FILTER.ID table");
-    char *filter = psMetadataLookupStr (&status, filterTable, filterName);
-    if (!status)
-        psAbort ("ppImage", "FILTER %s not found in FILTER.ID table", filterName);
-
-    return filter;
-}
-

trunk/psModules/src/concepts/pmConceptsPhotcode.h

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-01-15 21:59:31 $
+/// @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-01-19 01:19:34 $
 ///
 /// Copyright 2005-2006 Institute for Astronomy, University of Hawaii
@@ -27 +27 @@
 /// the PHASE2 recipe.  Interpolation using the usual syntax (e.g., "{CHIP.NAME}") is permitted.
 psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, pmFPAview *view);
-char *pmConceptsFilterIDfromConcept (char *concept, psMetadata *concepts, psMetadata *camera);
 
 # endif