Changeset 29181

Timestamp:

Sep 21, 2010, 1:44:37 PM (16 years ago)

Author:

bills

Message:

Unused secfilt entries were not getting initialized properly

File:

• trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (2 diffs)

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -317 +317 @@
     objID ++;
 
+    for (j = 0; j < NsecfiltOut; j++) {
+        int outputIndex = (Nave * NsecfiltOut) + j;
+        output[0].secfilt[outputIndex].M     = NAN;
+        output[0].secfilt[outputIndex].dM    = NAN;
+        output[0].secfilt[outputIndex].Xm    = NAN_S_SHORT;
+        output[0].secfilt[outputIndex].M_20  = NAN_S_SHORT;
+        output[0].secfilt[outputIndex].M_80  = NAN_S_SHORT;
+        output[0].secfilt[outputIndex].Ncode = 0;
+        output[0].secfilt[outputIndex].Nused = 0;
+    }
+
     for (j = 0; j < NsecfiltIn; j++) {
       int outputIndex;
@@ -333 +344 @@
         output[0].secfilt[outputIndex].Ncode = input[0].secfilt[N*NsecfiltIn+j].Ncode;
         output[0].secfilt[outputIndex].Nused = input[0].secfilt[N*NsecfiltIn+j].Nused;
-      } else {
-        output[0].secfilt[outputIndex].M     = NAN;
-        output[0].secfilt[outputIndex].dM    = NAN;
-        output[0].secfilt[outputIndex].Xm    = NAN_S_SHORT;
-        output[0].secfilt[outputIndex].M_20  = NAN_S_SHORT;
-        output[0].secfilt[outputIndex].M_80  = NAN_S_SHORT;
-        output[0].secfilt[outputIndex].Ncode = 0;
-        output[0].secfilt[outputIndex].Nused = 0;
       }
     }