Changeset 40350

Timestamp:

Feb 26, 2018, 4:04:42 PM (8 years ago)

Author:

mhuber

Message:

merge REFCAT keyword propagation to ppMops

Location:

tags/ipp-20170121/ppTranslate/src

Files:

• ppMops.h (modified) (2 diffs, 1 prop)
• ppMopsRead.c (modified) (4 diffs, 1 prop)
• ppMopsWrite.c (modified) (1 diff, 1 prop)

tags/ipp-20170121/ppTranslate/src/ppMops.h

@@ -9 +9 @@
 #define OUT_EXTNAME "MOPS_TRANSIENT_DETECTIONS" // Extension name for data in output
 #define SOURCE_MASK (PM_SOURCE_MODE_FAIL | PM_SOURCE_MODE_BADPSF | PM_SOURCE_MODE_SATURATED | \
-                     PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_SKY_FAILURE) // Flags to exclude
+                     PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_SKY_FAILURE | PM_SOURCE_MODE_DEFECT) // Flags to exclude
+//#define SOURCE_MASK2 (PM_SOURCE_MODE2_DIFF_WITH_DOUBLE | PM_SOURCE_MODE2_ON_SPIKE | PM_SOURCE_MODE2_ON_STARCORE | PM_SOURCE_MODE2_ON_BURNTOOL | PM_SOURCE_MODE2_ON_CONVPOOR) // Flags2 to exclude
+
+#define SOURCE_MASK2 (PM_SOURCE_MODE2_DIFF_WITH_DOUBLE | PM_SOURCE_MODE2_ON_BURNTOOL | PM_SOURCE_MODE2_ON_STARCORE | \
+                      PM_SOURCE_MODE2_ON_SPIKE)
 
 #define PS1_DV_FORMAT "PS1_DV%d"
@@ -64 +68 @@
   psString fpashutoutc;               // FPA shutoutc 
   psString fpashutcutc;               // FPA shutcutc 
+  psString refcat;                    // Reference catalog used
 } ppMopsDetections;
 

tags/ipp-20170121/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);
 
@@ -229 +230 @@
     psVector *angleV = psMetadataLookupVector(NULL, table, "POSANGLE");
     psVector *flagsV = psMetadataLookupVector(NULL, table, "FLAGS");
+    psVector *flags2V = psMetadataLookupVector(NULL, table, "FLAGS2");
     psVector *xExtErrV = NULL;
     psVector *yExtErrV = NULL;
@@ -240 +242 @@
     }
 
+    //MEH -- diff params, may need skyChipPsfVersion 
+    // -- 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");
+    psVector *rmask = psMetadataLookupVector(NULL, table, "DIFF_NRATIO_MASK");
+    psVector *rall = psMetadataLookupVector(NULL, table, "DIFF_NRATIO_ALL");
+
     double plateScale = 0.0;        // Plate scale
     long numGood = 0;               // Number of good rows
@@ -250 +260 @@
         continue;
       }
+
+      //MEH -- section off flags2 and diffstats cuts to just be for WSdiffs -- 
+      // -- need to test similarity/differences for WW/WS -- have separate block for WW
+      // -- may need to move block
+      if (!strcasecmp(args->difftype, "WS")) {
+        psU64 flags2 = flags2V->data.U64[row]; // table reads in as U64 
+        if (flags2 & SOURCE_MASK2) {
+          psTrace("ppMops.read", 10, "Discarding row %ld from input %d because of flags2: %lud", row, i, flags2);
+          det->mask->data.U8[row] = 0xFF;
+          continue;
+        }
+
+        // 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
+        // DIFF_NPOS>3
+        // DIFF_FRATIO>0.6
+        // DIFF_NRATIO_BAD>0.4
+        // DIFF_NRATIO_MASK>0.4
+        // DIFF_NRATIO_ALL>0.3
+        // -- 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]);
+          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]);
+          det->mask->data.U8[row] = 0xFF;
+          continue;
+        }
+      } 
 
       // Calculate error in RA, Dec

tags/ipp-20170121/ppTranslate/src/ppMopsWrite.c

@@ -104 +104 @@
   psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTOUTC", 0, "Time of exposure open (CHIP mod)", det->fpashutoutc);
   psMetadataAddStr(header, PS_LIST_TAIL, "FPA.SHUTCUTC", 0, "Time of exposure close (RAW)", det->fpashutcutc);
+  psMetadataAddStr(header, PS_LIST_TAIL, "PSREFCAT", 0, "Reference catalog used", det->refcat);
 
   //field in header that tells about the CMF version