Changeset 5621

Timestamp:

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

Author:

Paul Price

Message:

Adding pmChipMosaic

Location:

trunk/archive/scripts/src/phase2

Files:

• Makefile (modified) (1 diff)
• gpc1_raw.config (added)
• ipprc.config (modified) (1 diff)
• megacam_raw.config (modified) (3 diffs)
• nonlin.dat (added)
• papPhase2.c (modified) (9 diffs)
• phase2.config (modified) (1 diff)
• pmChipMosaic.c (added)
• pmChipMosaic.h (added)
• pmFPAConceptsGet.c (modified) (2 diffs)
• pmFPAConceptsSet.c (modified) (1 diff)
• pmFPAMorph.c (modified) (1 diff)

trunk/archive/scripts/src/phase2/Makefile

@@ -12 +12 @@
 
 OBJS = papPhase2.o psAdditionals.o pmConfig.o pmFPA.o pmFPAConstruct.o papStuff.o pmFPARead.o                \
-        pmFPAConceptsGet.o pmFPAConceptsSet.o pmFPAWrite.o                                                   \
+        pmFPAConceptsGet.o pmFPAConceptsSet.o pmFPAWrite.o pmChipMosaic.o                                    \
         pmFlatField.o pmMaskBadPixels.o pmNonLinear.o pmSubtractBias.o
 TARGET = papPhase2

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

@@ -22 +22 @@
 LOGDEST STR     STDOUT                          # Log destination
 TRACE           METADATA                        # Trace levels
-        pmConfigRead            S32     10
         pap                     S32     10
-        pmFPAWriteMask          S32     10
-        pmFPAWriteWeight        S32     10
-        p_pmFPATranslateName    S32     10
+#       pmConfigRead            S32     10
+#       pmFPAWriteMask          S32     10
+#       pmFPAWriteWeight        S32     10
+        pmChipMosaic            S32     10
 END

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

@@ -98 +98 @@
                 CELL.TRIMSEC            STR     DATASEC
                 CELL.XPARITY            S32     1 # We could have specified this as a DEFAULT, but this works
+                CELL.X0                 S32     1
+                CELL.Y0                 S32     1
         END
         right   METADATA        # Right amplifier
@@ -105 +107 @@
                 CELL.TRIMSEC            STR     DATASEC
                 CELL.XPARITY            S32     -1 # This cell is read out in the opposite direction
+                CELL.X0                 S32     2048
+                CELL.Y0                 S32     1
         END
 END
@@ -153 +157 @@
         CELL.TIME       STR     MJD
 #       CELL.BINNING    STR     SEPARATE
+        CELL.X0         STR     FORTRAN
+        CELL.Y0         STR     FORTRAN
 END
 

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

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

@@ -6 +6 @@
 BIAS            BOOL    FALSE           # Bias subtraction
 DARK            BOOL    FALSE           # Dark subtraction
-OVERSCAN        BOOL    FALSE           # Overscan subtraction
+OVERSCAN        BOOL    TRUE            # Overscan subtraction
 FLAT            BOOL    FALSE           # Flat-field normalisation
 FRINGE          BOOL    FALSE           # Fringe subtraction

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

@@ -344 +344 @@
           case PS_TYPE_S32:
             value = item->data.S32;
+            break;
+          case PS_TYPE_F32:
+            psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) should be S32, but is F32 --- converting.\n",
+                     name, comment);
+            value = (int)item->data.F32;
+            break;
+          case PS_TYPE_F64:
+            psLogMsg(__func__, PS_LOG_WARN, "Concept %s (%s) should be S32, but is F64 --- converting.\n",
+                     name, comment);
+            value = (int)item->data.F64;
             break;
           default:
@@ -977 +987 @@
     }
 
+    // These are new and experimental concepts: CELL.X0 and CELL.Y0
+
+    // CELL.X0
+    p_pmFPAConceptGetS32(fpa, chip, cell, db, cell->concepts, "CELL.X0", "Position of (0,0) on the chip ");
+    // CELL.Y0
+    p_pmFPAConceptGetS32(fpa, chip, cell, db, cell->concepts, "CELL.Y0", "Position of (0,0) on the chip");
+    // Add corrective
+    {
+        const psMetadata *camera = fpa->camera;
+        bool mdok = false;              // Result of MD lookup
+        psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
+        if (mdok && formats) {
+            psString format = psMetadataLookupString(&mdok, formats, "CELL.X0");
+            if (mdok && strlen(format) > 0 && strcasecmp(format, "FORTRAN") == 0) {
+                psMetadataItem *cellx0 = psMetadataLookup(cell->concepts, "CELL.X0");
+                cellx0->data.S32 -= 1;
+            }
+            format = psMetadataLookupString(&mdok, formats, "CELL.Y0");
+            if (mdok && strlen(format) > 0 && strcasecmp(format, "FORTRAN") == 0) {
+                psMetadataItem *celly0 = psMetadataLookup(cell->concepts, "CELL.Y0");
+                celly0->data.S32 -= 1;
+            }
+        }
+    }
+
     // Pau.
 }

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

@@ -856 +856 @@
     }
 
+    // Remove corrective
+    {
+        const psMetadata *camera = fpa->camera;
+        bool mdok = false;              // Result of MD lookup
+        psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
+        if (mdok && formats) {
+            psString format = psMetadataLookupString(&mdok, formats, "CELL.X0");
+            if (mdok && strlen(format) > 0 && strcasecmp(format, "FORTRAN") == 0) {
+                psMetadataItem *cellx0 = psMetadataLookup(cell->concepts, "CELL.X0");
+                cellx0->data.S32 += 1;
+            }
+            format = psMetadataLookupString(&mdok, formats, "CELL.Y0");
+            if (mdok && strlen(format) > 0 && strcasecmp(format, "FORTRAN") == 0) {
+                psMetadataItem *celly0 = psMetadataLookup(cell->concepts, "CELL.Y0");
+                celly0->data.S32 += 1;
+            }
+        }
+    }
+    // CELL.X0
+    setConcept(fpa, chip, cell, db, cell->concepts, "CELL.X0");
+    // CELL.Y0
+    setConcept(fpa, chip, cell, db, cell->concepts, "CELL.Y0");
+
     // Pau.
 }

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

@@ -68 +68 @@
 }
 
-
+// Splice a list of cells together
 static psArray *spliceCells(psList *outCells, // List of target cells (required for parity info)
                             psList *inCells, // List of cells to splice together