Changeset 5992 for branches/eam_rel9_p0/psModules/src/objects/pmObjects.c

Timestamp:

Jan 15, 2006, 8:23:13 AM (20 years ago)

Author:

magnier

Message:

changed FLT,GALAXY to EXT

File:

• branches/eam_rel9_p0/psModules/src/objects/pmObjects.c (modified) (10 diffs)

branches/eam_rel9_p0/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.5.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-10 04:46:03 $
+ *  @version $Revision: 1.5.4.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-15 18:21:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
     psFree(tmp->moments);
     psFree(tmp->modelPSF);
-    psFree(tmp->modelFLT);
+    psFree(tmp->modelEXT);
     psTrace(__func__, 4, "---- %s() end ----\n", __func__);
 }
@@ -211 +211 @@
     // XXX EAM : i changed this to match pmModelEval above, but see
     // XXX EAM   the note below in pmSourceContour
-    psF32 oldValue = pmModelEval(source->modelFLT, source->pixels, subCol, subRow);
+    psF32 oldValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
     if (oldValue == level) {
         psTrace(__func__, 4, "---- %s() end ----\n", __func__);
@@ -233 +233 @@
 
     while (subCol != lastColumn) {
-        psF32 newValue = pmModelEval(source->modelFLT, source->pixels, subCol, subRow);
+        psF32 newValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
         if (oldValue == level) {
             psTrace(__func__, 4, "---- %s() end ----\n", __func__);
@@ -312 +312 @@
     tmp->blends = NULL;
     tmp->modelPSF = NULL;
-    tmp->modelFLT = NULL;
+    tmp->modelEXT = NULL;
     tmp->type = PM_SOURCE_UNKNOWN;
     tmp->mode = PM_SOURCE_DEFAULT;
@@ -1163 +1163 @@
 
     int Nsat     = 0;
-    int Ngal     = 0;
+    int Next     = 0;
     int Nstar    = 0;
     int Npsf     = 0;
@@ -1223 +1223 @@
         }
 
-        // likely unsaturated galaxy (too large to be stellar)
+        // likely unsaturated extended source (too large to be stellar)
         if ((sigX > (clump.X + 3*clump.dX)) || (sigY > (clump.Y + 3*clump.dY))) {
-            tmpSrc->type = PM_SOURCE_GALAXY;
+            tmpSrc->type = PM_SOURCE_EXTENDED;
             tmpSrc->mode = PM_SOURCE_DEFAULT;
-            Ngal ++;
+            Next ++;
             continue;
         }
@@ -1261 +1261 @@
     psTrace (".pmObjects.pmSourceRoughClass", 2, "Nstar:    %3d\n", Nstar);
     psTrace (".pmObjects.pmSourceRoughClass", 2, "Npsf:     %3d\n", Npsf);
-    psTrace (".pmObjects.pmSourceRoughClass", 2, "Ngal:     %3d\n", Ngal);
+    psTrace (".pmObjects.pmSourceRoughClass", 2, "Next:     %3d\n", Next);
     psTrace (".pmObjects.pmSourceRoughClass", 2, "Nsatstar: %3d\n", Nsatstar);
     psTrace (".pmObjects.pmSourceRoughClass", 2, "Nsat:     %3d\n", Nsat);
@@ -1471 +1471 @@
     PS_ASSERT_PTR_NON_NULL(source->peak, false);
     PS_ASSERT_PTR_NON_NULL(source->pixels, false);
-    PS_ASSERT_PTR_NON_NULL(source->modelFLT, false);
-    // XXX EAM : what is the purpose of modelPSF/modelFLT?
+    PS_ASSERT_PTR_NON_NULL(source->modelEXT, false);
+    // XXX EAM : what is the purpose of modelPSF/modelEXT?
 
     //
@@ -1641 +1641 @@
                             PM_SOURCE_FIT_MODEL_TOLERANCE);
 
-    // PSF model only fits first 4 parameters, FLT model fits all
+    // PSF model only fits first 4 parameters, EXT model fits all
     if (PSF) {
         paramMask = psVectorAlloc (params->n, PS_TYPE_U8);