Changeset 27989

Timestamp:

May 17, 2010, 5:49:51 PM (16 years ago)

Author:

Paul Price

Message:

Removing the 'FPA.OBS' concept (once called 'FPA.NAME'). The original idea was to provide a bit of protection against user error --- not reading a flat into an FPA containing an image, etc. However, that's not really necessary, and there's not always a nice keyword that we can use that is the exposure number or something like that, and so we end up with a lot of unneccessary warnings. Better to do away with it completely. It's not used for anything except that check.

Location:

trunk

Files:

• ppImage/src/ppImageMosaic.c (modified) (2 diffs)
• ppMerge/src/ppMergeCamera.c (modified) (4 diffs)
• ppSim/src/ppSimCreate.c (modified) (3 diffs)
• ppSim/src/ppSimMosaicChip.c (modified) (1 diff)
• ppStack/src/ppStackCamera.c (modified) (4 diffs)
• psModules/src/camera/pmFPAConstruct.c (modified) (11 diffs)
• psModules/src/camera/pmFPAConstruct.h (modified) (2 diffs)
• psModules/src/camera/pmFPAfileFitsIO.c (modified) (1 diff)
• psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)
• psphot/src/psphotMosaicChip.c (modified) (1 diff)
• pstamp/src/ppstampMakeStamp.c (modified) (3 diffs)
• pstamp/src/ppstampMosaic.c (modified) (1 diff)
• pswarp/src/pswarpDefine.c (modified) (1 diff)

trunk/ppImage/src/ppImageMosaic.c

@@ -25 +25 @@
     pmChip *inChip = pmFPAviewThisChip(view, in->fpa);
     if (!outChip->hdu && !outChip->parent->hdu) {
-        const char *name = psMetadataLookupStr(&status, in->fpa->concepts, "FPA.OBS"); // Name of FPA
-        pmFPAAddSourceFromView(out->fpa, name, view, out->format);
+        pmFPAAddSourceFromView(out->fpa, view, out->format);
     }
 
@@ -66 +65 @@
     #endif
 
-    const char *name = psMetadataLookupStr(&status, in->fpa->concepts, "FPA.OBS"); // Name of FPA
-
     pmFPAview *view = pmFPAviewAlloc(0);
-    pmFPAAddSourceFromView(out->fpa, name, view, out->format);
+    pmFPAAddSourceFromView(out->fpa, view, out->format);
     psFree(view);
 

trunk/ppMerge/src/ppMergeCamera.c

@@ -19 +19 @@
                 const char *name,       ///< Name of output file
                 pmFPAfileType type,     ///< Type of file
-                const char *description, ///< Description of file
                 psMetadata *format,     ///< Camera format
                 pmFPAview *view         ///< View for PHU
@@ -84 +83 @@
     output->save = true;
 
-    if (!pmFPAAddSourceFromView(fpa, description, view, format)) {
+    if (!pmFPAAddSourceFromView(fpa, view, format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
         return false;
@@ -337 +336 @@
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;
-        break;
+        break;
       default:
         psAbort("Unknown frame type: %x", type);
     }
 
-    if (!outputFile(config, outName, fileType, "Merged detrend", format, phuView)) {
+    if (!outputFile(config, outName, fileType, format, phuView)) {
         psFree(outName);
         psFree(phuView);
@@ -349 +348 @@
     psFree(outName);
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, "Merge sigma", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;
     }
 
-    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, "Merged count", format, phuView)) {
+    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", PM_FPA_FILE_IMAGE, format, phuView)) {
         psFree(phuView);
         return false;

trunk/ppSim/src/ppSimCreate.c

@@ -198 +198 @@
 
     if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+        if (!pmFPAAddSourceFromView(fpa, view, output->format)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
             psFree(fpa);
@@ -209 +209 @@
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
         if (phuLevel == PM_FPA_LEVEL_CHIP) {
-            if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+            if (!pmFPAAddSourceFromView(fpa, view, output->format)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                 psFree(fpa);
@@ -220 +220 @@
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             if (phuLevel == PM_FPA_LEVEL_CELL) {
-                if (!pmFPAAddSourceFromView(fpa, "Simulation", view, output->format)) {
+                if (!pmFPAAddSourceFromView(fpa, view, output->format)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                     psFree(fpa);

trunk/ppSim/src/ppSimMosaicChip.c

@@ -22 +22 @@
     pmChip *inChip = pmFPAviewThisChip(view, in->fpa);
     if (!outChip->hdu && !outChip->parent->hdu) {
-        const char *name = psMetadataLookupStr(&status, in->fpa->concepts, "FPA.OBS"); // Name of FPA
-        pmFPAAddSourceFromView(out->fpa, name, view, out->format);
+        pmFPAAddSourceFromView(out->fpa, view, out->format);
     }
 

trunk/ppStack/src/ppStackCamera.c

@@ -252 +252 @@
     output->save = true;
 
-    if (!pmFPAAddSourceFromFormat(outFPA, "Stack", output->format)) {
+    if (!pmFPAAddSourceFromFormat(outFPA, output->format)) {
         psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
         return false;
@@ -302 +302 @@
     exp->save = true;
 
-    if (!pmFPAAddSourceFromFormat(expFPA, "Stack", exp->format)) {
+    if (!pmFPAAddSourceFromFormat(expFPA, exp->format)) {
         psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
         return false;
@@ -369 +369 @@
     unConv->save = true;
 
-    if (!pmFPAAddSourceFromFormat(unconvFPA, "Stack", unConv->format)) {
+    if (!pmFPAAddSourceFromFormat(unconvFPA, unConv->format)) {
         psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
         return false;
@@ -419 +419 @@
     unconvExp->save = true;
 
-    if (!pmFPAAddSourceFromFormat(unconvExpFPA, "Stack", unconvExp->format)) {
+    if (!pmFPAAddSourceFromFormat(unconvExpFPA, unconvExp->format)) {
         psError(psErrorCodeLast(), false, "Unable to generate output FPA.");
         return false;

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -100 +100 @@
 
     return num;
-}
-
-// Get the name of a PHU chip or cell from the header
-static psString phuNameFromHeader(const char *name, // The name to lookup: "CELL.NAME" or "CHIP.NAME"
-                                  const psMetadata *fileInfo, // FILE within the camera format description
-                                  const psMetadata *header // Primary header
-                                 )
-{
-    assert(name && strlen(name) > 0);
-    assert(fileInfo);
-    assert(header);
-
-    bool mdok = true;                   // Result of MD lookup
-    psString keyword = psMetadataLookupStr(&mdok, fileInfo, name);
-    if (!mdok || strlen(keyword) == 0) {
-        return false;
-    }
-    psMetadataItem *resultItem = psMetadataLookup(header, keyword);
-    if (!resultItem) {
-        psError(PS_ERR_IO, true, "Unable to find %s in primary header to identify %s.\n", keyword, name);
-        return NULL;
-    }
-    return psMetadataItemParseString(resultItem);
 }
 
@@ -1102 +1079 @@
 // It returns a view corresponding to the PHU
 static pmFPAview *addSource(pmFPA *fpa,       // The FPA
-                            const char *fpaObs, // The desired FPA observation name
                             const pmFPAview *phuView, // The view corresponding to the PHU, or NULL
                             const psMetadata *header, // The PHU header, or NULL
@@ -1114 +1090 @@
 
     bool mdok;                          // Status of MD lookup
-
-    // If FPA.OBS is already defined, new name must match it; otherwise, warn the user that something
-    // potentially bad is happening.
-    if (fpaObs && install) {
-        const char *currentName = psMetadataLookupStr(&mdok, fpa->concepts, "FPA.OBS"); // Current name
-        if (mdok && currentName && strlen(currentName) > 0 && strcmp(currentName, fpaObs) != 0) {
-            psWarning("FPA.OBS for new source (%s) doesn't match FPA.OBS for current fpa (%s).",
-                      fpaObs, currentName);
-        }
-        psMetadataAddStr(fpa->concepts, PS_LIST_HEAD, "FPA.OBS", PS_META_REPLACE, "Observation identifier",
-                         fpaObs);
-    } else if (!psMetadataLookup(fpa->concepts, "FPA.OBS")) {
-        // Make sure there is an FPA.OBS
-        psMetadataAddStr(fpa->concepts, PS_LIST_HEAD, "FPA.OBS", 0, "Observation identifier", "UNKNOWN");
-    }
 
     psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
@@ -1350 +1311 @@
 }
 
-bool pmFPAAddSourceFromFormat(pmFPA *fpa, const char *fpaObs, const psMetadata *format)
+bool pmFPAAddSourceFromFormat(pmFPA *fpa, const psMetadata *format)
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
@@ -1359 +1320 @@
     pmFPAview *view = pmFPAviewAlloc(0);// View for current level
     if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, fpaObs, view, format)) {
+        if (!pmFPAAddSourceFromView(fpa, view, format)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
             psFree(view);
@@ -1368 +1329 @@
         while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
             if (phuLevel == PM_FPA_LEVEL_CHIP) {
-                if (!pmFPAAddSourceFromView(fpa, fpaObs, view, format)) {
+                if (!pmFPAAddSourceFromView(fpa, view, format)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                     psFree(view);
@@ -1377 +1338 @@
                 while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
                     if (phuLevel == PM_FPA_LEVEL_CELL) {
-                        if (!pmFPAAddSourceFromView(fpa, fpaObs, view, format)) {
+                        if (!pmFPAAddSourceFromView(fpa, view, format)) {
                             psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
                             psFree(view);
@@ -1392 +1353 @@
 }
 
-bool pmFPAAddSourceFromView(pmFPA *fpa, const char *fpaObs, const pmFPAview *phuView,
+bool pmFPAAddSourceFromView(pmFPA *fpa, const pmFPAview *phuView,
                             const psMetadata *format)
 {
@@ -1399 +1360 @@
     PS_ASSERT_PTR_NON_NULL(format, false);
 
-    pmFPAview *view = addSource(fpa, fpaObs, phuView, NULL, format, true);
+    pmFPAview *view = addSource(fpa, phuView, NULL, format, true);
     bool status = (view != NULL);
     psFree(view);
@@ -1418 +1379 @@
     }
 
-    // Check the name of the FPA
-    psString fpaObs = phuNameFromHeader("FPA.OBS", fileInfo, phu); // New observation name for the FPA
-    if (!fpaObs || strlen(fpaObs) == 0) {
-        psWarning("Unable to determine FPA.OBS: check for FPA.OBS in FILE in camera format");
-    }
-
-    pmFPAview *view = addSource(fpa, fpaObs, NULL, phu, format, true); // View of PHU, to return
-    psFree(fpaObs);
+    pmFPAview *view = addSource(fpa, NULL, phu, format, true); // View of PHU, to return
 
     return view;
@@ -1437 +1391 @@
     PS_ASSERT_PTR_NON_NULL(format, NULL);
 
-    return addSource(fpa, NULL, NULL, phu, format, false);
+    return addSource(fpa, NULL, phu, format, false);
 }
 

trunk/psModules/src/camera/pmFPAConstruct.h

@@ -29 +29 @@
 /// This is suitable for generating an output FPA given the desired format.
 bool pmFPAAddSourceFromFormat(pmFPA *fpa, ///< The FPA
-                              const char *fpaObs, ///< FPA.NAME for the source
                               const psMetadata *format ///< Format of file
     );
@@ -38 +37 @@
 /// configuration is required in order to describe how the FPA is laid out in terms of disk files.
 bool pmFPAAddSourceFromView(pmFPA *fpa,   ///< The FPA
-                            const char *fpaObs, ///< FPA.NAME for the source
                             const pmFPAview *phuView, ///< The view, corresponding to the PHU
                             const psMetadata *format ///< Format of file

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -75 +75 @@
     }
 
-    pmFPA *nameSource = file->src; // Source of FPA.OBS
-    if (!nameSource) {
-        nameSource = file->fpa;
-    }
-    bool mdok;                  // Status of MD lookup
-    const char *fpaObs = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.OBS"); // Observation id
-
     pmFPA *copy = pmFPAConstruct(file->camera, file->cameraName);  // FPA to return
-    if (!pmFPAAddSourceFromView(copy, fpaObs, phuView, file->format)) {
+    if (!pmFPAAddSourceFromView(copy, phuView, file->format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to insert HDU into FPA for writing.\n");
         psFree(copy);

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -286 +286 @@
             }
 
-            pmFPA *nameSource = file->src; // Source of FPA.OBS
-            if (!nameSource) {
-                nameSource = file->fpa;
-            }
-            bool mdok;                  // Status of MD lookup
-            const char *fpaObs = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.OBS"); // Obs. id
-
-            pmFPAAddSourceFromView(file->fpa, fpaObs, view, format);
+            pmFPAAddSourceFromView(file->fpa, view, format);
             psTrace ("psModules.camera", 5, "created fpa data elements for %s (%s) (%d:%d:%d)\n",
                      file->name, file->name, view->chip, view->cell, view->readout);

trunk/psphot/src/psphotMosaicChip.c

@@ -21 +21 @@
     pmChip *inChip = pmFPAviewThisChip(view, in->fpa);
     if (!outChip->hdu && !outChip->parent->hdu) {
-        const char *name = psMetadataLookupStr(&status, in->fpa->concepts, "FPA.OBS"); // Name of FPA
-        pmFPAAddSourceFromView(out->fpa, name, view, out->format);
+        pmFPAAddSourceFromView(out->fpa, view, out->format);
     }
 

trunk/pstamp/src/ppstampMakeStamp.c

@@ -36 +36 @@
     double d_before = check->sky->d;
     psLogMsg("ppstampMakeStamp", 2, "Before fit  Center Pixel RA: %f   DEC: %f (degrees)\n",
-             r_before * PS_DEG_RAD, d_before * PS_DEG_RAD);
+             r_before * PS_DEG_RAD, d_before * PS_DEG_RAD);
 
     if (outFPA->toSky->type != PS_PROJ_TAN) {
-        // we need to make astrometry terms for the output which are centered on the output chip center,
-        // but we keep the original plate scale
-        psFree(outFPA->toSky);
-        outFPA->toSky = psProjectionAlloc (r_before, d_before, inFPA->toSky->Xs, inFPA->toSky->Ys, PS_PROJ_TAN);
-
-        if (!pmAstromLinearizeToSky(inFPA, inChip, outFPA, outChip, roi)) {
+        // we need to make astrometry terms for the output which are centered on the output chip center,
+        // but we keep the original plate scale
+        psFree(outFPA->toSky);
+        outFPA->toSky = psProjectionAlloc (r_before, d_before, inFPA->toSky->Xs, inFPA->toSky->Ys, PS_PROJ_TAN);
+
+        if (!pmAstromLinearizeToSky(inFPA, inChip, outFPA, outChip, roi)) {
             psFree(check);
             psError(PS_ERR_UNKNOWN, false, "Failed to linearize astrometry\n");
@@ -56 +56 @@
 
         psLogMsg("ppstampMakeStamp", 2, "After fit:  Center Pixel RA: %f   DEC: %f (degrees)\n",
-                 r_after * PS_DEG_RAD, d_after * PS_DEG_RAD);
-        psLogMsg("ppstampMakeStamp", 2, "Error in fit to astrometry %.2f    %.2f (arcseconds)\n", 
-                 (r_after - r_before) *  PS_DEG_RAD * 3600, (d_after - d_before) * PS_DEG_RAD * 3600);
+                 r_after * PS_DEG_RAD, d_after * PS_DEG_RAD);
+        psLogMsg("ppstampMakeStamp", 2, "Error in fit to astrometry %.2f    %.2f (arcseconds)\n",
+                 (r_after - r_before) *  PS_DEG_RAD * 3600, (d_after - d_before) * PS_DEG_RAD * 3600);
 
         // XXX: should we fail if the fit is bad ??
@@ -238 +238 @@
         return PS_EXIT_DATA_ERROR;
     }
-    char *fpaName = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.OBS"); // Name of FPA
     pmFPAview *outview = pmFPAviewAlloc(0);
-    pmFPAAddSourceFromView(output->fpa, fpaName, outview, output->format);
+    pmFPAAddSourceFromView(output->fpa, outview, output->format);
 
     outview->chip = 0;

trunk/pstamp/src/ppstampMosaic.c

@@ -24 +24 @@
     pmChip  *inChip = pmFPAviewThisChip(view, input->fpa);
     if (!mChip->hdu && !mChip->parent->hdu) {
-        const char *name = psMetadataLookupStr(&status, input->fpa->concepts, "FPA.OBS"); // Name of FPA
-        pmFPAAddSourceFromView(mosaic->fpa, name, mosaicView, mosaic->format);
+        pmFPAAddSourceFromView(mosaic->fpa, mosaicView, mosaic->format);
     }
     psFree(mosaicView);

trunk/pswarp/src/pswarpDefine.c

@@ -124 +124 @@
     }
 
-    const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.OBS"); ///< Name of FPA
     view->chip = view->cell = view->readout = -1;
-    pmFPAAddSourceFromView(output->fpa, name, view, output->format);
+    pmFPAAddSourceFromView(output->fpa, view, output->format);
 
     psFree (view);