Changeset 16759

Timestamp:

Feb 29, 2008, 2:15:29 PM (18 years ago)

Author:

eugene

Message:

cleanup mode flags

Location:

branches/eam_branch_20080225/psModules/src/objects

Files:

• pmSource.c (modified) (10 diffs)
• pmSource.h (modified) (2 diffs)

branches/eam_branch_20080225/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-15 02:48:10 $
+ *  @version $Revision: 1.49.8.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-03-01 00:15:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -513 +513 @@
         if (!source->moments) {
             source->type = PM_SOURCE_TYPE_STAR;
-            source->mode |= PM_SOURCE_MODE_DEFAULT;
             Nstar++;
             continue;
@@ -542 +541 @@
         if (Nsatpix > 1) {
             source->type = PM_SOURCE_TYPE_SATURATED;
-            source->mode |= PM_SOURCE_MODE_DEFAULT;
+            source->mode |= PM_SOURCE_MODE_SATURATED;
             Nsat ++;
             continue;
@@ -553 +552 @@
         if ((sigX < 0.05) || (sigY < 0.05)) {
             source->type = PM_SOURCE_TYPE_DEFECT;
-            source->mode |= PM_SOURCE_MODE_DEFAULT;
+            source->mode |= PM_SOURCE_MODE_DEFECT;
             Ncr ++;
             continue;
@@ -561 +560 @@
         if ((sigX > (clump.X + 3*clump.dX)) || (sigY > (clump.Y + 3*clump.dY))) {
             source->type = PM_SOURCE_TYPE_EXTENDED;
-            source->mode |= PM_SOURCE_MODE_DEFAULT;
             Next ++;
             continue;
@@ -584 +582 @@
         // random type of star
         source->type = PM_SOURCE_TYPE_STAR;
-        source->mode |= PM_SOURCE_MODE_DEFAULT;
     }
 
@@ -1006 +1003 @@
   if (!strcasecmp (name, "PSFMODEL"  )) return PM_SOURCE_MODE_PSFMODEL;
   if (!strcasecmp (name, "EXTMODEL"  )) return PM_SOURCE_MODE_EXTMODEL;
-  if (!strcasecmp (name, "SUBTRACTED")) return PM_SOURCE_MODE_SUBTRACTED;
   if (!strcasecmp (name, "FITTED"    )) return PM_SOURCE_MODE_FITTED;
   if (!strcasecmp (name, "FAIL"      )) return PM_SOURCE_MODE_FAIL;
@@ -1014 +1010 @@
   if (!strcasecmp (name, "SATSTAR"   )) return PM_SOURCE_MODE_SATSTAR;
   if (!strcasecmp (name, "BLEND"     )) return PM_SOURCE_MODE_BLEND;
-  if (!strcasecmp (name, "LINEAR"    )) return PM_SOURCE_MODE_LINEAR;
-  if (!strcasecmp (name, "TEMPSUB"   )) return PM_SOURCE_MODE_TEMPSUB;
   if (!strcasecmp (name, "EXTERNAL"  )) return PM_SOURCE_MODE_EXTERNAL;
   if (!strcasecmp (name, "BADPSF"    )) return PM_SOURCE_MODE_BADPSF;
+  if (!strcasecmp (name, "DEFECT"    )) return PM_SOURCE_MODE_DEFECT;
+  if (!strcasecmp (name, "SATURATED" )) return PM_SOURCE_MODE_SATURATED;
+  if (!strcasecmp (name, "SUBTRACTED")) return PM_SOURCE_MODE_SUBTRACTED;
   return PM_SOURCE_MODE_DEFAULT;
 }
@@ -1026 +1023 @@
     case PM_SOURCE_MODE_PSFMODEL   : return psStringCopy ("PSFMODEL"  );
     case PM_SOURCE_MODE_EXTMODEL   : return psStringCopy ("EXTMODEL"  );
-    case PM_SOURCE_MODE_SUBTRACTED : return psStringCopy ("SUBTRACTED");
     case PM_SOURCE_MODE_FITTED     : return psStringCopy ("FITTED"    );
     case PM_SOURCE_MODE_FAIL       : return psStringCopy ("FAIL"      );
@@ -1034 +1030 @@
     case PM_SOURCE_MODE_SATSTAR    : return psStringCopy ("SATSTAR"   );
     case PM_SOURCE_MODE_BLEND      : return psStringCopy ("BLEND"     );
-    case PM_SOURCE_MODE_LINEAR     : return psStringCopy ("LINEAR"    );
-    case PM_SOURCE_MODE_TEMPSUB    : return psStringCopy ("TEMPSUB"   );
     case PM_SOURCE_MODE_EXTERNAL   : return psStringCopy ("EXTERNAL"  );
     case PM_SOURCE_MODE_BADPSF     : return psStringCopy ("BADPSF"    );
+    case PM_SOURCE_MODE_DEFECT     : return psStringCopy ("DEFECT"    );
+    case PM_SOURCE_MODE_SATURATED  : return psStringCopy ("SATURATED" );
+    case PM_SOURCE_MODE_SUBTRACTED : return psStringCopy ("SUBTRACTED");
     default:
       return NULL;

branches/eam_branch_20080225/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.22.8.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-02-25 18:13:08 $
+ * @version $Revision: 1.22.8.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-01 00:14:57 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -38 +38 @@
     PM_SOURCE_MODE_PSFMODEL   = 0x0001, ///<
     PM_SOURCE_MODE_EXTMODEL   = 0x0002, ///<
-    PM_SOURCE_MODE_SUBTRACTED = 0x0004, ///<
-    PM_SOURCE_MODE_FITTED     = 0x0008, ///<
-    PM_SOURCE_MODE_FAIL       = 0x0010, ///<
-    PM_SOURCE_MODE_POOR       = 0x0020, ///<
-    PM_SOURCE_MODE_PAIR       = 0x0040, ///<
-    PM_SOURCE_MODE_PSFSTAR    = 0x0080, ///<
-    PM_SOURCE_MODE_SATSTAR    = 0x0100, ///<
-    PM_SOURCE_MODE_BLEND      = 0x0200, ///<
-    PM_SOURCE_MODE_LINEAR     = 0x0400, ///<
-    PM_SOURCE_MODE_TEMPSUB    = 0x0800, ///< XXX get me a better name!
-    PM_SOURCE_MODE_EXTERNAL   = 0x1000, ///< XXX get me a better name!
-    PM_SOURCE_MODE_BADPSF     = 0x2000, ///< Failed to get good estimate of object's PSF
+    PM_SOURCE_MODE_FITTED     = 0x0004, ///<
+    PM_SOURCE_MODE_FAIL       = 0x0008, ///<
+    PM_SOURCE_MODE_POOR       = 0x0010, ///<
+    PM_SOURCE_MODE_PAIR       = 0x0020, ///<
+    PM_SOURCE_MODE_PSFSTAR    = 0x0040, ///<
+    PM_SOURCE_MODE_SATSTAR    = 0x0080, ///<
+    PM_SOURCE_MODE_BLEND      = 0x0100, ///<
+    PM_SOURCE_MODE_EXTERNAL   = 0x0200, ///< Source based on supplied input position
+    PM_SOURCE_MODE_BADPSF     = 0x0400, ///< Failed to get good estimate of object's PSF
+    PM_SOURCE_MODE_DEFECT     = 0x0800, ///< Source is thought to be a defect
+    PM_SOURCE_MODE_SATURATED  = 0x1000, ///< Source is thought to be saturation
+    PM_SOURCE_MODE_SUBTRACTED = 0x2000, ///< XXX this flag is actually only used internally (move)
 } pmSourceMode;