Changeset 5583

Timestamp:

Nov 23, 2005, 9:13:06 AM (20 years ago)

Author:

Paul Price

Message:

Worked out some memory leaks and bugs for GPC1 test data

Location:

trunk/archive/scripts/src/phase2

Files:

• ipprc.config (modified) (1 diff)
• megacam_raw.config (modified) (1 diff)
• papPhase2.c (modified) (5 diffs)
• pmConfig.c (modified) (1 diff)
• pmFPAConceptsSet.c (modified) (2 diffs)
• pmFPAConstruct.c (modified) (3 diffs)
• pmFPARead.h (modified) (1 diff)
• pmFPAWrite.c (modified) (1 diff)

trunk/archive/scripts/src/phase2/ipprc.config

@@ -8 +8 @@
 ### Setups for each camera system
 CAMERAS         METADATA
+#       MEGACAM_SINGLE  STR     megacam_single.config
         MEGACAM_RAW     STR     megacam_raw.config
-#       MEGACAM_SPLICE  STR     megacam_splice.config
-#       GPC1_RAW        STR     gpc1_raw.config
+        MEGACAM_SPLICE  STR     megacam_splice.config
+        GPC1_RAW        STR     gpc1_raw.config
 #       LRIS_BLUE       STR     lris_blue.config
 #       LRIS_RED        STR     lris_red.config

trunk/archive/scripts/src/phase2/megacam_raw.config

@@ -165 +165 @@
         MASK.SOURCE     STR     FILE            # Source type for mask: EXT | FILE
         MASK.NAME       STR     %a_mask.fits    # Name for mask extension or filename
-        WEIGHT.SOURCE   STR     EXT             # Source type for weight: EXT | FILE
-        WEIGHT.NAME     STR     %f-weight       # Name for weight extension or filename
+        WEIGHT.SOURCE   STR     FILE            # Source type for weight: EXT | FILE
+        WEIGHT.NAME     STR     %a_weight.fits  # Name for weight extension or filename
 END

trunk/archive/scripts/src/phase2/papPhase2.c

@@ -149 +149 @@
     }
 
-#if 0
-    psString outputMaskName = psStringCopy(outputName);
-    (void)psStringAppend(&outputMaskName, ".mask");
-#ifdef PRODUCTION
-    psFits *outputMaskFile = psFitsOpen(outputMaskName, "w");
-#else
-    psFits *outputMaskFile = psFitsAlloc(outputMaskName);
-#endif
-    if (! outputMaskFile) {
-        psErrorStackPrint(stderr, "Can't open output mask image: %s\n", outputMaskName);
-        exit(EXIT_FAILURE);
-    }
-    psFree(outputMaskName);
-#endif
-
     // Get camera configuration from header if not already defined
     if (! camera) {
@@ -298 +283 @@
         exit(EXIT_FAILURE);
     }
+
 #ifdef PRODUCTION
     psFitsClose(inputFile);
@@ -304 +290 @@
 #endif
 
-
-#if 1
+#if 0
+    pmFPAReadMask(input, inputFile);
+    pmFPAReadWeight(input, inputFile);
+#else
     {
         // Generate mask and weight frame
@@ -353 +341 @@
 #endif
 
-    //pmFPAPrint(input);
+#if 0
+    pmFPAPrint(input);
+#endif
 
     // Load the calibration frames, if required
@@ -825 +815 @@
 #ifdef PRODUCTION
     psFitsClose(outputFile);
-//    psFitsClose(outputMaskFile);
 #else
     psFree(outputFile);
-//    psFree(outputMaskFile);
 #endif
 

trunk/archive/scripts/src/phase2/pmConfig.c

@@ -177 +177 @@
         if (! headerItem || headerItem->type != ruleItem->type) {
             match = false;
+            break;
         }
 

trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c

@@ -621 +621 @@
                     while (biassec = psListGetAndIncrement(biassecsIter)) {
                         psListIteratorSet(checkListIter, PS_LIST_HEAD);
-                        psRegion *checkRegion = NULL; // Region from iteration
+                        psString checkRegionString = NULL; // Region string from iteration
                         int i = 0;              // Counter
-                        while (checkRegion = psListGetAndIncrement(checkListIter)) {
-                            if (COMPARE_REGIONS(biassec, checkRegion)) {
+                        while (checkRegionString = psListGetAndIncrement(checkListIter)) {
+                            psRegion checkRegion = psRegionFromString(checkRegionString);
+                            psTrace(__func__, 7, "Checking [%.0f:%.0f,%.0f:%.0f] against "
+                                    "[%.0f:%.0f,%.0f:%.0f]\n", biassec->x0, biassec->x1, biassec->y0,
+                                    biassec->y1, checkRegion.x0, checkRegion.x1, checkRegion.y0,
+                                    checkRegion.y1);
+                            if (COMPARE_REGIONS(biassec, &checkRegion)) {
                                 check->data.U8[i] = 1;
                                 i++;
@@ -707 +712 @@
             psMetadataItem *binItem = psMetadataItemAllocStr(xKeyword, "Binning factor in x and y",
                                                              binString);
+            psFree(binString);
             psMetadata *header = NULL; // The FITS header
             if (cell->hdu) {

trunk/archive/scripts/src/phase2/pmFPAConstruct.c

@@ -141 +141 @@
                     }
                     // The cell
-                    psArray *images = NULL;
-                    psMetadata *header = NULL;
                     psMetadata *cellData = getCellData(camera, cellType);
                     pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
@@ -242 +240 @@
                 const char *cellType = contentItem->data.V; // The type of cell
                 psTrace(__func__, 5, "Cell type is %s\n", cellType);
-                psArray *images = NULL;
-                psMetadata *header = NULL;
                 psMetadata *cellData = getCellData(camera, cellType);
                 pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
 //              psFree(cellData);
                 cell->hdu = p_pmHDUAlloc(extName); // Prepare cell to receive FITS data
+
+                psFree(cell);
             } // Iterating through contents
             psFree(contentsIter);
@@ -256 +254 @@
             return NULL;
         }
+        psFree(chipName);
+        psFree(chip);
 
     } else {

trunk/archive/scripts/src/phase2/pmFPARead.h

@@ -15 +15 @@
 
 bool pmFPAReadMask(pmFPA *fpa,          // FPA to read into
-                     psFits *source     // Source FITS file (for the original data)
+                   psFits *source       // Source FITS file (for the original data)
     );
 

trunk/archive/scripts/src/phase2/pmFPAWrite.c

@@ -64 +64 @@
         status &= writeHDU(fits, fpa->hdu);
     }
+
+
 
     return status;