Changeset 33963 for trunk/Ohana/src/relphot/src/ImageOps.c

Timestamp:

May 30, 2012, 1:46:12 PM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120405

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/relphot/src/ImageOps.c (modified) (14 diffs)

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -41 +41 @@
 
 // relationships between the measure,catalog set and the images:
-static IDX_T       **MeasureToImage; // image index from measure,catalog   : MeasureToImage[cat][meas] = ImageIndex
-static IDX_T       **ImageToCatalog; // catalog for given measure on image : ImageCatalog[ImageIndex][i] = cat (i : 0 < NonImage[ImageIndex])
-static IDX_T       **ImageToMeasure; // measure for given measure on image : ImageMeasure[ImageIndex][i] = cat (i : 0 < NonImage[ImageIndex])
+static IDX_T       **MeasureToImage = NULL; // image index from measure,catalog   : MeasureToImage[cat][meas] = ImageIndex
+static IDX_T       **ImageToCatalog = NULL; // catalog for given measure on image : ImageCatalog[ImageIndex][i] = cat (i : 0 < NonImage[ImageIndex])
+static IDX_T       **ImageToMeasure = NULL; // measure for given measure on image : ImageMeasure[ImageIndex][i] = cat (i : 0 < NonImage[ImageIndex])
 
 // MeasureToImage was 'bin'
@@ -322 +322 @@
   off_t i;
 
+  if (!MeasureToImage) return -1;
+
   i = MeasureToImage[cat][meas];
   return (i);
@@ -355 +357 @@
   short distance;
 
+  if (!MeasureToImage) return -1;
+
   i = MeasureToImage[cat][meas];
   if (i == -1) return (1000);
@@ -395 +399 @@
   float Msys, Mrel, Mmos, Mgrid, Mflat;
   double *list, *dlist, *Mlist, *dMlist;
+
   StatType stats;
+  liststats_setmode (&stats, STATMODE);
 
   if (FREEZE_IMAGES) return;
@@ -514 +520 @@
     }
 
-    liststats (list, dlist, N, &stats);
+    // no additional weight modification (we treat all stars on an image equally -- note an image is either ubercal-tied or not)
+    liststats (list, dlist, NULL, N, &stats);
     image[i].Mcal  = stats.mean;
     image[i].dMcal = stats.error;
@@ -523 +530 @@
 
     // bright end scatter
-    liststats (Mlist, dMlist, Nbright, &stats);
+    liststats (Mlist, dMlist, NULL, Nbright, &stats);
     image[i].dMagSys = stats.sigma;
 
@@ -556 +563 @@
   double *mlist, *slist, *dlist;
   double MaxOffset, MaxScatter, MedOffset;
-  StatType stats;
 
   if (FREEZE_IMAGES) return;
@@ -574 +580 @@
     N++;
   }
-  initstats ("MEAN");
-  liststats (mlist, dlist, N, &stats);
+
+  // use a straight mean to find the global image statistics (no weighting)
+  StatType stats;
+  liststats_setmode (&stats, "MEAN");
+
+  liststats (mlist, dlist, NULL, N, &stats);
   MaxOffset = MAX (IMAGE_OFFSET, 3*stats.sigma);
   MedOffset = stats.median;
-  liststats (slist, dlist, N, &stats);
+
+  liststats (slist, dlist, NULL, N, &stats);
   MaxScatter = MAX (IMAGE_SCATTER, 2*stats.median);
   fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", MedOffset, stats.median, MaxScatter, MaxOffset);
@@ -599 +610 @@
 
   fprintf (stderr, "%d images marked poor\n", Nmark);
-  initstats (STATMODE);
   free (mlist);
   free (slist);
@@ -720 +730 @@
   double *list, *dlist;
   float Mcal, Mmos, Mgrid;
+
   StatType stats;
-
   bzero (&stats, sizeof (StatType));
   if (FREEZE_IMAGES) return (stats);
@@ -751 +761 @@
   }
 
-  liststats (list, dlist, n, &stats);
+  liststats_setmode (&stats, "MEAN");
+
+  liststats (list, dlist, NULL, n, &stats);
   free (list);
   free (dlist);
@@ -779 +791 @@
   }
 
-  liststats (list, dlist, n, &stats);
+  liststats_setmode (&stats, "MEAN");
+
+  liststats (list, dlist, NULL, n, &stats);
   free (list);
   free (dlist);
@@ -807 +821 @@
   }
 
-  liststats (list, dlist, n, &stats);
+  liststats_setmode (&stats, "MEAN");
+
+  liststats (list, dlist, NULL, n, &stats);
   free (list);
   free (dlist);
@@ -835 +851 @@
   }
 
-  liststats (list, dlist, n, &stats);
+  liststats_setmode (&stats, "MEAN");
+
+  liststats (list, dlist, NULL, n, &stats);
   free (list);
   free (dlist);