Changeset 17275

Timestamp:

Apr 2, 2008, 11:16:16 AM (18 years ago)

Author:

eugene

Message:

added EXT_LIMIT, update EXT tests

Location:

branches/eam_branch_20080324/psModules/src/objects

Files:

• models/pmModel_QGAUSS.c (modified) (1 diff)
• models/pmModel_SERSIC.c (modified) (1 diff)
• pmSource.c (modified) (3 diffs)
• pmSource.h (modified) (3 diffs)

branches/eam_branch_20080324/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -457 +457 @@
 
     status = true;
-    status &= (dP < 0.5);
+//    status &= (dP < 0.5);
     status &= (PAR[PM_PAR_I0] > 0);
     status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
+
+    fprintf (stderr, "QGAUSS status pars: dP: %f, I0: %f, S/N: %f\n",
+             dP, PAR[PM_PAR_I0], (dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]));
 
     return status;

branches/eam_branch_20080324/psModules/src/objects/models/pmModel_SERSIC.c

@@ -442 +442 @@
 
     status = true;
-    status &= (dP < 0.5);
+//    status &= (dP < 0.5);
     status &= (PAR[PM_PAR_I0] > 0);
     status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
+
+    fprintf (stderr, "SERSIC status pars: dP: %f, I0: %f, S/N: %f\n",
+             dP, PAR[PM_PAR_I0], (dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]));
 
     return status;

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

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-03-19 00:51:09 $
+ *  @version $Revision: 1.51.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-02 21:16:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1015 +1015 @@
   if (!strcasecmp (name, "DEFECT"    )) return PM_SOURCE_MODE_DEFECT;
   if (!strcasecmp (name, "SATURATED" )) return PM_SOURCE_MODE_SATURATED;
-  if (!strcasecmp (name, "CRLIMIT"   )) return PM_SOURCE_MODE_CRLIMIT;
+  if (!strcasecmp (name, "CRLIMIT"   )) return PM_SOURCE_MODE_CR_LIMIT;
+  if (!strcasecmp (name, "EXTLIMIT"  )) return PM_SOURCE_MODE_EXT_LIMIT;
   if (!strcasecmp (name, "SUBTRACTED")) return PM_SOURCE_MODE_SUBTRACTED;
   return PM_SOURCE_MODE_DEFAULT;
@@ -1036 +1037 @@
     case PM_SOURCE_MODE_DEFECT     : return psStringCopy ("DEFECT"    );
     case PM_SOURCE_MODE_SATURATED  : return psStringCopy ("SATURATED" );
-    case PM_SOURCE_MODE_CRLIMIT    : return psStringCopy ("CRLIMIT");
+    case PM_SOURCE_MODE_CR_LIMIT   : return psStringCopy ("CRLIMIT"   );
+    case PM_SOURCE_MODE_EXT_LIMIT  : return psStringCopy ("EXTLIMIT"  );
     case PM_SOURCE_MODE_SUBTRACTED : return psStringCopy ("SUBTRACTED");
     default:

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

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-03-05 01:08:08 $
+ * @version $Revision: 1.23.2.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-04-02 21:16:16 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -49 +49 @@
     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_CRLIMIT    = 0x2000, ///< Source has crNsigma above limit
-    PM_SOURCE_MODE_SUBTRACTED = 0x4000, ///< XXX this flag is actually only used internally (move)
+    PM_SOURCE_MODE_CR_LIMIT   = 0x2000, ///< Source has crNsigma above limit
+    PM_SOURCE_MODE_EXT_LIMIT  = 0x4000, ///< Source has crNsigma above limit
+    PM_SOURCE_MODE_SUBTRACTED = 0x8000, ///< XXX this flag is actually only used internally (move)
 } pmSourceMode;
 
@@ -60 +61 @@
  *
  *  XXX do I have to re-organize this (again!) to allow an arbitrary set of extended model fits??
+ *  XXX put the Mag and Err inside the pmModel?
+ *  XXX keep the modelEXT or add to the psArray 
+ *  
  *
  */