Changeset 38153 for trunk/Ohana/src/relphot

Timestamp:

Apr 18, 2015, 6:33:51 AM (11 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20150405: add R7 to lensing, fix R5,R6,R7 definitions and mean photometry; calculate E1,E2 in dvolens; fix precision for dvopsps FW objects; fix histograms at axis; new colormap options; require primary skycell in diff mean photometry

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/relphot/src/setMrelCatalog.c (modified) (1 diff)

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

@@ -756 +756 @@
 
       if (IS_DIFF_DB) {
-        if (!MatchImageSkycellID (meas, cat, priTessID, priProjID, priSkycellID)) continue;
+        if (MatchImageSkycellID (meas, cat, priTessID, priProjID, priSkycellID)) {
+          measure[k].dbFlags |= ID_MEAS_STACK_PRIMARY;
+        } else {
+          continue;
+        }
       } else {
         if (!MatchImageSkycellID (meas, cat, stkTessID, stkProjID, stkSkycellID)) continue;