Changeset 42958

Timestamp:

Feb 2, 2026, 2:04:44 PM (3 months ago)

Author:

tdeboer

Message:

merging pswarp changes into ops tag

Location:

tags/ipp-ops-20220906/pswarp/src

Files:

• pswarp.h (modified) (1 diff, 1 prop)
• pswarpArguments.c (modified) (2 diffs, 1 prop)
• pswarpDefineLayout.c (modified) (7 diffs, 1 prop)
• pswarpLoadAstrometry.c (modified) (2 diffs, 1 prop)

tags/ipp-ops-20220906/pswarp/src/pswarp.h

@@ -199 +199 @@
 pswarpBounds *pswarpBoundsAlloc();
 
-bool pswarpLoadAstrometry (pmFPAfile *target, pmFPAfile *astrom, pmConfig *config);
+bool pswarpLoadAstrometry (pmFPAfile *target, pmFPAfile *astrom, pmConfig *config, float *zptObs, float *zptErr);
 
 bool pswarpTransformToTarget (pmFPA *output, pmReadout *input, pmConfig *config, bool backgroundWarp);

tags/ipp-ops-20220906/pswarp/src/pswarpArguments.c

@@ -21 +21 @@
     fprintf(stderr, "    [-mask mask.fits] : provide a corresponding mask image\n");
     fprintf(stderr, "    [-variance variance.fits] : provide a corresponding variance image\n");
+    fprintf(stderr, "    [-skycell_id skycell_id] : input skycell_id\n");
     psErrorStackPrint(stderr, "\n");
     exit(PS_EXIT_CONFIG_ERROR);
@@ -76 +77 @@
         psMetadataAddStr(config->arguments, PS_LIST_TAIL, "STATS", PS_DATA_STRING,
                          "Filename for statistics of output image", argv[N]);
+        psArgumentRemove(N, &argc, argv);
+    }
+    // Skycell id
+    if ((N = psArgumentGet(argc, argv, "-skycell_id"))) {
+        psArgumentRemove(N, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "SKYCELL_ID", PS_DATA_STRING,
+                         "Skycell_id to use", argv[N]);
         psArgumentRemove(N, &argc, argv);
     }

tags/ipp-ops-20220906/pswarp/src/pswarpDefineLayout.c

@@ -11 +11 @@
 # include "pswarp.h"
 
-bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin);
+bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin, float zptObs, float zptErr);
 
 // load the astrometry header info and generate the tranformations 
@@ -17 +17 @@
 
     bool status = false;
+    float zptObs = 0.;
+    float zptErr = 0.;
 
     pmFPAfile *output = psMetadataLookupPtr(&status, config->files, "PSWARP.OUTPUT");
@@ -29 +31 @@
         return false;
     }
-    if (!pswarpLoadAstrometry (output, skycell, config)) {
+    if (!pswarpLoadAstrometry (output, skycell, config,&zptObs,&zptErr)) {
         psError(PSWARP_ERR_CONFIG, false, "problem loading output astrometry\n");
         return false;
     }
+
 
     // if a background model is supplied and the output is requested, then 
@@ -68 +71 @@
             return false;
         }
-        if (!pswarpLoadAstrometry (input, astrom, config)) {
+        if (!pswarpLoadAstrometry (input, astrom, config,&zptObs,&zptErr)) {
             psError(PSWARP_ERR_CONFIG, false, "problem loading input astrometry\n");
             return false;
@@ -126 +129 @@
             pmCell *refcell = pmFPAviewThisCell(view, skycell->fpa); ///< Target cell
 
-            if (!pswarpGenerateOutputCell (chip, cell, refcell, output->xBin, output->yBin)){
+            if (!pswarpGenerateOutputCell (chip, cell, refcell, output->xBin, output->yBin,zptObs,zptErr)){
                 psError(PSWARP_ERR_DATA, false, "failed to generate output cell");
                 psFree(view);
                 return false;
             }
+            
+            //also output the skycell id
+            char *skycell_id = psMetadataLookupStr(&status, config->arguments, "SKYCELL_ID");
+            pmHDU *outHDU = pmHDUFromCell (cell);           ///< HDU for the output warped image
+            psMetadataAddStr (outHDU->header, PS_LIST_TAIL, "SKYCELL_ID", PS_META_REPLACE, "skycell_id",  skycell_id);
 
             if (bkgModel) {
                 pmChip *bkgChip = pmFPAviewThisChip(view, bkgModel->fpa); ///< Target cell
                 pmCell *bkgCell = pmFPAviewThisCell(view, bkgModel->fpa); ///< Target cell
-                if (!pswarpGenerateOutputCell (bkgChip, bkgCell, refcell, bkgModel->xBin, bkgModel->yBin)) {
+                if (!pswarpGenerateOutputCell (bkgChip, bkgCell, refcell, bkgModel->xBin, bkgModel->yBin,zptObs,zptErr)) {
                     psError(PSWARP_ERR_DATA, false, "failed to generate output cell");
                     psFree(view);
@@ -152 +160 @@
 }
 
-bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin) {
+bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin, float zptObs, float zptErr) {
 
     bool status = false;
@@ -197 +205 @@
     pmHDU *outHDU = pmHDUFromCell (cell);           ///< HDU for the output warped image
     outHDU->header = psMetadataCopy(outHDU->header, hdu->header);
+
+    psMetadataAddF32 (outHDU->header, PS_LIST_TAIL, "ZPT_OBS", PS_META_REPLACE, "measured zero point",  zptObs);
+    psMetadataAddF32 (outHDU->header, PS_LIST_TAIL, "ZPT_ERR", PS_META_REPLACE, "error on zero point",  zptErr);
     pswarpVersionHeader(outHDU->header);
     return true;

tags/ipp-ops-20220906/pswarp/src/pswarpLoadAstrometry.c

@@ -14 +14 @@
 // WCS and read the headers.  We place the resulting info on the target astrometry
 // containers
-bool pswarpLoadAstrometry (pmFPAfile *target, pmFPAfile *astrom, pmConfig *config) {
+bool pswarpLoadAstrometry (pmFPAfile *target, pmFPAfile *astrom, pmConfig *config, float *zptObs,float *zptErr) {
 
     pmChip *chip = NULL;
@@ -126 +126 @@
             return false;
         }
+        *zptObs = psMetadataLookupF32 (NULL, hdu->header, "ZPT_OBS");
+        *zptErr = psMetadataLookupF32 (NULL, hdu->header, "ZPT_ERR");
 
         if (bilevelAstrometry) {