Changeset 36866 for trunk/psModules/src/objects/pmSourceIO_CMF.c.in

Timestamp:

Jun 13, 2014, 10:57:01 AM (12 years ago)

Author:

eugene

Message:

ensure pmPSF_AxesToModel and pmPSF_ModelToAxes uses class->useReff (not the old model->type); read in AP_FLUX and AP_FLUX_SIG

File:

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

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

@@ -372 +372 @@
         @ALL@     source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
         @>PS1_V2,PS1_SV?,>PS1_DV1@ source->apMagRaw  = psMetadataLookupF32 (&status, row, "AP_MAG_RAW");
+        @>PS1_DV1,>PS1_V3,>PS1_SV1@ source->apFlux = psMetadataLookupF32 (&status, row, "AP_FLUX");
+        @>PS1_DV1,>PS1_V3,>PS1_SV1@ source->apFluxErr = psMetadataLookupF32 (&status, row, "AP_FLUX_SIG");
 
         // XXX use these to determine PAR[PM_PAR_I0] if they exist?
@@ -382 +384 @@
         @ALL@     dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
 
-        pmPSF_AxesToModel (PAR, axes, modelType);
+        pmPSF_AxesToModel (PAR, axes, model->class->useReff);
 
         @ALL@     float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
@@ -432 +434 @@
         if (haveLensOBJ) {
           source->lensingOBJ = pmSourceLensingAlloc ();
-          source->lensingOBJ->lensing->smear = pmLensingParsAlloc();
-          source->lensingOBJ->lensing->shear = pmLensingParsAlloc();
+          source->lensingOBJ->smear = pmLensingParsAlloc();
+          source->lensingOBJ->shear = pmLensingParsAlloc();
 
           @>PS1_V4@ source->lensingOBJ->smear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SM_OBJ");
@@ -449 +451 @@
         if (haveLensPSF) {
           source->lensingPSF = pmSourceLensingAlloc ();
-          source->lensingPSF->lensing->smear = pmLensingParsAlloc();
-          source->lensingPSF->lensing->shear = pmLensingParsAlloc();
+          source->lensingPSF->smear = pmLensingParsAlloc();
+          source->lensingPSF->shear = pmLensingParsAlloc();
 
           @>PS1_V4@ source->lensingPSF->smear->X11 = psMetadataLookupF32 (&status, row, "LENS_X11_SM_PSF");
@@ -1185 +1187 @@
         axes.minor = psMetadataLookupF32(&status, row, "EXT_WIDTH_MIN");
         axes.theta = psMetadataLookupF32(&status, row, "EXT_THETA");
-        if (!pmPSF_AxesToModel(PAR, axes, modelType)) {
+        if (!pmPSF_AxesToModel(PAR, axes, model->class->useReff)) {
             // Do we need to fail here or can this happen?
             psError(PS_ERR_UNKNOWN, false, "Failed to convert psf axes to model");