Changeset 36329

Timestamp:

Dec 2, 2013, 9:59:15 AM (13 years ago)

Author:

eugene

Message:

add some TMPF bits to specify if the petrosian and/or galaxy model should be fitted; deactivate the covar matrix output; add a BEST_FIT model flag

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

• pmModelFuncs.h (modified) (1 diff)
• pmSource.h (modified) (1 diff)
• pmSourceIO_CMF.c.in (modified) (7 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmModelFuncs.h

@@ -47 +47 @@
     PM_MODEL_SERSIC_PCM_FAIL_GRID  = 0x100, ///< sersic model fit failed on the grid search
     PM_MODEL_PCM_FAIL_GUESS        = 0x200, ///< non-sersic model fit failed on the initial moments-based guess
+    PM_MODEL_BEST_FIT              = 0x400, ///< this model was the best fit and was subtracted
 } pmModelStatus;
 

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSource.h

@@ -40 +40 @@
     PM_SOURCE_TMPF_PETRO_KEEP        = 0x0100,
     PM_SOURCE_TMPF_PETRO_SKIP        = 0x0200,
+    PM_SOURCE_TMPF_GALAXY_FIT        = 0x0400,  // not just galaxies (trails as well)
+    PM_SOURCE_TMPF_PETRO_FIT         = 0x0800,
 } pmSourceTmpF;
 

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -789 +789 @@
     char name[64];
 
+    pmModelType modelTypeTrail = pmModelClassGetType("PS_MODEL_TRAIL");
+
     // create a header to hold the output data
     psMetadata *outhead = psMetadataAlloc ();
@@ -798 +800 @@
     sources = psArraySort (sources, pmSourceSortByFlux);
 
-    @>PS1_DV2@ float magOffset; 
-    @>PS1_DV2@ float zeroptErr; 
-    @>PS1_DV2@ float fwhmMajor; 
-    @>PS1_DV2@ float fwhmMinor;
-    @>PS1_DV2@ pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
+    float magOffset; 
+    float zeroptErr; 
+    float fwhmMajor; 
+    float fwhmMinor;
+    pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
 
     // we are writing one row per model; we need to write out same number of columns for each row: find the max Nparams
@@ -853 +855 @@
             xPos = PAR[PM_PAR_XPOS];
             yPos = PAR[PM_PAR_YPOS];
-            xErr = dPAR[PM_PAR_XPOS];
-            yErr = dPAR[PM_PAR_YPOS];
+
+            // for the extended source models, we do not always fit the centroid in the non-linear fitting process
+            // current situation (hard-wired into psphotSourceFits.c:psphotFitPCM,
+            // SERSIC, DEV, EXP : X,Y not fitted (PCM and not PCM)
+            // TRAIL : X,Y are fitted
+            // 
+            
+            // XXX this should be based on what happened, not on the model type
+            if (model->type == modelTypeTrail) {
+                xErr = dPAR[PM_PAR_XPOS];
+                yErr = dPAR[PM_PAR_YPOS];
+            } else {
+                // this is definitely an underestimate since it does not
+                // account for the extent of the source
+                xErr = fwhmMajor * model->magErr / 2.35;
+                yErr = fwhmMinor * model->magErr / 2.35;
+            }
 
             @>PS1_DV2@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
@@ -870 +887 @@
             row = psMetadataAlloc ();
 
-            // XXX we are not writing out the mode (flags) or the type (psf, ext, etc)
             // the psMetadataAdd entry and the double quotes are used by grep to select the output fields for automatic documentation
             // This set of psMetadataAdd Entries marks the "----" "Start of the XFIT segment"
@@ -950 +966 @@
 
                 snprintf (name, 64, "EXT_PAR_%02d", k);
-
+               
                 if (k < model->params->n) {
                     psMetadataAddF32 (row, PS_LIST_TAIL, name, 0, "", model->params->data.F32[k]);
@@ -960 +976 @@
             // optionally, write out the covariance matrix values
             // XXX do I need to pad this to match the biggest covar matrix?
-            if (model->covar) {
+            if (false && model->covar) {
                 for (int iy = 0; iy < model->covar->numCols; iy++) {
                     for (int ix = iy; ix < model->covar->numCols; ix++) {
@@ -1089 +1105 @@
         if (model->params->n > 7) {
             PAR[7] = psMetadataLookupF32(&status, row, "EXT_PAR_07");
-        }
-        // read the covariance matrix
-        int nparams = model->params->n;
-        psImage *covar = psImageAlloc(nparams, nparams, PS_TYPE_F32);
-        for (int y = 0; y < nparams; y++) {
-            for (int x = 0; x < nparams; x++) {
-                char name[64];
-                snprintf(name, 64, "EXT_COVAR_%02d_%02d", y, x);
-                covar->data.F32[y][x] = psMetadataLookupF32(&status, row, name);
-            }
-        }
-        model->covar = covar;
+            // XXX add an error:
+            // dPAR[7] = psMetadataLookupF32(&status, row, "EXT_PAR_07_");
+        }
+
+        // XXX : make this depend on what is in the cmf
+        if (0) {
+            // read the covariance matrix
+            int nparams = model->params->n;
+            psImage *covar = psImageAlloc(nparams, nparams, PS_TYPE_F32);
+            for (int y = 0; y < nparams; y++) {
+                for (int x = 0; x < nparams; x++) {
+                    char name[64];
+                    snprintf(name, 64, "EXT_COVAR_%02d_%02d", y, x);
+                    covar->data.F32[y][x] = psMetadataLookupF32(&status, row, name);
+                }
+            }
+            model->covar = covar;
+        }
 
         if (modelType == extModelType) {