Changeset 39290 for trunk

Timestamp:

Dec 18, 2015, 3:07:32 PM (11 years ago)

Author:

eugene

Message:

fix ubercal dist

Location:

trunk/Ohana/src/relphot/src

Files:

• MosaicOps.c (modified) (1 diff)
• setMrelCatalog.c (modified) (3 diffs)

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -720 +720 @@
       image[im].dMcal = mosaic[i].dMcal;
       image[im].Xm = mosaic[i].Xm;
+      image[im].ubercalDist = mosaic[i].ubercalDist;
       image[im].dMagSys = mosaic[i].dMsys;
       image[im].nFitPhotom = mosaic[i].nFitPhotom;

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -74 +74 @@
     }
   }
-
   return (TRUE);
 }
@@ -360 +359 @@
     int minRank = (Nranking > 0) ? results->psfData[Nsec].ranking[0] : 10;
 
+    // when running -averages, we have no information about the images, so we cannot set this
+    if (results->minUbercalDist[Nsec] > -1) {
+      secfilt[Nsec].ubercalDist = results->minUbercalDist[Nsec];
+    }
+
     if (isSetMrelFinal) {
       if ((average[0].objID == TEST_OBJ_ID) && (average[0].catID == TEST_CAT_ID)) {
@@ -367 +371 @@
       // mark the measurements matching this ranking 
       markMeasureByRanking (&results->psfData[Nsec], measure, minRank, ID_MEAS_PHOTOM_PSF);
-
-      // when running -averages, we have no information about the images, so we cannot set this
-      if (results->minUbercalDist[Nsec] > -1) {
-        secfilt[Nsec].ubercalDist = results->minUbercalDist[Nsec];
-      }
 
       if (Nranking) {