Changeset 34902 for branches/eam_branches/ipp-20121219/ppStack/src/ppStackCombinePrepare.c

Timestamp:

Jan 10, 2013, 11:33:10 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackCombinePrepare.c (modified) (2 diffs)

branches/eam_branches/ipp-20121219/ppStack/src

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

branches/eam_branches/ipp-20121219/ppStack/src/ppStackCombinePrepare.c

@@ -34 +34 @@
 /*       options->expRO = NULL; */
 /*     } */
-    pmCell *bkgCell;
-    int bkg_r0,bkg_c0;
-    int bkg_nC,bkg_nR;
+    int bkg_r0 = 0,bkg_c0 = 0;
+    int bkg_nC = 0,bkg_nR = 0;
     if (bkgName) {
       ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, true, 0);
       pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", 0);
+      if (!file)  {
+        psError(PPSTACK_ERR_ARGUMENTS, false, "Output background model selected but no inputs provided.");
+        return false;
+      }
       pmFPAview *view = ppStackFilesIterateDown(config);
       pmReadout *ro = pmFPAviewThisReadout(view,file->fpa);
@@ -47 +50 @@
       bkg_nC = ro->image->numCols;
       bkg_nR = ro->image->numRows;
-      bkgCell = pmFPAfileThisCell(config->files, view, bkgName); // Bkg cell
+      pmCell *bkgCell = pmFPAfileThisCell(config->files, view, bkgName); // Bkg cell
       
       options->bkgRO = pmReadoutAlloc(bkgCell); // BKG readout

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+