Changeset 36157 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CFF.c

Timestamp:

Sep 27, 2013, 8:48:07 PM (13 years ago)

Author:

eugene

Message:

updates for CFF input and galaxy fits

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CFF.c (modified) (4 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceIO_CFF.c

@@ -59 +59 @@
 
     bool status;
-    psF32 *PAR, *dPAR;
     psEllipseAxes axes;
 
@@ -92 +91 @@
         // here are the things we read from the FITS table (XXX modify names if needed)
 
-        unsigned int ID  = psMetadataLookupU32 (&status, row, "IPP_IDET");
-        float X          = psMetadataLookupF32 (&status, row, "X_PSF");
-        float Y          = psMetadataLookupF32 (&status, row, "Y_PSF");
+        unsigned int ID  = psMetadataLookupU32 (&status, row, "ID");
+        float X          = psMetadataLookupF32 (&status, row, "X");
+        float Y          = psMetadataLookupF32 (&status, row, "Y");
 
         float apRadius   = psMetadataLookupS32 (&status, row, "AP_RADIUS");
@@ -172 +171 @@
 
         if (fitGalaxy) {
-            source->modelFits = psArrayAllocEmpty (models->list->n);
+            source->modelFits = psArrayAllocEmpty (1);
             pmModel *model = pmModelAlloc(modelType);
             psF32 *xPAR = model->params->data.F32;
@@ -181 +180 @@
             xPAR[PM_PAR_YPOS] = Y;
             
-            psEllipseAxes galAxes;
-            galAxes.major = Rmajor;
-            galAxes.minor = Rminor;
-            galAxes.theta = theta; // XXX degrees or radians?
-
-            pmPSF_AxesToModel (PAR, guessAxes, galModelType);
-            xPAR[PM_PAR_7] = Sindex;
+            psEllipseAxes galaxyAxes;
+            galaxyAxes.major = Rmajor;
+            galaxyAxes.minor = Rminor;
+            galaxyAxes.theta = theta; // XXX degrees or radians?
+
+            pmPSF_AxesToModel (PAR, galaxyAxes, galaxyModelType);
+            if (model->params->n > 7) {
+              xPAR[PM_PAR_7] = Sindex;
+            }
 
             psArrayAdd (source->modelFits, 1, model);