Changeset 40518

Timestamp:

Aug 20, 2018, 11:22:14 AM (8 years ago)

Author:

eugene

Message:

accept input mask if supplied vector is an INT

File:

• trunk/Ohana/src/opihi/cmd.astro/fitplx_irls.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/fitplx_irls.c

@@ -89 +89 @@
   if (dDvec->Nelements != Ntotal) ESCAPE ("mis-match in vector lengths (mjd vs dD)  = (%d vs %d)\n", dDvec->Nelements, Ntotal);
   
+  // if mask exists and is an INT, treat as a supplied mask
+  // otherwise, reset
+
   opihi_int *mask = NULL;
   if (mvec) {
-    ResetVector (mvec, OPIHI_INT, Ntotal);
-    mask = mvec->elements.Int;
-    for (i = 0; i < Ntotal; i++) { mask[i] = 1; }
+    if (mvec->type != OPIHI_INT) {
+      ResetVector (mvec, OPIHI_INT, Ntotal);
+      mask = mvec->elements.Int;
+      for (i = 0; i < Ntotal; i++) { mask[i] = 1; }
+    } else {
+      mask = mvec->elements.Int;
+    }
   }