Changeset 18163 for trunk/psModules/src/camera/pmFPAfileFitsIO.c

Timestamp:

Jun 17, 2008, 12:16:38 PM (18 years ago)

Author:

Paul Price

Message:

Changing use of psDB* to pmConfig* so that the database handle only has to be set up when required.

File:

• trunk/psModules/src/camera/pmFPAfileFitsIO.c (modified) (18 diffs)

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
-                                 bool (*cellReadFunc)(pmCell*, psFits*, psDB*) // Function to read cell
+                                 pmConfig *config, // Configuration
+                                 bool (*fpaReadFunc)(pmFPA*, psFits*, pmConfig*), // Function to read FPA
+                                 bool (*chipReadFunc)(pmChip*, psFits*, pmConfig*), // Function to read chip
+                                 bool (*cellReadFunc)(pmCell*, psFits*, pmConfig*) // Function to read cell
                                 )
 {
@@ -179 +179 @@
 
     if (view->chip == -1) {
-        return fpaReadFunc(fpa, fits, db);
+        return fpaReadFunc(fpa, fits, config);
     }
 
@@ -189 +189 @@
 
     if (view->cell == -1) {
-        return chipReadFunc(chip, fits, db);
+        return chipReadFunc(chip, fits, config);
     }
 
@@ -199 +199 @@
 
     if (view->readout == -1) {
-        return cellReadFunc(cell, fits, db);
+        return cellReadFunc(cell, fits, config);
     }
     psError(PS_ERR_UNKNOWN, true, "Bad view: %d,%d", view->chip, view->cell);
@@ -215 +215 @@
 
     if (view->nRows == 0) {
-        pmReadoutRead (readout, fits, db);
+        pmReadoutRead (readout, fits, config);
     } else {
         pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL);
@@ -228 +228 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPARead, pmChipRead, pmCellRead);
+    return fpaViewReadFitsImage(view, file, config, pmFPARead, pmChipRead, pmCellRead);
 }
 
@@ -235 +235 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadMask, pmChipReadMask, pmCellReadMask);
 }
 
@@ -242 +242 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight);
 }
 
@@ -249 +249 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadDark, pmChipReadDark, pmCellReadDark);
 }
 
@@ -256 +256 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
     PS_ASSERT_PTR_NON_NULL(file, false);
-    return fpaViewReadFitsImage(view, file, config->database, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
+    return fpaViewReadFitsImage(view, file, config, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet);
 }
 
@@ -267 +267 @@
 static bool fpaViewWriteFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest
                                   pmFPAfile *file, // FPA file of interest
-                                  const pmConfig *config, // Configuration
-                                  bool (*fpaWriteFunc)(pmFPA*, psFits*, psDB*, bool, bool), // Func for FPA
-                                  bool (*chipWriteFunc)(pmChip*, psFits*, psDB*, bool, bool), // Func for chip
-                                  bool (*cellWriteFunc)(pmCell*, psFits*, psDB*, bool) // Func for cell
+                                  pmConfig *config, // Configuration
+                                  bool (*fpaWriteFunc)(pmFPA*, psFits*, pmConfig*, bool, bool), // Func FPA
+                                  bool (*chipWriteFunc)(pmChip*, psFits*, pmConfig*, bool, bool),// Func chip
+                                  bool (*cellWriteFunc)(pmCell*, psFits*, pmConfig*, bool) // Func cell
                                  )
 {
@@ -283 +283 @@
     switch (pmFPAviewLevel(view)) {
     case PM_FPA_LEVEL_FPA: {
-            bool success = fpaWriteFunc(fpa, fits, NULL, false, true);
+            bool success = fpaWriteFunc(fpa, fits, config, false, true);
             psFree(fpa);
             return success;
@@ -289 +289 @@
     case PM_FPA_LEVEL_CHIP: {
             pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest
-            bool success = chipWriteFunc(chip, fits, NULL, false, true);
+            bool success = chipWriteFunc(chip, fits, config, false, true);
             psFree(fpa);
             return success;
@@ -295 +295 @@
     case PM_FPA_LEVEL_CELL: {
             pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest
-            bool success = cellWriteFunc(cell, fits, NULL, false);
+            bool success = cellWriteFunc(cell, fits, config, false);
             psFree(fpa);
             return success;
@@ -327 +327 @@
 }
 
-bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -334 +334 @@
 }
 
-bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -341 +341 @@
 }
 
-bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);
@@ -348 +348 @@
 }
 
-bool pmFPAviewWriteFitsDark(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
+bool pmFPAviewWriteFitsDark(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(view, false);