Changeset 6887 for trunk/stac/src/stacCombine.c

Timestamp:

Apr 18, 2006, 12:20:45 PM (20 years ago)

Author:

Paul Price

Message:

Updating to use psLib rel11. Main problem was that vector and array lengths ('n' element) are no longer set to equal the number of allocated values ('nalloc' element) when allocated.

File:

• trunk/stac/src/stacCombine.c (modified) (3 diffs)

trunk/stac/src/stacCombine.c

@@ -103 +103 @@
     psVector *deltas = psVectorAlloc(nImages, PS_TYPE_F32); // Will hold the errors in the statistics step
     psVector *mask = psVectorAlloc(nImages, PS_TYPE_U8); // Will hold the mask in the statistics step
+    pixels->n = nImages;
+    deltas->n = nImages;
+    mask->n = nImages;
 
     // Set up rejection masks
@@ -109 +112 @@
             // Allocate the rejection masks, if required
             *rejected = psArrayAlloc(nImages);
+            (*rejected)->n = nImages;
         } else {
             assert((*rejected)->n != nImages);
@@ -202 +206 @@
     char chiName[MAXCHAR];              // Filename of chi^2 image
     sprintf(chiName,"chi2_%d.fits",iteration);
-    psFits *chiFile = psFitsAlloc(chiName);
-    if (!psFitsWriteImage(chiFile, NULL, chi2 , 0)) {
+    psFits *chiFile = psFitsOpen(chiName, "w");
+    if (!psFitsWriteImage(chiFile, NULL, chi2 , 0, NULL)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", chiName);
     }
     psTrace("stac.combine", 1, "Chi^2 image written to %s\n", chiName);
-    psFree(chiFile);
+    psFitsClose(chiFile);
     psFree(chi2);
 #endif