Changeset 34044 for branches/eam_branches/ipp-20120601/psModules/src/objects

Timestamp:

Jun 20, 2012, 6:58:23 AM (14 years ago)

Author:

eugene

Message:

fixes to address compile time errors due to pedantic gcc warnings

Location:

branches/eam_branches/ipp-20120601/psModules/src/objects

Files:

• pmSource.c (modified) (3 diffs)
• pmSourceIO_CMP.c (modified) (4 diffs)
• pmSourceIO_PS1_CAL_0.c (modified) (4 diffs)
• pmSourceIO_SMPDATA.c (modified) (4 diffs)
• pmSourceIO_SX.c (modified) (2 diffs)

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSource.c

@@ -1098 +1098 @@
         if (!addNoise && !addModelVar) source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
     }
+    if (!status) {
+        // XXX maybe raise an error or warning?
+    }
 
     return true;
@@ -1166 +1169 @@
         status = pmModelSubWithOffset (target, source->maskObj, model, mode, maskVal, dx, dy);
     }
+    if (!status) {
+        // XXX raise an error or warning?
+    }
 
     // restore original values
@@ -1253 +1259 @@
     } else {
         status = pmModelSubWithOffset (target, source->maskObj, model, mode, maskVal, dx, dy);
+    }
+    if (!status) {
+        // XXX raise an error or warning?
     }
 

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourceIO_CMP.c

@@ -65 +65 @@
     int i, type;
     // psMetadataItem *mdi;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     float lsky = 0;
     bool status;
@@ -130 +130 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         type = pmSourceGetDophotType (source);
@@ -174 +173 @@
     bool status;
     int Ninstar;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
 
@@ -273 +272 @@
 
             PAR = source->modelPSF->params->data.F32;
-            dPAR = source->modelPSF->dparams->data.F32;
 
             PAR[PM_PAR_SKY] = pow (atof (array->data[5]), 10.0);

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

@@ -322 +322 @@
 }
 
+# define WRITE_AP_DATA 0
+
 bool pmSourcesWrite_PS1_CAL_0_XSRC (psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe)
 {
@@ -338 +340 @@
     }
 
+# if (WRITE_AP_DATA)
     bool calMags = false;
     bool status1 = false;
@@ -350 +353 @@
         calMags = true;
     }
+# endif
 
     // create a header to hold the output data
@@ -424 +428 @@
         psMetadataAdd (row, PS_LIST_TAIL, "Y_EXT_SIG",        PS_DATA_F32, "Sigma in EXT y coordinate",                  yErr);
 
-# if (0)
+# if (WRITE_AP_DATA)
         // Petrosian measurements
         // XXX insert header data: petrosian ref radius, flux ratio

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourceIO_SMPDATA.c

@@ -63 +63 @@
     psMetadata *row;
     int i;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     bool status;
     psEllipseAxes axes;
@@ -85 +85 @@
         if (model != NULL) {
             PAR = model->params->data.F32;
-            dPAR = model->dparams->data.F32;
             xPos = PAR[PM_PAR_XPOS];
             yPos = PAR[PM_PAR_YPOS];
@@ -145 +144 @@
 
     bool status;
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
     float lsky;
@@ -176 +175 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         psMetadata *row = table->data[i];

branches/eam_branches/ipp-20120601/psModules/src/objects/pmSourceIO_SX.c

@@ -56 +56 @@
     PS_ASSERT_PTR_NON_NULL(filename, false);
 
-    psF32 *PAR, *dPAR;
+    psF32 *PAR;
     psEllipseAxes axes;
 
@@ -77 +77 @@
 
         PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
 
         // pmSourceSextractType (source, &type, &flags);