Changeset 6325

Timestamp:

Feb 6, 2006, 11:03:25 AM (20 years ago)

Author:

gusciora

Message:

These changes mostly reflect the new psStats SDRS changes.

However, pmObject.c will fail any real test because the call
to psMinimizeLMM() was commented out due to SDRS changes there.

Location:

trunk/psModules

Files:

• src/config/pmConfig.c (modified) (2 diffs)
• src/imcombine/pmReadoutCombine.c (modified) (4 diffs)
• src/imsubtract/pmSubtractBias.c (modified) (3 diffs)
• src/imsubtract/pmSubtractSky.c (modified) (2 diffs)
• src/objects/pmObjects.c (modified) (3 diffs)
• test/config/tst_pmConfig.c (modified) (2 diffs)
• test/config/verified/tst_pmConfig.stderr (modified) (1 diff)
• test/config/verified/tst_pmConfig.stdout (modified) (1 diff)
• test/imcombine/verified/tst_pmImageCombine.stdout (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-02 04:51:14 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -449 +449 @@
     }
 
-    dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
+
+
+    psDB *dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
     psFree(dbServer);
     psFree(dbUsername);

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:19:25 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -410 +410 @@
     psRegion minRegion;
     psRegion maxRegion;
-    psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
-    psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
+    psStats *minStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
+    psStats *maxStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
     psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
@@ -445 +445 @@
         }
 
-        fp->midValue = 0.5 * (maxStats->robustMean + minStats->robustMean);
-        fp->delta = maxStats->robustMean - minStats->robustMean;
+        fp->midValue = 0.5 * (maxStats->fittedMean + minStats->fittedMean);
+        fp->delta = maxStats->fittedMean - minStats->fittedMean;
         diffs->data.F32[i] = fp->delta;
     }
@@ -455 +455 @@
     psFree(diffs);
     if (diffStats == NULL) {
-        psError(PS_ERR_UNKNOWN, true, "Could not determine robust median of the differences.\n");
+        psError(PS_ERR_UNKNOWN, true, "Could not determine fitted median of the differences.\n");
         return(NULL);
     }

trunk/psModules/src/imsubtract/pmSubtractBias.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -179 +179 @@
     psStatsOptions opt = 0;
 
-    if (stat->options & PS_STAT_ROBUST_MODE) {
-        if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MODE;
-        }
-        numOptions++;
-    }
-
+    /*
+        if (stat->options & PS_STAT_ROBUST_MODE) {
+            if (numOptions == 0) {
+                opt = PS_STAT_ROBUST_MODE;
+            }
+            numOptions++;
+        }
+    */
     if (stat->options & PS_STAT_ROBUST_MEDIAN) {
         if (numOptions == 0) {
@@ -193 +194 @@
     }
 
-    if (stat->options & PS_STAT_ROBUST_MEAN) {
+    if (stat->options & PS_STAT_FITTED_MEAN) {
         if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MEAN;
+            opt = PS_STAT_FITTED_MEAN;
         }
         numOptions++;

trunk/psModules/src/imsubtract/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
     } else if (statOptions & PS_STAT_CLIPPED_MEAN) {
         return(PS_STAT_CLIPPED_MEAN);
-    } else if (statOptions & PS_STAT_ROBUST_MEAN) {
-        return(PS_STAT_ROBUST_MEAN);
+    } else if (statOptions & PS_STAT_FITTED_MEAN) {
+        return(PS_STAT_FITTED_MEAN);
     } else if (statOptions & PS_STAT_ROBUST_MEDIAN) {
         return(PS_STAT_ROBUST_MEDIAN);
-    } else if (statOptions & PS_STAT_ROBUST_MODE) {
-        return(PS_STAT_ROBUST_MODE);
     }
     psError(PS_ERR_UNKNOWN, true, "Unallowable option requested for statistically binning image pixels.\n");
     return(-1);
+    // XXX
+    //else if (statOptions & PS_STAT_ROBUST_MODE) {
+    //    return(PS_STAT_ROBUST_MODE);
+    //}
 }
 

trunk/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:19:25 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1653 +1653 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+
+    /* XXXX: Must change this:
+        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y,
+                                     yErr, modelFunc);
+    */
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])
@@ -1819 +1823 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+    /* XXXX: Must change this:
+        fitStatus = psMinimizeLMChi2(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+    */
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i])

trunk/psModules/test/config/tst_pmConfig.c

@@ -13 +13 @@
  * pmConfigDB()
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
     str[0] = "ARGS:";
     str[1] = "-site";
-    str[2] = "SampleIPPConfig";
+    str[2] = "data/SampleIPPConfig";
 
     psMetadata *site = psMetadataAlloc();

trunk/psModules/test/config/verified/tst_pmConfig.stderr

@@ -22 +22 @@
     Error: *argc is 0 or less.
 <HOST>|I|readConfig
-    Loading site configuration from file SampleIPPConfig
+    Loading site configuration from file data/SampleIPPConfig
 
 ---> TESTPOINT PASSED (Test Point Driver{pmConfig:} | tst_pmConfig.c)

trunk/psModules/test/config/verified/tst_pmConfig.stdout

@@ -16 +16 @@
 Calling pmConfigRead() with negative argc.  Should generate ERROR, return false.
 ----------------------------------------------------------------
+Calling pmConfigRead() with acceptable arguments.

trunk/psModules/test/imcombine/verified/tst_pmImageCombine.stdout

@@ -19 +19 @@
 Calling with a NULL stats.  Should generate error, return NULL.
 Calling with acceptable data.  Should generate a psImage.
+Image 0, questionable pixel 0 is (1.000000 2.000000)
+Image 0, questionable pixel 1 is (4.000000 5.000000)
 Image 1, questionable pixel 0 is (0.000000 8.000000)
 Image 1, questionable pixel 1 is (1.000000 2.000000)
-Image 1, questionable pixel 2 is (3.000000 9.000000)
-Image 1, questionable pixel 3 is (4.000000 5.000000)
-Image 1, questionable pixel 4 is (3.000000 8.000000)
-Image 2, questionable pixel 0 is (9.000000 9.000000)
-Image 2, questionable pixel 1 is (0.000000 5.000000)
-Image 2, questionable pixel 2 is (6.000000 2.000000)
-Image 2, questionable pixel 3 is (3.000000 7.000000)
+Image 1, questionable pixel 2 is (9.000000 9.000000)
+Image 1, questionable pixel 3 is (3.000000 9.000000)
+Image 1, questionable pixel 4 is (4.000000 5.000000)
+Image 1, questionable pixel 5 is (3.000000 8.000000)
+Image 2, questionable pixel 0 is (1.000000 2.000000)
+Image 2, questionable pixel 1 is (9.000000 9.000000)
+Image 2, questionable pixel 2 is (0.000000 5.000000)
+Image 2, questionable pixel 3 is (6.000000 2.000000)
+Image 2, questionable pixel 4 is (3.000000 7.000000)
 Image 3, questionable pixel 0 is (7.000000 5.000000)
+Image 4, questionable pixel 0 is (3.000000 8.000000)
 
 
 
 Calling pmRejectPixels() with acceptable data.  Should generate a psArray.
-tst_pmImageCombine.c: Image 0 had 0 rejects.
+tst_pmImageCombine.c: Image 0 had 2 rejects.
+Image 0, rejected pixel 0 is (1.000000 2.000000)
+Image 0, rejected pixel 1 is (4.000000 5.000000)
 tst_pmImageCombine.c: Image 1 had 4 rejects.
 Image 1, rejected pixel 0 is (0.000000 8.000000)
@@ -39 +46 @@
 Image 1, rejected pixel 2 is (4.000000 5.000000)
 Image 1, rejected pixel 3 is (3.000000 8.000000)
-tst_pmImageCombine.c: Image 2 had 3 rejects.
-Image 2, rejected pixel 0 is (0.000000 5.000000)
-Image 2, rejected pixel 1 is (6.000000 2.000000)
-Image 2, rejected pixel 2 is (3.000000 7.000000)
+tst_pmImageCombine.c: Image 2 had 4 rejects.
+Image 2, rejected pixel 0 is (1.000000 2.000000)
+Image 2, rejected pixel 1 is (0.000000 5.000000)
+Image 2, rejected pixel 2 is (6.000000 2.000000)
+Image 2, rejected pixel 3 is (3.000000 7.000000)
 tst_pmImageCombine.c: Image 3 had 1 rejects.
 Image 3, rejected pixel 0 is (7.000000 5.000000)
-tst_pmImageCombine.c: Image 4 had 0 rejects.
+tst_pmImageCombine.c: Image 4 had 1 rejects.
+Image 4, rejected pixel 0 is (3.000000 8.000000)