Changeset 7589 for trunk/psModules/src/detrend

Timestamp:

Jun 16, 2006, 3:50:43 PM (20 years ago)

Author:

magnier

Message:

updates from day when MHPCC CVS was down

Location:

trunk/psModules/src/detrend

Files:

• Makefile.am (modified) (2 diffs)
• pmDetrendDB.c (added)
• pmDetrendDB.h (added)
• pmSubtractBias.c (modified) (9 diffs)
• pmSubtractBias.h (modified) (2 diffs)

trunk/psModules/src/detrend/Makefile.am

@@ -9 +9 @@
         pmMaskBadPixels.c \
         pmNonLinear.c \
-        pmSubtractBias.c
+        pmSubtractBias.c \
+        pmDetrendDB.c
 
 #       pmSubtractSky.c
@@ -22 +23 @@
         pmMaskBadPixels.h \
         pmNonLinear.h \
-        pmSubtractBias.h
+        pmSubtractBias.h \
+        pmDetrendDB.h
 
 #       pmSubtractSky.c

trunk/psModules/src/detrend/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-08 22:14:28 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-17 01:50:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -106 +106 @@
     psImage *subImage = sub->image;     // The image to be subtracted
     psImage *subMask  = sub->mask;      // The mask for the subtraction image
+
+    int xIpar = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.XPARITY");
+    int xSpar = psMetadataLookupS32(NULL, sub->parent->concepts, "CELL.XPARITY");
+    if (xIpar != xSpar) {
+        psError(PS_ERR_UNKNOWN, true, "images for subtraction do not have the same "
+                "CELL.XPARITY (%d vs %d).\n    pmSubtractBias must be upgraded to handle this situation\n",
+                xIpar, xSpar);
+        return false;
+    }
+
+    int yIpar = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.YPARITY");
+    int ySpar = psMetadataLookupS32(NULL, sub->parent->concepts, "CELL.YPARITY");
+    if (yIpar != ySpar) {
+        psError(PS_ERR_UNKNOWN, true, "images for subtraction do not have the same "
+                "CELL.YPARITY (%d vs %d).\n    pmSubtractBias must be upgraded to handle this situation\n",
+                xIpar, xSpar);
+        return false;
+    }
 
     // Offsets of the cells
@@ -293 +311 @@
 XXX: The SDRS does not specify type support.  F32 is implemented here.
  *****************************************************************************/
-pmReadout *pmSubtractBias(pmReadout *in, pmOverscanOptions *overscanOpts,
-                          const pmReadout *bias, const pmReadout *dark)
+bool pmSubtractBias(pmReadout *in, pmOverscanOptions *overscanOpts,
+                    const pmReadout *bias, const pmReadout *dark)
 {
     psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,
@@ -319 +337 @@
                 overscanOpts->fitType != PM_FIT_POLY_CHEBY && overscanOpts->fitType != PM_FIT_SPLINE) {
             psError(PS_ERR_UNKNOWN, true, "Invalid fit type (%d).  Returning original image.\n", overscanOpts->fitType);
-            return(in);
+            return false;
         }
 
@@ -349 +367 @@
             if (! p_psGetStatValue(myStats, &reduced)) {
                 psError(PS_ERR_UNKNOWN, false, "p_psGetStatValue(): could not determine result from requested statistical operation.  Returning input image.\n");
-                return(in);
+                return false;
             }
             (void)psBinaryOp(image, image, "-", psScalarAlloc((float)reduced, PS_TYPE_F32));
@@ -391 +409 @@
                 psFree(pixels);
                 if (! reduced) {
-                    return in;
+                    return false;
                 }
 
@@ -435 +453 @@
                 psFree(pixels);
                 if (! reduced) {
-                    return in;
+                    return false;
                 }
 
@@ -452 +470 @@
     // Bias frame subtraction
     if (bias) {
-        SubtractFrame(in, bias, 1.0);
+        if (!SubtractFrame(in, bias, 1.0))
+            return false;
     }
 
@@ -459 +478 @@
         float inTime = psMetadataLookupF32(NULL, in->parent->concepts, "CELL.DARKTIME");
         float darkTime = psMetadataLookupF32(NULL, dark->parent->concepts, "CELL.DARKTIME");
-        SubtractFrame(in, dark, inTime/darkTime);
-    }
-
-    return in;
-}
-
-
+        if (!SubtractFrame(in, dark, inTime/darkTime))
+            return false;
+    }
+
+    return true;
+}
+
+

trunk/psModules/src/detrend/pmSubtractBias.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:56:29 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-17 01:50:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
 pmOverscanOptions *pmOverscanOptionsAlloc(bool single, pmFit fitType, unsigned int order, psStats *stat);
 
-pmReadout *pmSubtractBias(pmReadout *in, pmOverscanOptions *overscanOpts,
-                          const pmReadout *bias, const pmReadout *dark);
+bool pmSubtractBias(pmReadout *in, pmOverscanOptions *overscanOpts,
+                    const pmReadout *bias, const pmReadout *dark);
 
 #if 0