Changeset 40349

Timestamp:

Feb 26, 2018, 4:04:36 PM (8 years ago)

Author:

mhuber

Message:

merge missing REFCAT keywords for warps+diffs

Location:

tags/ipp-20170121

Files:

• ppSub/src/ppSubDefineOutput.c (modified) (1 diff, 1 prop)
• pswarp/src/pswarpLoop.c (modified) (2 diffs, 1 prop)
• pswarp/src/pswarpLoopBackground.c (modified) (2 diffs, 1 prop)
• pswarp/src/pswarpUpdateMetadata.c (modified) (2 diffs, 1 prop)

tags/ipp-20170121/ppSub/src/ppSubDefineOutput.c

@@ -198 +198 @@
     psMetadataAddStr(tgtHeader, PS_LIST_TAIL, keyword, PS_META_REPLACE, "input image", string);
   }
+
+  // Copy PSREFCAT from the source to the target as well
+  snprintf(keyword, 80, "PSREFCAT");
+  char *string = psMetadataLookupStr(&status, srcHeader, keyword);
+  if (status) {
+    psMetadataAddStr(tgtHeader, PS_LIST_TAIL, keyword, PS_META_REPLACE, "input image reference catalog", string);
+  }
+  
   return true;
 }

tags/ipp-20170121/pswarp/src/pswarpLoop.c

@@ -58 +58 @@
     }
 
+    psString refcat = NULL;
     // loop over this section once per input group
     for (int i = 0; i < nInputs; i++) {
@@ -121 +122 @@
                             psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY, "Sources from input astrometry", detections);
                         }
+
+                        // Determine the reference catalog used
+                        if (!refcat) {
+                          refcat = psMetadataLookupStr(NULL, astromRO->parent->parent->hdu->header, "PSREFCAT");
+                          psMetadataAddStr(output->fpa->analysis, PS_LIST_TAIL, "REFERENCE_CATALOG", PS_META_REPLACE, "Reference catalog used for calibration.", refcat);
+                        }
+
+                        
                     }
 

tags/ipp-20170121/pswarp/src/pswarpLoopBackground.c

@@ -62 +62 @@
     pmFPAfileActivate(config->files, true, "PSWARP.BKGMODEL");
 
+    psString refcat = NULL;
     // loop over this section once per input group
     for (int i = 0; i < nInputs; i++) {
@@ -134 +135 @@
                     }
 
+                    if (astrom != input) {
+                      pmReadout *astromRO = pmFPAviewThisReadout(view, astrom->fpa); // Readout for astrometry
+                      if (!refcat) {
+                        refcat = psMetadataLookupStr(NULL, astromRO->parent->parent->hdu->header, "PSREFCAT");
+
+                        psMetadataAddStr(output->fpa->analysis, PS_LIST_TAIL, "REFERENCE_CATALOG", PS_META_REPLACE, "Reference catalog used for calibration.", refcat);
+                      }
+                    }
+                    
                     // re-normalize the BKGMODEL pixels by modified astrometry
                     for (int x = 0; x < readout->image->numCols; x++) {

tags/ipp-20170121/pswarp/src/pswarpUpdateMetadata.c

@@ -20 +20 @@
     bool bilevelAstrometry = psMetadataLookupBool (NULL, skycell->analysis, "ASTROMETRY.BILEVEL");
 
+    psString refcat = psMetadataLookupStr (NULL, output->analysis, "REFERENCE_CATALOG");
     pmChip *chip;
     while ((chip = pmFPAviewNextChip (view, output, 1)) != NULL) {
@@ -165 +166 @@
     }
 
+    if (refcat) {
+      psMetadataAddStr(output->hdu->header, PS_LIST_TAIL, "PSREFCAT", PS_META_REPLACE, "Reference catalog used for calibration", refcat);
+    }
+    
     // apply the bilevel astrometry elements to the target
     if (bilevelAstrometry) {