Changeset 2587

Timestamp:

Dec 1, 2004, 11:39:30 AM (22 years ago)

Author:

gusciora

Message:

astyle

Location:

trunk/psModules/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• pmSubtractSky.c (modified) (4 diffs)

trunk/psModules/src/Makefile.am

@@ -1 +1 @@
 lib_LIBRARIES = libpsmodule.a
 
-libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c
-libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h
+libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c pmSubtractSky.c
+libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h pmSubtractSky.h
 libpsmodule_adir = $(includedir)

trunk/psModules/src/Makefile.in

@@ -96 +96 @@
 lib_LIBRARIES = libpsmodule.a
 
-libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c
-libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h
+libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c pmSubtractSky.c
+libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h pmSubtractSky.h
 libpsmodule_adir = $(includedir)
 subdir = src
@@ -110 +110 @@
         pmMaskBadPixels.$(OBJEXT) pmSubtractBias.$(OBJEXT) \
         psTest.$(OBJEXT) pmSubtractBias.$(OBJEXT) pmNonLinear.$(OBJEXT) \
-        pmReadoutCombine.$(OBJEXT)
+        pmReadoutCombine.$(OBJEXT) pmSubtractSky.$(OBJEXT)
 libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS)
 
@@ -124 +124 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/pmNonLinear.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/pmReadoutCombine.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractBias.Po ./$(DEPDIR)/psTest.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractBias.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractSky.Po ./$(DEPDIR)/psTest.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -212 +213 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmReadoutCombine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmSubtractBias.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmSubtractSky.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psTest.Po@am__quote@
 

trunk/psModules/src/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-01 21:27:26 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-01 21:39:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 #include "pslib.h"
 #include "psConstants.h"
+
+typedef enum {
+    PM_FIT_NONE,                              ///< No fit
+    PM_FIT_POLYNOMIAL,                        ///< Fit polynomial
+    PM_FIT_SPLINE                             ///< Fit cubic splines
+} pmFit;
 
 int p_psDetermineNumBits(unsigned int data)
@@ -50 +56 @@
         return(PS_STAT_ROBUST_MODE);
     }
-    psError(XXX);
+    //    psError(XXX);
     return(-1);
 }
@@ -68 +74 @@
     psVector *binVector = psVectorAlloc(binFactor * binFactor, PS_TYPE_F32);
     psVector *binMask = psVectorAlloc(binFactor * binFactor, PS_TYPE_U8);
-    psStats *myStats = psStatsAlloc(statOptions)
-
-                       if (binFactor <= 0) {
-                           psLogMsg(__func__, PS_LOG_WARN,
-                                    "WARNING: binImage(): binFactor is %d\n", binFactor);
-                           return(origImage);
-                       }
-                       if (binFactor == 1) {
-                           return(origImage);
-                       }
-
-                       for (int row = 0; row < origImage->numRows ; row+=binFactor) {
-                           for (int col = 0; col < origImage->numCols ; col+=binFactor) {
-                               int count = 0;
-                               for (int binRow = 0; binRow <= binFactor ; binRow++) {
-                                   for (int binCol = 0; binCol <= binFactor ; binCol++) {
-                                       if (((row + binRow) < origImage->numRows) &&
-                                               ((col + binCol) < origImage->numCol)) {
-                                           binVector->data.F32[count] =
-                                               origImage->data.F32[row + binRow][col + binCol];
-                                           binMask->data.U8[count] = 0;
-                                       } else {
-                                           binVector->data.F32[count] = 0.0;
-                                           binMask->data.U8[count] = 1;
-                                       }
-                                       count++;
-                                   }
-                               }
-                               myStats = psVectorStats(myStats, binVector, binMask, 1);
-                               psF64 statValue;
-                               psBool rc = p_psGetStatValue(myStats, &statValue);
-
-                               if (rc == true) {
-                                   origImage->data.F32[row][col] = (psF32) statValue;
-                               } else {
-                                   origImage->data.F32[row][col] = 0.0;
-                                   psLogMsg(__func__, PS_LOG_WARN,
-                                            "WARNING: pmSubtractSky(), binImage(): p_psGetStatValue() was FALSE\n");
-                               }
-                           }
-                       }
-                       psFree(myStats);
+    psStats *myStats = psStatsAlloc(statOptions);
+
+    if (binFactor <= 0) {
+        psLogMsg(__func__, PS_LOG_WARN,
+                 "WARNING: binImage(): binFactor is %d\n", binFactor);
+        return(origImage);
+    }
+    if (binFactor == 1) {
+        return(origImage);
+    }
+
+    for (int row = 0; row < origImage->numRows ; row+=binFactor) {
+        for (int col = 0; col < origImage->numCols ; col+=binFactor) {
+            int count = 0;
+            for (int binRow = 0; binRow <= binFactor ; binRow++) {
+                for (int binCol = 0; binCol <= binFactor ; binCol++) {
+                    if (((row + binRow) < origImage->numRows) &&
+                            ((col + binCol) < origImage->numCol)) {
+                        binVector->data.F32[count] =
+                            origImage->data.F32[row + binRow][col + binCol];
+                        binMask->data.U8[count] = 0;
+                    } else {
+                        binVector->data.F32[count] = 0.0;
+                        binMask->data.U8[count] = 1;
+                    }
+                    count++;
+                }
+            }
+            myStats = psVectorStats(myStats, binVector, binMask, 1);
+            psF64 statValue;
+            psBool rc = p_psGetStatValue(myStats, &statValue);
+
+            if (rc == true) {
+                origImage->data.F32[row][col] = (psF32) statValue;
+            } else {
+                origImage->data.F32[row][col] = 0.0;
+                psLogMsg(__func__, PS_LOG_WARN,
+                         "WARNING: pmSubtractSky(), binImage(): p_psGetStatValue() was FALSE\n");
+            }
+        }
+    }
+    psFree(myStats);
     psFree(binVector);
     psFree(binMask);