Changeset 39774

Timestamp:

Oct 18, 2016, 2:56:04 PM (10 years ago)

Author:

watersc1

Message:

Fix segfaults in generating fringes.

Location:

branches/czw_branch/20160809

Files:

• ppMerge/src/ppMergeLoop.c (modified) (1 diff)
• psModules/src/detrend/pmFringeStats.c (modified) (1 diff)

branches/czw_branch/20160809/ppMerge/src/ppMergeLoop.c

@@ -398 +398 @@
 
             psFree(fileGroups);
-            psFree(zeros);
+            //            psFree(zeros);
 
             // XXX eventually need to keep both the shutter and the pattern, as we do with dark

branches/czw_branch/20160809/psModules/src/detrend/pmFringeStats.c

@@ -336 +336 @@
         dfPt[i] = 1.0 / medianSd->sampleStdev;
 
-        psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f : %s\n", (int)region.x0, (int)region.x1,
-                (int)region.y0, (int)region.y1, fPt[i], dfPt[i], readout->parent->hdu->extname);
+        if (readout->parent->hdu) {
+          psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f : %s\n", (int)region.x0, (int)region.x1,
+                  (int)region.y0, (int)region.y1, fPt[i], dfPt[i], readout->parent->hdu->extname);
+        }
+        else {
+          psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f : THIS_IS_A_SPOOKY_GHOST_CELL\n", (int)region.x0, (int)region.x1,
+                  (int)region.y0, (int)region.y1, fPt[i], dfPt[i]);
+        }
     }
     psFree(sky);