Changeset 41620 for branches/eam_branches/relphot.20210521/src/setMrelCatalog.c

Timestamp:

May 27, 2021, 11:41:52 AM (5 years ago)

Author:

eugene

Message:

consolidate reset operations for clarity

File:

• branches/eam_branches/relphot.20210521/src/setMrelCatalog.c (modified) (2 diffs)

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

@@ -351 +351 @@
   for (Nsec = 0; Nsec < Nsecfilt; Nsec++) {
 
-    // if we detected this object in PS1, or do not request -preserve-ps1, keep the mean photometry values
+    // -preserve-ps1 means keep an existing average PS1 value
+    // if we did not detect this object in PS1, or do not request -preserve-ps1, keep the mean photometry values
     if (!PRESERVE_PS1 || !(secfilt[Nsec].flags & ID_SECF_HAS_PS1)) {
       dvo_secfilt_init (&secfilt[Nsec], SECFILT_RESET_CHIP); // this does not reset astrometry or STACK bits
@@ -606 +607 @@
 
     // reset all stack-related values for this secfilt:
-    secfilt[Nsec].stackBestOff = -1;
-    secfilt[Nsec].stackPrmryOff = -1;
-    secfilt[Nsec].FpsfStk   = NAN;
-    secfilt[Nsec].dFpsfStk  = NAN;
-    secfilt[Nsec].FkronStk  = NAN;
-    secfilt[Nsec].dFkronStk = NAN;
-    secfilt[Nsec].FapStk    = NAN;
-    secfilt[Nsec].dFapStk   = NAN;
-    secfilt[Nsec].MpsfStk   = NAN;
-    secfilt[Nsec].MkronStk  = NAN;
-    secfilt[Nsec].MapStk    = NAN;
-    secfilt[Nsec].Nstack    = 0;
-    secfilt[Nsec].NstackDet = 0;
-    secfilt[Nsec].flags    &= ~ID_SECF_STACK_FLAGS; // reset the stack flags
+    dvo_secfilt_init (&secfilt[Nsec], SECFILT_RESET_STACK);
 
     for (off_t k = 0; k < Nmeasure; k++) {