Changeset 17832 for trunk/psModules/src/objects

Timestamp:

May 28, 2008, 11:48:49 AM (18 years ago)

Author:

eugene

Message:

fixed errors in recent API mods

Location:

trunk/psModules/src/objects

Files:

• pmSource.c (modified) (2 diffs)
• pmSourceIO.c (modified) (4 diffs)
• pmSourceIO.h (modified) (2 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-04-08 18:35:38 $
+ *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-28 21:48:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -875 +875 @@
         psF32 **target = source->pixels->data.F32;
         if (mode & PM_MODEL_OP_NOISE) {
+            // XXX need to scale by the gain...
             target = source->weight->data.F32;
         }

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-05-28 18:57:01 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-28 21:48:49 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -886 +886 @@
 
     if (view->chip == -1) {
-        bool exists = pmFPACheckDataStatusForSources (fpa, name);
+        bool exists = pmFPACheckDataStatusForSources (fpa, file->name);
         return exists;
     }
@@ -896 +896 @@
 
     if (view->cell == -1) {
-        bool exists = pmChipCheckDataStatusForSources (chip, name);
+        bool exists = pmChipCheckDataStatusForSources (chip, file->name);
         return exists;
     }
@@ -906 +906 @@
 
     if (view->readout == -1) {
-        bool exists = pmCellCheckDataStatusForSources (cell, name);
+        bool exists = pmCellCheckDataStatusForSources (cell, file->name);
         return exists;
     }

trunk/psModules/src/objects/pmSourceIO.h

@@ -4 +4 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-04-08 18:35:38 $
+ * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-05-28 21:48:49 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  *
@@ -57 +57 @@
 
 bool pmFPAviewCheckDataStatusForSources (const pmFPAview *view, const pmFPAfile *file);
-bool pmFPACheckDataStatusForSources (const pmFPA *fpa);
-bool pmChipCheckDataStatusForSources (const pmChip *chip);
-bool pmCellCheckDataStatusForSources (const pmCell *cell);
-bool pmReadoutCheckDataStatusForSources (const pmReadout *readout);
+bool pmFPACheckDataStatusForSources (const pmFPA *fpa, const char *name);
+bool pmChipCheckDataStatusForSources (const pmChip *chip, const char *name);
+bool pmCellCheckDataStatusForSources (const pmCell *cell, const char *name);
+bool pmReadoutCheckDataStatusForSources (const pmReadout *readout, const char *name);
 
 /// @}