Changeset 40483 for branches/czw_branch/20170908/ppTranslate/src/ppMopsRead.c

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMopsRead.c (modified) (4 diffs)

branches/czw_branch/20170908/ppTranslate/src/ppMopsRead.c

@@ -107 +107 @@
     det->fpashutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTOUTC"));
     det->fpashutcutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "FPA.SHUTCUTC"));
+    det->refcat = psMemIncrRefCounter(psMetadataLookupStr(NULL, header, "PSREFCAT"));
     psFree(header);
 
@@ -242 +243 @@
 
     //MEH -- diff params, may need skyChipPsfVersion 
-    psVector *npos = psMetadataLookupVector(NULL, table, "DIFF_NPOS");
+    // -- unclear for npos, remove for now
+    //psVector *npos = psMetadataLookupVector(NULL, table, "DIFF_NPOS");
     psVector *fpos = psMetadataLookupVector(NULL, table, "DIFF_FRATIO");
     psVector *rbad = psMetadataLookupVector(NULL, table, "DIFF_NRATIO_BAD");
@@ -270 +272 @@
         }
 
-        // add diff params to discard -- needs to be in config.. -- WSdiff only?
+        // MEH -- add diff params to discard -- needs to be in config.. -- WSdiff only?
         // -- needs to be finite to test but unclear if should reject (probably)
         // -- using Napoli 2013 to start with
@@ -278 +280 @@
         // DIFF_NRATIO_MASK>0.4
         // DIFF_NRATIO_ALL>0.3
-        // -- unclear about npos still -- 
+        // -- unclear about npos still -- so remove from check 
         //if (npos->data.S32[row]<=3 ||
         if (!isfinite(fpos->data.F32[row]) || !isfinite(rbad->data.F32[row]) || !isfinite(rmask->data.F32[row]) || !isfinite(rall->data.F32[row])) {
-           psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row],fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
+           //psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row],fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
+          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of NAN diff params: 3, 0.6, 0.4, 0.4, 0.3:  %g %f %f %f ", row, i, fpos->data.F32[row],rbad->data.F32[row],rmask->data.F32[row],rall->data.F32[row]);
           det->mask->data.U8[row] = 0xFF;
           continue;
         }
         if (fpos->data.F32[row]<=0.6 || rbad->data.F32[row]<=0.4 || rmask->data.F32[row]<=0.4 || rall->data.F32[row]<=0.3) {
-          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ",
-                  row, i, npos->data.S32[row], fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
+          //psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %d %g %f %f %f ", row, i, npos->data.S32[row], fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
+          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of diff params: 3, 0.6, 0.4, 0.4, 0.3: %g %f %f %f ", row, i, fpos->data.F32[row], rbad->data.F32[row], rmask->data.F32[row], rall->data.F32[row]);
           det->mask->data.U8[row] = 0xFF;
           continue;