Changeset 37099

Timestamp:

Jul 22, 2014, 2:52:22 PM (12 years ago)

Author:

eugene

Message:

drop old char-based primary cell name

Location:

branches/eam_branches/ipp-20140717/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/setMrelCatalog.c (modified) (5 diffs)

branches/eam_branches/ipp-20140717/Ohana/src/relphot/include/relphot.h

@@ -451 +451 @@
 int setMrel_catalog_alt (Catalog *catalog, int Nc, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, int Nsecfilt);
 int setMrelAverageExposure (off_t meas, int cat, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, AverageTiny *averageT, SecFilt *secfilt, Measure *measure, MeasureTiny *measureT, off_t *found);
-int setMrelAverageStack (off_t meas, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure, char *primaryCell);
+int setMrelAverageStack (off_t meas, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure);
 int setGlobalObjStats (Average *average, Measure *measure);
 

branches/eam_branches/ipp-20140717/Ohana/src/relphot/src/setMrelCatalog.c

@@ -50 +50 @@
   int isSetMrelFinal = (pass >= 0);
 
-  char *primaryCell = NULL;
-  if (isSetMrelFinal) {
-    ALLOCATE (primaryCell, char, DVO_MAX_PATH);
-  }
+  // XX char *primaryCell = NULL;
+  // XX if (isSetMrelFinal) {
+  // XX   ALLOCATE (primaryCell, char, DVO_MAX_PATH);
+  // XX }
 
   for (j = 0; j < catalog[Nc].Naverage; j++) {
@@ -64 +64 @@
     // only apply Stack operation on setMrelFinal in first pass 
     if (isSetMrelFinal && (pass == 0)) {
-      setMrelAverageStack (m, Nc, flatcorr, results, &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m], primaryCell);
+      setMrelAverageStack (m, Nc, flatcorr, results, &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m]);
       setGlobalObjStats (&catalog[Nc].average[j], &catalog[Nc].measure[m]);
     }
@@ -74 +74 @@
     }
   }
-  if (primaryCell) free (primaryCell);
+  // if (primaryCell) free (primaryCell);
   return (TRUE);
 }
@@ -441 +441 @@
 
 // only apply Stack operation on setMrelFinal in first pass 
-int setMrelAverageStack (off_t measureOffset, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure, char *primaryCell) {
+int setMrelAverageStack (off_t measureOffset, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure) {
 
   off_t k, ID;
@@ -498 +498 @@
       if (measure[k].dbFlags & MEAS_BAD) SKIP_THIS_MEAS_STACK(Nbad); 
 
-      if (getImageEntry (meas, cat) < 0) continue;
+      if (getImageEntry (meas, cat) < 0) {
+        fprintf (stderr, "*** warning : this should be impossible\n");
+        abort();
+        continue;
+      }
       // measurements without an image are either external reference photometry or
       // data for which the associated image has not been loaded (probably because of