Changeset 27840 for branches/simtest_nebulous_branches/magic/censorObjects/src/censorLoop.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• magic (modified) (1 prop)
• magic/censorObjects/src/censorLoop.c (modified) (4 diffs)

branches/simtest_nebulous_branches/magic

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

branches/simtest_nebulous_branches/magic/censorObjects/src/censorLoop.c

@@ -22 +22 @@
  */
 bool censorLoop (pmConfig *config) {
-
     pmChip *chip;
     pmCell *cell;
@@ -28 +27 @@
 
     psTimerStart ("censor");
+
+
+
 
     // select the current recipe
@@ -51 +53 @@
 
     pmFPAview *view = pmFPAviewAlloc (0);
+
     bool badMaskFile = false;
 
@@ -59 +62 @@
     if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
+    // check PHU header to see if we are using mosaic-level or per-chip astrometry
+    bool bilevelAstrometry = false;
+    pmHDU *phu = pmFPAviewThisPHU (view, input->fpa);
+    if (phu) {
+      char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+      if (ctype) bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
+    }
+    if (bilevelAstrometry) {
+      pmAstromReadBilevelMosaic (input->fpa, phu->header);
+    } 
+
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psTrace ("censor", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-
+        
         // check on the mask file at this level if possible
         badMaskFile = censorBadFileByView(badMaskFile, inMask, config, view);
 
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
+
+        // read WCS data from the corresponding header
+
+        pmHDU *hdu = pmFPAviewThisHDU (view, input->fpa);
+        
+        if (bilevelAstrometry) {
+          if (!pmAstromReadBilevelChip (chip, hdu->header)) {
+            psWarning("Could not get WCS information from header for chip %d, skipping", view->chip); 
+            continue;
+          }
+        } else {
+          if (!pmAstromReadWCS(input->fpa, chip, hdu->header, 1.0)) {
+            psWarning( "Unable to read WCS astrometry from chip %d, skipping", view->chip);
+            continue;
+          }
+        }
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak