Changeset 5621 for trunk/archive/scripts/src/phase2/papPhase2.c

Timestamp:

Nov 28, 2005, 2:27:22 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmChipMosaic

File:

• trunk/archive/scripts/src/phase2/papPhase2.c (modified) (9 diffs)

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

@@ -16 +16 @@
 #include "pmNonLinear.h"
 #include "pmSubtractBias.h"
+#include "pmChipMosaic.h"
 
 // Phase 2 needs to:
@@ -81 +82 @@
 #endif
 
-    psTraceSetLevel("pmConfigCameraFromHeader", 10);
+    psTimerStart("phase2");
 
     // Parse the configurations
@@ -276 +277 @@
         psLogMsg("phase2", PS_LOG_INFO, "Operating only on chip %d\n", chipNum);
     }
+
+    psLogMsg("phase2", PS_LOG_INFO, "Setup completed after %f sec.\n", psTimerMark("phase2"));
 
     // Read in the input pixels
@@ -447 +450 @@
     }
     
+    psLogMsg("phase2", PS_LOG_INFO, "Input completed after %f sec.\n", psTimerMark("phase2"));
+
     psArray *inputChips = input->chips; // Array of chips in input image
     psArray *biasChips = bias->chips;   // Array of chips in bias image
@@ -766 +771 @@
                 // XXX: Temporary: until the other functions are altered to do this themselves.
                 // Trim, so that flat, fringe etc computations are faster.
+#if 0
 #ifndef PRODUCTION
                 psRegion *trimRegion = psMetadataLookupPtr(NULL, inputCell->concepts, "CELL.TRIMSEC");
@@ -772 +778 @@
                 inputReadout->image = trimmed;
 #endif
-
+#endif
                 // Flat-field correction
                 if (doFlat) {
@@ -804 +810 @@
                 }
 
+
             } // Iterating over readouts
         } // Iterating over cells
+
+        // Testing pmChipMosaic
+        {
+            psImage *mosaic = pmChipMosaic(inputChip, 1, 1); // Mosaic of chip
+            psFits *mosaicFile = psFitsAlloc("mosaic.fits"); // FITS file to which to write
+            psFitsWriteImage(mosaicFile, NULL, mosaic, 0);
+            psFree(mosaicFile);
+            psFree(mosaic);             
+        }
+ 
     } // Iterating over chips
+
+    psLogMsg("phase2", PS_LOG_INFO, "Processing completed after %f sec.\n", psTimerMark("phase2"));
 
     // Write the output
@@ -812 +831 @@
     pmFPAWriteMask(input, outputFile);
     pmFPAWriteWeight(input, outputFile);
+
+    psLogMsg("phase2", PS_LOG_INFO, "Output completed after %f sec.\n", psTimerMark("phase2"));
 
 #ifdef PRODUCTION
@@ -831 +852 @@
     psFree(overscanFit);
     psFree(overscanStats);
+
+    psLogMsg("phase2", PS_LOG_INFO, "Cleanup completed after %f sec.\n", psTimerMark("phase2"));
+    psTimerStop();
 
 #if 1