Changeset 9810

Timestamp:

Oct 31, 2006, 9:38:44 AM (20 years ago)

Author:

magnier

Message:

changed name of radiusTMP to radiusFit in pmModel

Location:

trunk/psModules/src/objects

Files:

• pmModel.c (modified) (3 diffs)
• pmModel.h (modified) (2 diffs)
• pmSourceIO_RAW.c (modified) (3 diffs)
• pmSourcePhotometry.c (modified) (3 diffs)

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:55:05 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-31 19:38:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
     tmp->nDOF  = 0;
     tmp->nIter = 0;
-    tmp->radiusTMP = 0;
+    tmp->radiusFit = 0;
     tmp->status = PM_MODEL_UNTRIED;
 
@@ -87 +87 @@
     new->nIter  = model->nIter;
     new->status = model->status;
-    new->radiusTMP = model->radiusTMP;
+    new->radiusFit = model->radiusFit;
 
     for (int i = 0; i < new->params->n; i++) {

trunk/psModules/src/objects/pmModel.h

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:29:14 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-31 19:38:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
     int nIter;    ///< number of iterations to reach min
     pmModelStatus status;  ///< fit status
-    float radiusTMP;   ///< fit radius actually used
+    float radiusFit;   ///< fit radius actually used
 }
 pmModel;

trunk/psModules/src/objects/pmSourceIO_RAW.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-19 21:16:49 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-31 19:38:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -105 +105 @@
                  logChi, logChiNorm,
                  source[0].moments->SN,
-                 model[0].radiusTMP,
+                 model[0].radiusFit,
                  source[0].pixWeight,
                  model[0].nDOF,
@@ -165 +165 @@
                  log10(model[0].chisqNorm/model[0].nDOF),
                  source[0].moments->SN,
-                 model[0].radiusTMP,
+                 model[0].radiusFit,
                  source[0].pixWeight,
                  model[0].nDOF,

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:55:05 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-31 19:38:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
 
     // set aperture mask circle to model radius
-    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);
+    psImageKeepCircle (source->mask, x, y, model->radiusFit, "OR", PM_MASK_MARK);
 
     // measure the weight of included pixels
@@ -135 +135 @@
     if (status && isPSF && psf) {
         if (psf->growth && (mode & PM_SOURCE_PHOT_GROWTH)) {
-            source->apMag += pmGrowthCurveCorrect (psf->growth, model->radiusTMP);
+            source->apMag += pmGrowthCurveCorrect (psf->growth, model->radiusFit);
         }
         if (mode & PM_SOURCE_PHOT_APCORR) {
             rflux   = pow (10.0, 0.4*source->psfMag);
-            source->apMag  -= PS_SQR(model->radiusTMP)*rflux * psf->skyBias + psf->skySat / rflux;
+            source->apMag  -= PS_SQR(model->radiusFit)*rflux * psf->skyBias + psf->skySat / rflux;
         }
     }
 
     // unmask aperture
-    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
+    psImageKeepCircle (source->mask, x, y, model->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
 
     // subtract object, leave local sky