Changeset 36756 for trunk/psModules

Timestamp:

May 20, 2014, 10:49:15 AM (12 years ago)

Author:

bills

Message:

set model->flags = EXT_FLAGS. Fix setting of EXT_FLAGS. Should be model->flags not source->modelEXT->flags.
Values will be wrong for PV2

File:

• trunk/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -946 +946 @@
 
             // EAM : adding for PV2 outputs:
-            @>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLAGS", PS_DATA_S16, "model fit flags (pmModelStatus)", source->modelEXT ? source->modelEXT->flags : 0);
+            @>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "EXT_FLAGS", PS_DATA_S16, "model fit flags (pmModelStatus)", model->flags);
 
             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "POSANGLE",   0, "position angle at source (degrees)",         posAngle);
@@ -1113 +1113 @@
         model->chisq = psMetadataLookupF32(&status, row, "EXT_CHISQ");
         model->nDOF = psMetadataLookupF32(&status, row, "EXT_NDOF");
+        model->flags = psMetadataLookupS16(&status, row, "EXT_FLAGS");
 
         // EXT_MODEL_TYPE gives the model chosen by psphot as the best.