Changeset 38466 for trunk/Ohana/src/relphot/src/setMrelFinal.c

Timestamp:

Jun 12, 2015, 10:28:36 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

• trunk/Ohana/src/relphot/src/setMrelFinal.c (modified) (4 diffs)

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -12 +12 @@
   int Nsecfilt = GetPhotcodeNsecfilt ();
 
-  /* if we reset the catalog, reset all the current measurements */
+  /*** RESET photometry flags and Mcal values ***/
   if (RESET) {
     // flags used by the photometry analysis (excluding UBERCAL)
@@ -46 +46 @@
       for (i = 0; i < catalog[0].Naverage; i++) {
         off_t N = Nsecfilt*i+Nsec;
-        dvo_secfilt_init (&catalog[0].secfilt[N]);
+        dvo_secfilt_init (&catalog[0].secfilt[N], SECFILT_RESET_ALL);
 
         off_t m = catalog[0].average[i].measureOffset;
@@ -100 +100 @@
   // XXX make this optional? (do not clean for -averages?)
   if (!simpleAverage) clean_measures (catalog, 1, TRUE, flatcorr);    /* mark outliers ID_MEAS_POOR_PHOTOM */
-  for (i = 0; i < 5; i++) {
-    skip_measurements (catalog, i, flatcorr);       /* set ID_MEAS_SKIP for measures to be skipped */
-    setMrelOutput  (catalog, 1, i, flatcorr);    /* set Mrel using remaining measures */
-  }
+
+  ALLOCATE (catalog[0].measureRank, char, catalog[0].Nmeasure);
+  setMeasureRank (catalog);
+  setMrelOutput (catalog, 1, flatcorr);
   if (!simpleAverage) setMcalOutput (catalog, 1, flatcorr);
 
@@ -267 +267 @@
 }
 
-/* dophot types:
-
-1 - star
-2 - galaxy
-3 - star
-4 - weak
-5 - edge
-7 - weak
-9 - weak
-10 - sat
-*/
-
+void setMeasureRank (Catalog *catalog) {
+
+  int i;
+
+  // make these global
+  int IMAGE_BAD  = ID_IMAGE_PHOTOM_NOCAL;
+  int IMAGE_POOR = ID_IMAGE_PHOTOM_POOR | ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_SKIP;
+  int MEAS_BAD   = ID_MEAS_NOCAL        | ID_MEAS_SKIP_PHOTOM;
+  int MEAS_POOR  = ID_MEAS_POOR_PHOTOM  | ID_MEAS_AREA;
+
+  Measure     *measure     = catalog[0].measure;
+  MeasureTiny *measureT    = catalog[0].measureT;
+  char        *measureRank = catalog[0].measureRank;
+
+  /* set measureRank[] based on various quality measurements */
+  for (i = 0; i < catalog[0].Nmeasure; i++) {
+    measureRank[i] = 11; // start at a low rank
+
+    // clear SKIP for all measures at first 
+    measureT[i].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
+    measure [i].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
+
+    // skip measurements without a valid photcode
+    PhotCode *code = GetPhotcodebyCode (measure[i].photcode);
+    if (!code) continue;
+
+    // measurements outside time range have poor rank
+    if (TimeSelect) {
+      if (measure[i].t < TSTART)                     { measureRank[i] = 10; continue; }
+      if (measure[i].t > TSTOP)                      { measureRank[i] = 10; continue; }
+    }
+    
+    // measurements from BAD images and mosaics (not REF mags)
+    off_t Nim = getImageEntry (i, 0);
+    int imageFlags = getImageFlags (i, 0);
+    int mosaicFlags = getMosaicFlags (i, 0);
+
+    if (Nim > -1) {
+      if (imageFlags  & IMAGE_BAD)                   { measureRank[i] = 9; continue; }
+
+      if (mosaicFlags & IMAGE_BAD)                   { measureRank[i] = 9; continue; }
+    
+      // measurements ranked by inst mag limit (not REF mags)
+      if (ImagSelect) {
+        float mag = PhotInst (&measure[i], MAG_CLASS_PSF);
+        if (mag < ImagMin)                           { measureRank[i] = 8; continue; }
+        if (mag > ImagMax)                           { measureRank[i] = 8; continue; }
+      }
+    }
+
+    // RANK 1 : BAD photFlags
+    if (measure[i].dbFlags & MEAS_BAD)               { measureRank[i] = 7; continue; }
+
+    // RANK 3 : BAD photFlags (eg, SAT, CR), internal outliers
+    if (measure[i].photFlags & code->photomBadMask)  { measureRank[i] = 6; continue; }
+
+    if (Nim > -1) {
+      if (imageFlags  & IMAGE_POOR)                  { measureRank[i] = 5; continue; }
+      if (mosaicFlags & IMAGE_POOR)                  { measureRank[i] = 5; continue; }
+    }
+
+    // RANK 2 : psfQF value
+    if (!isfinite(measure[i].psfQF) || measure[i].psfQF < 0.85) { measureRank[i] = 4; continue; }
+        
+    // RANK 1 : POOR photFlags
+    if (measure[i].dbFlags & MEAS_POOR)              { measureRank[i] = 3; continue; }
+
+    // RANK 1 : POOR photFlags
+    if (measure[i].photFlags & code->photomPoorMask) { measureRank[i] = 2; continue; }
+    
+    // RANK 1 : psfQFperfect value
+    if (!isfinite(measure[i].psfQFperf) || measure[i].psfQFperf < 0.85) { measureRank[i] = 1; continue; }
+        
+    // RANK 0 : perfect measurement:
+    measureRank[i] = 0;
+  }
+}