Changeset 7639

Timestamp:

Jun 22, 2006, 10:38:23 AM (20 years ago)

Author:

eugene

Message:

various cleanups

Location:

trunk/ppImage/src

Files:

• ppImage.c (modified) (1 diff)
• ppImage.h (modified) (1 diff)
• ppImageAstrom.c (modified) (2 diffs)
• ppImageCleanup.c (modified) (1 diff)
• ppImageLoop.c (modified) (5 diffs)
• ppImageMosaic.c (modified) (1 diff)
• ppImagePhotom.c (modified) (2 diffs)

trunk/ppImage/src/ppImage.c

@@ -35 +35 @@
     return EXIT_SUCCESS;
 }
+
+void ppImageFileCheck (pmConfig *config) {
+
+    // add the output names to the output-type files
+    psMetadataItem *item = NULL;
+    psMetadataIterator *iter = psMetadataIteratorAlloc (config->files, PS_LIST_HEAD, NULL);
+    while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
+        pmFPAfile *file = item->data.V;
+        pmFPA *fpa = file->fpa;
+        fprintf (stderr, "file %s\n", file->name);
+        if (!fpa) {
+            fprintf (stderr, "  has no FPA\n");
+            continue;
+        }
+        if (fpa->hdu) {
+            if (fpa->hdu->images) fprintf (stderr, "  (%d,%d) images\n", -1, -1);
+            if (fpa->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", -1, -1);
+            if (fpa->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", -1, -1);
+            if (fpa->hdu->header) fprintf (stderr, "  (%d,%d) header\n", -1, -1);
+            continue;
+        }
+        fprintf (stderr, "  has no fpa data (%d,%d)\n", -1, -1);
+        for (int i = 0; i < fpa->chips->n; i++) {
+            pmChip *chip = fpa->chips->data[i];
+            if (chip->hdu) {
+                if (chip->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, -1);
+                if (chip->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, -1);
+                if (chip->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, -1);
+                if (chip->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, -1);
+                continue;
+            }
+            fprintf (stderr, "  has no chip data (%d,%d)\n", i, -1);
+            for (int j = 0; j < chip->cells->n; j++) {
+                pmCell *cell = chip->cells->data[j];
+                if (cell->hdu) {
+                    if (cell->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, j);
+                    if (cell->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, j);
+                    if (cell->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, j);
+                    if (cell->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, j);
+                    continue;
+                }
+                fprintf (stderr, "  has no cell data (%d,%d)\n", i, j);
+            }
+        }
+    }
+    psFree (iter);
+}

trunk/ppImage/src/ppImage.h

@@ -43 +43 @@
 bool ppImageMosaicFPA (pmConfig *config, char *outFile, char *inFile);
 
+void ppImageFileCheck (pmConfig *config);
+
 #endif

trunk/ppImage/src/ppImageAstrom.c

@@ -20 +20 @@
         input->mode = PM_FPA_MODE_REFERENCE;
 
-        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
+        pmFPAfileDefineOutput (config, input->fpa, "PSASTRO.OUTPUT");
     }
+
+    psastroConvertFPA (input->fpa, recipe);
 
     // interpret the available initial astrometric information
@@ -39 +41 @@
     }
 
+    psastroDataSave (config);
+
+    psFree (refs);
     return true;
 }

trunk/ppImage/src/ppImageCleanup.c

@@ -12 +12 @@
     pmConfigDone();
     pmModelGroupCleanup();
-    // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
-    fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
+    fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
+    // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
     return;
 }

trunk/ppImage/src/ppImageLoop.c

@@ -7 +7 @@
     pmCell *cell;
     pmReadout *readout;
+    psMemId ID;
 
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPIMAGE.INPUT");
@@ -22 +23 @@
         psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
+
+        ID = psMemGetId();
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
 
@@ -36 +39 @@
                 // perform the detrend analysis
                 if (!ppImageDetrendReadout (config, options, view)) return false;
-
+                
                 if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
             }
@@ -50 +53 @@
 
         if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
+
+        fprintf (stderr, "done chip\n");
+        // fprintf (stderr, "found %d leaks at %s\n", psMemCheckLeaks (ID, NULL, stdout, false), "chips");
+        // ppImageFileCheck (config);
     }
 
@@ -57 +64 @@
     // we perform astrometry on all chips after sources have been detected
     if (options->doAstromChip || options->doAstromMosaic) ppImageAstrom (config);
-    
+
     if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
 

trunk/ppImage/src/ppImageMosaic.c

@@ -42 +42 @@
     }
 
+    for (int i = 0; i < in->fpa->chips->n; i++) {
+        pmChip *chip = in->fpa->chips->data[i];
+        for (int j = 0; j < chip->cells->n; j++) {
+            pmCell *cell = chip->cells->data[j];
+            psMetadataPrint (stdout, cell->concepts, 2);
+        }
+    }
+
     pmFPAview *view = pmFPAviewAlloc (0);
     pmFPAAddSourceFromView (out->fpa, view, out->format);

trunk/ppImage/src/ppImagePhotom.c

@@ -31 +31 @@
         input->mode = PM_FPA_MODE_REFERENCE;
 
-        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
+        pmFPAfile *outfile = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
+        outfile->freeLevel = PM_FPA_LEVEL_FPA;
     }
 
@@ -80 +81 @@
             // run the actual photometry analysis
             psphotReadout (config, view);
+            fprintf (stderr, "psphot done\n");
         }
     }