Changeset 41625 for branches/eam_branches/relphot.20210521/src/plot_scatter.c

Timestamp:

May 31, 2021, 11:45:18 AM (5 years ago)

Author:

eugene

Message:

major revision of the flagging and resets. cleanup of old cruft and deprecated flag values

File:

• branches/eam_branches/relphot.20210521/src/plot_scatter.c (modified) (1 diff)

branches/eam_branches/relphot.20210521/src/plot_scatter.c

@@ -28 +28 @@
     N = 0;
     for (i = 0; i < Ncatalog; i++) {
-        for (j = 0; j < catalog[i].Naverage; j++) {
+      for (j = 0; j < catalog[i].Naverage; j++) {
 
-            /* calculate the average value for a single star */
-            if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue;  
-            m = catalog[i].averageT[j].measureOffset;
+        /* calculate the average value for a single star */
+        // if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue;  
+        m = catalog[i].averageT[j].measureOffset;
 
-            for (k = 0; k < catalog[i].averageT[j].Nmeasure; k++, m++) {
-                // skip measurements that do not match the current photcode
-                int ecode = GetPhotcodeEquivCodebyCode (catalog[i].measureT[m].photcode);
-                if (ecode != thisCode) { continue; }
+        for (k = 0; k < catalog[i].averageT[j].Nmeasure; k++, m++) {
+          // skip measurements that do not match the current photcode
+          int ecode = GetPhotcodeEquivCodebyCode (catalog[i].measureT[m].photcode);
+          if (ecode != thisCode) { continue; }
 
-                if (catalog[i].measureT[m].dbFlags & MEAS_BAD) continue;
-                Mcal = getMcal  (m, i, MAG_CLASS_PSF);
-                if (isnan(Mcal)) continue;
-                Mmos = getMmos  (m, i);
-                if (isnan(Mmos)) continue;
-                Mgrid = getMgridTiny (&catalog[i].measureT[m]);
-                if (isnan(Mgrid)) continue;
+          if (catalog[i].measureT[m].dbFlags & MEAS_BAD) continue;
+          Mcal = getMcal  (m, i, MAG_CLASS_PSF);
+          if (isnan(Mcal)) continue;
+          Mmos = getMmos  (m, i);
+          if (isnan(Mmos)) continue;
+          Mgrid = getMgridTiny (&catalog[i].measureT[m]);
+          if (isnan(Mgrid)) continue;
 
-                Mrel = catalog[i].secfilt[Nsecfilt*j+Nsec].MpsfChp;
-                if (isnan(Mrel)) continue;
+          Mrel = catalog[i].secfilt[Nsecfilt*j+Nsec].MpsfChp;
+          if (isnan(Mrel)) continue;
 
-                xlist[N] = Mrel;
-                ylist[N] = PhotSysTiny (&catalog[i].measureT[m], &catalog[i].averageT[j], &catalog[i].secfilt[j*Nsecfilt], MAG_CLASS_PSF) - Mcal - Mmos - Mgrid - Mrel;
-                ilist[N] = PhotInstTiny (&catalog[i].measureT[m], MAG_CLASS_PSF);
-                N++;
-            }
+          xlist[N] = Mrel;
+          ylist[N] = PhotSysTiny (&catalog[i].measureT[m], &catalog[i].averageT[j], &catalog[i].secfilt[j*Nsecfilt], MAG_CLASS_PSF) - Mcal - Mmos - Mgrid - Mrel;
+          ilist[N] = PhotInstTiny (&catalog[i].measureT[m], MAG_CLASS_PSF);
+          N++;
         }
+      }
     }