Changeset 7636

Timestamp:

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

Author:

eugene

Message:

adding psastroConvertFPA,psastroConvertReadout

Location:

trunk/psastro/src

Files:

• psastro.h (modified) (1 diff)
• psastroConvert.c (modified) (1 diff)
• psastroDataLoad.c (modified) (1 diff)

trunk/psastro/src/psastro.h

@@ -19 +19 @@
 bool              psastroDataSave (pmConfig *config);
 
-bool              psastroConvert (pmReadout *readout, psMetadata *recipe);
+bool              psastroConvertFPA (pmFPA *fpa, psMetadata *recipe);
+bool              psastroConvertReadout (pmReadout *readout, psMetadata *recipe);
 psArray          *pmSourceToAstromObj (psArray *sources);
 bool              psastroAstromGuess (pmConfig *config);

trunk/psastro/src/psastroConvert.c

@@ -2 +2 @@
 // XXX leak free 2006.04.27
 
+bool psastroConvertFPA (pmFPA *fpa, psMetadata *recipe) {
+
+    pmChip *chip;
+    pmCell *cell;
+    pmReadout *readout;
+    pmFPAview *view = pmFPAviewAlloc (0);
+ 
+    while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
+        psTrace (__func__, 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+        if (!chip->process || !chip->file_exists) { continue; }
+
+        while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
+            psTrace (__func__, 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+            if (!cell->process || !cell->file_exists) { continue; }
+
+            // process each of the readouts
+            while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
+                if (! readout->data_exists) { continue; }
+
+                psastroConvertReadout (readout, recipe);
+            }
+        }
+    }
+    psFree (view);
+    return true;
+}
+
 // XXX pass/apply the WCS information?
-bool psastroConvert (pmReadout *readout, psMetadata *recipe) {
+bool psastroConvertReadout (pmReadout *readout, psMetadata *recipe) {
 
     psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");

trunk/psastro/src/psastroDataLoad.c

@@ -51 +51 @@
                 if (! readout->data_exists) { continue; }
 
-                psastroConvert (readout, recipe);
+                psastroConvertReadout (readout, recipe);
 
                 pmFPAfileIOChecks (config, view, PM_FPA_AFTER);