Changeset 34051 for branches/eam_branches/ipp-20120601/psphot/src

Timestamp:

Jun 21, 2012, 6:51:32 AM (14 years ago)

Author:

eugene

Message:

changes needed for pedantic gcc

Location:

branches/eam_branches/ipp-20120601/psphot/src

Files:

• Makefile.am (modified) (2 diffs)
• psphotCleanup.c (modified) (1 diff)
• psphotMakeResiduals.c (modified) (1 diff)
• psphotPetrosianStats.c (modified) (3 diffs)
• psphotReadoutCleanup.c (modified) (1 diff)
• psphotSignificanceImage.c (modified) (3 diffs)

branches/eam_branches/ipp-20120601/psphot/src/Makefile.am

@@ -183 +183 @@
         psphotSourcePlots.c            \
         psphotRadialPlot.c             \
-        psphotKronMasked.c             \
         psphotKronIterate.c            \
         psphotRadialProfileWings.c     \
@@ -209 +208 @@
         psphotSetNFrames.c
 
-# re-instate these
+# not currently used
 #       psphotIsophotal.c              \
 #       psphotAnnuli.c                 \
 #       psphotKron.c                   \
+#       psphotKronMasked.c             \
 #
 

branches/eam_branches/ipp-20120601/psphot/src/psphotCleanup.c

@@ -29 +29 @@
 psExit psphotGetExitStatus (void) {
 
-    psErrorCode err = psErrorCodeLast ();
+    // gcc -Wswitch complains here if err is declared as type psErrorCode
+    // the collection of ps*ErrorCode values are enums defined separately for 
+    // each module (psphot, pswarp, etc).  the lowest type, psErrorCode is only the base set and does
+    // not include the possible psphot values
+
+    // for now, to get around this, we just use an int for the switch
+
+    // psErrorCode err = psErrorCodeLast ();
+    int err = psErrorCodeLast ();
     switch (err) {
       case PS_ERR_NONE:

branches/eam_branches/ipp-20120601/psphot/src/psphotMakeResiduals.c

@@ -177 +177 @@
 
                 mflux = 0;
-                bool offImage = false;
                 if (psImageInterpolate (&flux, &dflux, &mflux, ix, iy, interp) == PS_INTERPOLATE_STATUS_OFF) {
                     // This pixel is off the image
-                    offImage = true;
                     fmasks->data.PS_TYPE_VECTOR_MASK_DATA[i] = badMask;
                 } else {

branches/eam_branches/ipp-20120601/psphot/src/psphotPetrosianStats.c

@@ -46 +46 @@
 
     bool anyPetro = false;
-    bool manyPetro = false;
+    // bool manyPetro = false;  XXX not used
     bool above = true;
     float Asum = 0.0;
@@ -122 +122 @@
             }
             above = false;
-            if (anyPetro) manyPetro = true;
+            // if (anyPetro) manyPetro = true;
             anyPetro = true;
         }
@@ -212 +212 @@
     source->extpars->petrosianR50    = R50;
     source->extpars->petrosianR90    = R90;
-    source->extpars->petrosianFill      = petApix / petArea;
+    source->extpars->petrosianFill   = petApix / petArea;
     
     // XXX add the errors

branches/eam_branches/ipp-20120601/psphot/src/psphotReadoutCleanup.c

@@ -7 +7 @@
 
     // remove internal pmFPAfiles, if created
-    if (psErrorCodeLast() == PSPHOT_ERR_DATA) {
+    if (psErrorCodeLast() == (psErrorCode) PSPHOT_ERR_DATA) {
         psErrorStackPrint(stderr, "Error in the psphot readout analysis");
         psErrorClear();

branches/eam_branches/ipp-20120601/psphot/src/psphotSignificanceImage.c

@@ -8 +8 @@
     float SIGMA_SMTH, NSIGMA_SMTH;
     bool status = false;
-    bool guess = false;
 
     // smooth the image and variance map
@@ -35 +34 @@
         SIGMA_SMTH  = 0.5*(fwhmMajor + fwhmMinor) / (2.0*sqrt(2.0*log(2.0)));
         NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA");
-        guess = false;
     } else {
         // if we do not know the FWHM, use the guess smoothing kernel supplied.
@@ -43 +41 @@
         NSIGMA_SMTH = psMetadataLookupF32 (&status, recipe, "PEAKS_SMOOTH_NSIGMA");
         PS_ASSERT (status, NULL);
-        guess = true;
     }
     // record the actual smoothing sigma