Changeset 18139

Timestamp:

Jun 13, 2008, 5:19:31 PM (18 years ago)

Author:

eugene

Message:

adding database fields to APIs as needed for concepts

Location:

trunk/psModules/src/camera

Files:

• pmFPAfileFitsIO.c (modified) (6 diffs)
• pmFPAfileFitsIO.h (modified) (2 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -166 +166 @@
 static bool fpaViewReadFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest
                                  pmFPAfile *file, // FPA file of interest
+                                 psDB *db, 
                                  bool (*fpaReadFunc)(pmFPA*, psFits*, psDB*), // Function to read FPA
                                  bool (*chipReadFunc)(pmChip*, psFits*, psDB*), // Function to read chip
@@ -178 +179 @@
 
     if (view->chip == -1) {
-        return fpaReadFunc(fpa, fits, NULL);
+        return fpaReadFunc(fpa, fits, db);
     }
 
@@ -188 +189 @@
 
     if (view->cell == -1) {
-        return chipReadFunc(chip, fits, NULL);
+        return chipReadFunc(chip, fits, db);
     }
 
@@ -198 +199 @@
 
     if (view->readout == -1) {
-        return cellReadFunc(cell, fits, NULL);
+        return cellReadFunc(cell, fits, db);
     }
     psError(PS_ERR_UNKNOWN, true, "Bad view: %d,%d", view->chip, view->cell);
@@ -214 +215 @@
 
     if (view->nRows == 0) {
-        pmReadoutRead (readout, fits, NULL);
+        pmReadoutRead (readout, fits, db);
     } else {
         pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
@@ -223 +224 @@
 
 
-bool pmFPAviewReadFitsImage(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, pmFPARead, pmChipRead, pmCellRead);
-}
-
-bool pmFPAviewReadFitsMask(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
-}
-
-bool pmFPAviewReadFitsWeight(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
-}
-
-bool pmFPAviewReadFitsDark(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
-}
-
-bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, pmFPAfile *file)
-{
-    PS_ASSERT_PTR_NON_NULL(view, false);
-    PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
+bool pmFPAviewReadFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, config->database, pmFPARead, pmChipRead, pmCellRead);
+}
+
+bool pmFPAviewReadFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
+}
+
+bool pmFPAviewReadFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
+}
+
+bool pmFPAviewReadFitsDark(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
+}
+
+bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(view, false);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
 }
 

trunk/psModules/src/camera/pmFPAfileFitsIO.h

@@ -5 +5 @@
  * @author PAP, IfA
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-03-06 20:47:50 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-06-14 03:19:31 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -18 +18 @@
 /// Read an image into the current view
 bool pmFPAviewReadFitsImage(const pmFPAview *view, ///< View specifying level of interest
-                            pmFPAfile *file ///< FPA file into which to read
+                            pmFPAfile *file, ///< FPA file into which to read
+                            pmConfig *config
                            );
 
 /// Read a mask into the current view
 bool pmFPAviewReadFitsMask(const pmFPAview *view, ///< View specifying level of interest
-                           pmFPAfile *file ///< FPA file into which to read
+                           pmFPAfile *file, ///< FPA file into which to read
+                            pmConfig *config
                           );
 /// Read a weight map into the current view
 bool pmFPAviewReadFitsWeight(const pmFPAview *view,  ///< View specifying level of interest
-                             pmFPAfile *file ///< FPA file into which to read
+                             pmFPAfile *file, ///< FPA file into which to read
+                            pmConfig *config
                             );
 
 /// Read a dark into the current view
 bool pmFPAviewReadFitsDark(const pmFPAview *view,  ///< View specifying level of interest
-                           pmFPAfile *file ///< FPA file into which to read
+                           pmFPAfile *file, ///< FPA file into which to read
+                            pmConfig *config
     );
 
 /// Read an image header into the current view
 bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view,  ///< View specifying level of interest
-                                pmFPAfile *file ///< FPA file into which to read
+                                pmFPAfile *file, ///< FPA file into which to read
+                            pmConfig *config
     );
 

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -164 +164 @@
     switch (file->type) {
       case PM_FPA_FILE_IMAGE:
-        status = pmFPAviewReadFitsImage(view, file);
+        status = pmFPAviewReadFitsImage(view, file, config);
         break;
       case PM_FPA_FILE_MASK:
-        status = pmFPAviewReadFitsMask(view, file);
+        status = pmFPAviewReadFitsMask(view, file, config);
         break;
       case PM_FPA_FILE_WEIGHT:
-        status = pmFPAviewReadFitsWeight(view, file);
+        status = pmFPAviewReadFitsWeight(view, file, config);
         break;
       case PM_FPA_FILE_HEADER:
-        status = pmFPAviewReadFitsHeaderSet(view, file);
+        status = pmFPAviewReadFitsHeaderSet(view, file, config);
         break;
       case PM_FPA_FILE_DARK:
-        status = pmFPAviewReadFitsDark(view, file);
+        status = pmFPAviewReadFitsDark(view, file, config);
         break;
       case PM_FPA_FILE_FRINGE:
-        status = pmFPAviewReadFitsImage(view, file);
+        status = pmFPAviewReadFitsImage(view, file, config);
         if (status) {
             if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) {