Changeset 6864 for branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c

Timestamp:

Apr 17, 2006, 7:10:08 AM (20 years ago)

Author:

magnier

Message:

fixed up object output file functions, small speed improvements

File:

• branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-14 21:43:59 $
+ *  @version $Revision: 1.1.2.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 17:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
     psMetadataItem *mdi;
     psF32 *PAR, *dPAR;
-    float dmag, lsky;
+    float lsky = 0;
     bool status;
     psEllipseShape shape;
@@ -99 +99 @@
         psLineAdd (line, "%6.1f ",  PAR[3]);
         psLineAdd (line, "%6.3f ",  PS_MIN (99.0, source->psfMag + ZERO_POINT));
-        psLineAdd (line, "%03d ",   PS_MIN (999, (int)(1000*dmag)));
+        psLineAdd (line, "%03d ",   PS_MIN (999, (int)(1000*source->errMag)));
         psLineAdd (line, "%2d ",    type);
         psLineAdd (line, "%3.1f ",  lsky);
@@ -249 +249 @@
     return (sources);
 }
-
-# if (0)
-    PAR = model->params->data.F32;
-dPAR = model->dparams->data.F32;
-
-dmag = dPAR[1] / PAR[1];
-type = pmSourceDophotType (source);
-lsky = (PAR[0] < 1.0) ? 0.0 : log10(PAR[0]);
-
-psLineInit (line);
-psLineAdd (line, "%6.1f ", PAR[2]);
-psLineAdd (line, "%6.1f ", PAR[3]);
-psLineAdd (line, "%6.3f ", PS_MIN (99.999, source->fitMag + ZERO_POINT));
-psLineAdd (line, "%03d ",  PS_MIN (999, (int)(1000*dmag)));
-psLineAdd (line, "%2d ",   type);
-psLineAdd (line, "%3.1f ", lsky);
-psLineAdd (line, "%6.3f ", 99.999); // should be 'Mgal
-psLineAdd (line, "%6.3f ", PS_MIN (99.999, source->apMag + ZERO_POINT));
-psLineAdd (line, "%6.2f ", PAR[4]); // should be 'FHWM x'
-psLineAdd (line, "%6.2f ", PAR[5]); // should be 'FHWM y'
-psLineAdd (line, "%5.1f\n", 0); // should be theta
-
-# endif