Changeset 40265 for branches/eam_branches/ohana.20170822

Timestamp:

Dec 9, 2017, 10:18:58 AM (9 years ago)

Author:

eugene

Message:

fix measure offset problem; add option to use PSF not KRON for stack McalAPER

File:

• branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c (modified) (4 diffs)

branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c

@@ -2 +2 @@
 
 # if (0)
-# define TEST_OBJ_ID 0x0000000e
-# define TEST_CAT_ID 0x000076ee
+# define TEST_OBJ_ID 0x000098f9 
+# define TEST_CAT_ID 0x00005ad3
 # else
 # define TEST_OBJ_ID 0
@@ -688 +688 @@
 
     off_t meas = bestEntryMax;
+    off_t measSeq = meas + measureOffset;
+
     myAssert (meas >= 0, "this should not happen");
 
@@ -695 +697 @@
     
     // match measurement to its image (this is just a check, right?)
-    if (getImageEntry (meas, cat) < 0) {
+    if (getImageEntry (measSeq, cat) < 0) {
       // measurements without an image are either external reference photometry or
       // data for which the associated image has not been loaded (probably because of
@@ -704 +706 @@
       Mgrid    = 0.0;
     } else {
-      McalPSF   = getMcal  (meas, cat, MAG_CLASS_PSF);
-      McalAPER  = USE_MCAL_PSF_FOR_STACK_APER ? getMcal  (meas, cat, MAG_CLASS_PSF) : getMcal  (meas, cat, MAG_CLASS_KRON);
-      Mmos      = getMmos  (meas, cat);
-      Mgrid     = getMgrid (meas, cat);
+      McalPSF   = getMcal  (measSeq, cat, MAG_CLASS_PSF);
+      McalAPER  = USE_MCAL_PSF_FOR_STACK_APER ? getMcal  (measSeq, cat, MAG_CLASS_PSF) : getMcal  (measSeq, cat, MAG_CLASS_KRON);
+      Mmos      = getMmos  (measSeq, cat);
+      Mgrid     = getMgrid (measSeq, cat);
     }