Changeset 36410 for branches/bills_branches/bills_201312/psphot/src/psphotFullForceSummary.c

Timestamp:

Dec 24, 2013, 1:28:04 PM (13 years ago)

Author:

bills

Message:

progress on fulLforceSummary implementation. in psphotFullForce set
modelEXT to the nominal model so that those paramters are available in fullForceSummary

File:

• branches/bills_branches/bills_201312/psphot/src/psphotFullForceSummary.c (modified) (6 diffs)

branches/bills_branches/bills_201312/psphot/src/psphotFullForceSummary.c

@@ -140 +140 @@
     psFree(outputFPA);                        // Drop reference
     if (!output) {
-        psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.OUTPUT"));
+        psError(psErrorCodeLast(), false, _("Unable to generate output file from PSPHOT.OUTPUT"));
         return false;
     }
@@ -183 +183 @@
         return NULL;
     }
-#ifdef notdef
-    pmHDU *lastHDU = NULL;              // Last HDU updated
-#endif
 
     // files associated with the science image
@@ -196 +193 @@
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
-        psLogMsg ("psphotFullForceSummary", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+//        psLogMsg ("psphotFullForceSummary", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (! chip->process || ! chip->file_exists) { continue; }
 
@@ -233 +230 @@
         // there is now only a single chip (multiple readouts?). loop over it and process
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
-            psLogMsg ("psphotFullForceSummary", 5, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+ //           psLogMsg ("psphotFullForceSummary", 5, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                psLogMsg ("psphotFullForceSummary", 6, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+//                psLogMsg ("psphotFullForceSummary", 6, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
                 if (! readout->data_exists) { continue; }
 
-#ifdef notdef
-                pmHDU *hdu = pmHDUGetHighest(input->fpa, chip, cell);
-                if (hdu && hdu != lastHDU) {
-                    // XXX: need to do this
-                    // psphotVersionHeaderFull(hdu->header);
-                    lastHDU = hdu;
-                }
-#endif
                 if (!psphotFullForceSummaryReadout(config, view)) {
                     ESCAPE ("failure in psphotFullForceSummaryReadout");
@@ -257 +246 @@
 
 
-    // If these keywords are not set we get a warning message on output.
+    // If these keywords are not set we get a warning message on output. Since we are not copying the input header
+    // and do not have an image pmFPA stuff doesn't have values for these
+    // XXX: What other keywords and concepts should be set (or copied)?
     int numCols = psMetadataLookupS32(&status, input->fpa->hdu->header, "IMNAXIS1");
     int numRows = psMetadataLookupS32(&status, input->fpa->hdu->header, "IMNAXIS2");
     psMetadataAddS32(output->fpa->hdu->header, PS_LIST_TAIL, "IMNAXIS1", PS_META_REPLACE, "", numCols);
     psMetadataAddS32(output->fpa->hdu->header, PS_LIST_TAIL, "IMNAXIS2", PS_META_REPLACE, "", numRows);
-    // XXX: What other keywords and concepts should be set (or copied)?
+
+    // XXX: Also add psphot version information
 
     if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE ("failed pmFPAfileIOChecks for FPA in psphot.");
@@ -270 +262 @@
 
     psFree (view);
+
     return true;
 }