Changeset 38648

Timestamp:

Jul 29, 2015, 1:24:53 PM (11 years ago)

Author:

eugene

Message:

step through measurements using next_meas, not just sequence

Location:

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge

Files:

• include/dvomerge.h (modified) (1 diff)
• src/dvomerge_client.c (modified) (1 diff)
• src/merge_catalogs_old.c (modified) (1 diff)
• src/replace_tycho.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvomerge.h

@@ -241 +241 @@
 
 void replace_tycho_init ();
-int  replace_tycho (Average *averageInp, Measure *measureInp, Average *averageOut, Measure *measureOut);
+int  replace_tycho (Average *averageInp, Measure *measureInp, off_t *next_meas, Average *averageOut, Measure *measureOut);

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -86 +86 @@
   SetPhotcodeTable(NULL);
   
+  if (REPLACE_TYCHO) replace_tycho_init();
+
   dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, IDmap, secfiltMap);
 

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -198 +198 @@
     int Nreplace = 0;
     if (REPLACE_TYCHO) {
-      int Mout = output[0].average[n].measureOffset;  
       int Minp =  input[0].average[N].measureOffset;
-      Nreplace = replace_tycho (&output[0].average[n], &output[0].measure[Mout], &input[0].average[N], &input[0].measure[Minp]);
+      Nreplace = replace_tycho (&output[0].average[n], output[0].measure, next_meas, &input[0].average[N], &input[0].measure[Minp]);
       if (Nreplace == 6) {
         input[0].found_t[N] = Nmeas;

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/replace_tycho.c

@@ -10 +10 @@
 }
 
-int replace_tycho (Average *averageOut, Measure *measureOut, Average *averageInp, Measure *measureInp) {
+int replace_tycho (Average *averageOut, Measure *measureOut, off_t *next_meas, Average *averageInp, Measure *measureInp) {
 
   int i;
@@ -17 +17 @@
   int index[6];
 
+  off_t m = averageOut->measureOffset;
+
   // find all tycho measurements
   for (i = 0; (i < averageOut->Nmeasure) && (Nindex < 6); i++) {
 
+    myAssert (m > -1, "oops");
+
     int valid = FALSE;
-    valid = valid || (measureOut[i].photcode == TYCHO_B);
-    valid = valid || (measureOut[i].photcode == TYCHO_V);
-    if (!valid) continue;
-
-    index[Nindex] = i;
-    Nindex ++;
+    valid = valid || (measureOut[m].photcode == TYCHO_B);
+    valid = valid || (measureOut[m].photcode == TYCHO_V);
+    if (valid) { 
+      index[Nindex] = i;
+      Nindex ++;
+    }
+    m = next_meas[m];
   }