Changeset 9653

Timestamp:

Oct 19, 2006, 11:16:49 AM (20 years ago)

Author:

rhl

Message:

Use pmSource->sky not params[PM_PAR_SKY]

Location:

trunk/psModules/src/objects

Files:

• pmSourceIO_CMF.c (modified) (2 diffs)
• pmSourceIO_CMP.c (modified) (2 diffs)
• pmSourceIO_OBJ.c (modified) (2 diffs)
• pmSourceIO_RAW.c (modified) (3 diffs)
• pmSourceIO_SX.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-19 21:13:21 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
 
         type = pmSourceDophotType (source);
-        #if 0
-
-        float sky = PAR[PM_PAR_SKY];
-        #else
-
-        float sky = source->sky;
-        #endif
-
-        lsky = (sky < 1.0) ? 0.0 : log10(sky);
+        lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
         shape.sx  = PAR[PM_PAR_SXX];

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-19 21:13:21 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -117 +117 @@
 
         type = pmSourceDophotType (source);
-        #if 0
-
-        float sky = PAR[PM_PAR_SKY];
-        #else
-
-        float sky = source->sky;
-        #endif
-
-        lsky = (sky < 1.0) ? 0.0 : log10(sky);
+        lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
 
         shape.sx  = PAR[PM_PAR_SXX];

trunk/psModules/src/objects/pmSourceIO_OBJ.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:29:14 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
         psLineAdd (line, "%8.3f", source->psfMag);
         psLineAdd (line, "%6.3f", dmag);
-        psLineAdd (line, "%9.2f", PAR[PM_PAR_SKY]);
+        psLineAdd (line, "%9.2f", source->sky);
         psLineAdd (line, "%9.3f", axes.major);
         psLineAdd (line, "%9.3f", axes.minor);

trunk/psModules/src/objects/pmSourceIO_RAW.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-14 00:54:37 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
 
         fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
-                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], PAR[PM_PAR_SKY],
+                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
                  source->psfMag, source->errMag, dPos);
 
@@ -149 +149 @@
 
         fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
-                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], PAR[PM_PAR_SKY],
+                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
                  source->extMag, source->errMag, dPos);
 

trunk/psModules/src/objects/pmSourceIO_SX.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-22 12:24:38 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:16:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71 +71 @@
         psLineAdd (line, "%9.4f",  source->psfMag);
         psLineAdd (line, "%9.4f",  source->errMag);
-        psLineAdd (line, "%13.4f", PAR[PM_PAR_SKY]);
+        psLineAdd (line, "%13.4f", source->sky);
         psLineAdd (line, "%9.2f",  axes.major);
         psLineAdd (line, "%9.2f",  axes.minor);