Changeset 34878

Timestamp:

Dec 27, 2012, 1:41:44 PM (14 years ago)

Author:

eugene

Message:

failed to manage NULL average,measure values (use Tiny versions)

File:

• trunk/Ohana/src/relphot/src/setMrelCatalog.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -48 +48 @@
 
   for (j = 0; j < catalog[Nc].Naverage; j++) {
-    off_t m = catalog[Nc].average[j].measureOffset;
-    setMrelAverageExposure (m, Nc, pass, flatcorr, results, &catalog[Nc].average[j], &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m], &catalog[Nc].measureT[m], &catalog[Nc].found[Nsecfilt*j]);
+    // we are guaranteed to have averageT, but not average
+    off_t m = catalog[Nc].averageT[j].measureOffset;
+    Average *average = catalog[Nc].average ? &catalog[Nc].average[j] : NULL;
+    Measure *measure = catalog[Nc].measure ? &catalog[Nc].measure[m] : NULL;
+    setMrelAverageExposure (m, Nc, pass, flatcorr, results, average, &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], measure, &catalog[Nc].measureT[m], &catalog[Nc].found[Nsecfilt*j]);
 
     // only apply Stack operation on setMrelFinal in first pass