Changeset 9652

Timestamp:

Oct 19, 2006, 11:13:21 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)

trunk/psModules/src/objects/pmSourceIO_CMF.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 02:23:55 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-19 21:13:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
 
         type = pmSourceDophotType (source);
-        #if 1
+        #if 0
 
         float sky = PAR[PM_PAR_SKY];
-        #else  // we eventually need to interpolate here to get the sky background. XXX
+        #else
 
-        file = psMetadataLookupPtr(&status, header, "PSPHOT.BACKGND");
-        if (file != NULL) {
-            background = pmFPAviewThisReadout (view, file->fpa);
-        }
-        float sky = source->moments->Sky + 0; // etc.
+        float sky = source->sky;
         #endif
 

trunk/psModules/src/objects/pmSourceIO_CMP.c

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