Changeset 27989 for trunk/ppSim

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/ppSim/src

Files:

• ppSimCreate.c (modified) (3 diffs)
• ppSimMosaicChip.c (modified) (1 diff)

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);
     }