Changeset 13411 for trunk/psphot/src/psphotMergeSources.c

Timestamp:

May 17, 2007, 11:53:28 AM (19 years ago)

Author:

Paul Price

Message:

Adding const to view.

File:

• trunk/psphot/src/psphotMergeSources.c (modified) (1 diff)

trunk/psphot/src/psphotMergeSources.c

@@ -5 +5 @@
 
     for (int i = 0; i < newSources->n; i++) {
-        pmSource *source = newSources->data[i];
-        psArrayAdd (oldSources, 100, source);
+        pmSource *source = newSources->data[i];
+        psArrayAdd (oldSources, 100, source);
     }
     return true;
 }
 
-// merge the externally supplied sources with the existing sources.  mark them as having 
+// merge the externally supplied sources with the existing sources.  mark them as having
 // mode PM_SOURCE_MODE_EXTERNAL
-bool psphotLoadExtSources (pmConfig *config, pmFPAview *view, psArray *sources) {
+bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view, psArray *sources) {
 
     // find the currently selected readout
     pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
     if (!readout) {
-        psLogMsg ("psphot", 3, "no external sources supplied");
-        return true;
+        psLogMsg ("psphot", 3, "no external sources supplied");
+        return true;
     }
 
     psArray *extSources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
     if (!extSources) {
-        psLogMsg ("psphot", 3, "no external sources for this readout");
-        return true;
+        psLogMsg ("psphot", 3, "no external sources for this readout");
+        return true;
     }
 
     for (int i = 0; i < extSources->n; i++) {
-        pmSource *source = extSources->data[i];
-        source->mode |= PM_SOURCE_MODE_EXTERNAL;
-        pmModel *model = source->modelPSF;
+        pmSource *source = extSources->data[i];
+        source->mode |= PM_SOURCE_MODE_EXTERNAL;
+        pmModel *model = source->modelPSF;
 
-        float xpos = model->params->data.F32[PM_PAR_XPOS];
-        float ypos = model->params->data.F32[PM_PAR_YPOS];
+        float xpos = model->params->data.F32[PM_PAR_XPOS];
+        float ypos = model->params->data.F32[PM_PAR_YPOS];
 
-        source->peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
-        source->peak->xf = xpos;
-        source->peak->yf = ypos;
-        source->peak->flux = 1.0;
-        
-        // drop the loaded source modelPSF
-        psFree (source->modelPSF);
-        source->modelPSF = NULL;
+        source->peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
+        source->peak->xf = xpos;
+        source->peak->yf = ypos;
+        source->peak->flux = 1.0;
+
+        // drop the loaded source modelPSF
+        psFree (source->modelPSF);
+        source->modelPSF = NULL;
     }