Changeset 33070

Timestamp:

Jan 9, 2012, 8:36:11 PM (15 years ago)

Author:

eugene

Message:

working on MODEL_VAR in fit sources linear

File:

• branches/eam_branches/ipp-20111122/psphot/src/psphotFitSourcesLinear.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/psphot/src/psphotFitSourcesLinear.c

@@ -99 +99 @@
     if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
 
-    bool CONSTANT_PHOTOMETRIC_WEIGHTS =
-        psMetadataLookupBool(&status, recipe, "CONSTANT_PHOTOMETRIC_WEIGHTS");
+    pmSourceFitVarMode fitVarMode = PM_SOURCE_PHOTFIT_CONST;
+    char *fitVarModeString = psMetadataLookupStr(&status, recipe, "LINEAR_FIT_VARIANCE_MODE");
     if (!status) {
-        psAbort("You must provide a value for the BOOL recipe CONSTANT_PHOTOMETRIC_WEIGHTS");
-    }
+        bool CONSTANT_PHOTOMETRIC_WEIGHTS = psMetadataLookupBool(&status, recipe, "CONSTANT_PHOTOMETRIC_WEIGHTS");
+        if (!status) {
+            psAbort("You must provide a value for LINEAR_FIT_VARIANCE_MODE or CONSTANT_PHOTOMETRIC_WEIGHTS");
+        }
+        fitVarMode = CONSTANT_PHOTOMETRIC_WEIGHTS ? PM_SOURCE_PHOTFIT_CONST : PM_SOURCE_PHOTFIT_IMAGE_VAR;
+    } else {
+        if (!strcasecmp(fitVarModeString, "CONSTANT") || !strcasecmp(fitVarModeString, "CONST")) {
+            fitVarMode = PM_SOURCE_PHOTFIT_CONST;
+            goto gotit;
+        }
+        if (!strcasecmp(fitVarModeString, "IMAGE") || !strcasecmp(fitVarModeString, "IMAGE_VAR")) {
+            fitVarMode = PM_SOURCE_PHOTFIT_IMAGE_VAR;
+            goto gotit;
+        }
+        if (!strcasecmp(fitVarModeString, "MODEL") || !strcasecmp(fitVarModeString, "MODEL_VAR")) {
+            fitVarMode = PM_SOURCE_PHOTFIT_MODEL_VAR;
+            goto gotit;
+        }
+        psError (PSPHOT_ERR_CONFIG, false, "Invalid value for LINEAR_FIT_VARIANCE_MODE (%s)", fitVarModeString);
+        return false;
+    }
+
+gotit:
     int SKY_FIT_ORDER = psMetadataLookupS32(&status, recipe, "SKY_FIT_ORDER");
     if (!status) {