Changeset 20611

Timestamp:

Nov 9, 2008, 2:31:45 PM (18 years ago)

Author:

Paul Price

Message:

Add higher-order subtraction of background: magic is triggering off high background to make a lot of streaks.

Location:

trunk/ppSub/src

Files:

• Makefile.am (modified) (1 diff)
• ppSub.h (modified) (1 diff)
• ppSubBackground.c (added)
• ppSubReadout.c (modified) (1 diff)

trunk/ppSub/src/Makefile.am

@@ -7 +7 @@
         ppSub.c                 \
         ppSubArguments.c        \
+        ppSubBackground.c       \
         ppSubCamera.c           \
         ppSubLoop.c             \
         ppSubReadout.c          \
-        ppSubVersion.c            
+        ppSubVersion.c
 
 ppSubKernel_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSUB_CFLAGS)

trunk/ppSub/src/ppSub.h

@@ -27 +27 @@
     );
 
+/// Higher-order background subtraction
+bool ppSubBackground(pmReadout *ro,     ///< Readout of interest
+                     pmConfig *config,  ///< Configuration
+                     const pmFPAview *view ///< View to readout
+    );
+
 /// Put the program version information into a metadata
 void ppSubVersionMetadata(psMetadata *metadata ///< Metadata to populate

trunk/ppSub/src/ppSubReadout.c

@@ -623 +623 @@
     }
 
+    // Higher order background subtraction using psphot
+    if (!ppSubBackground(outRO, config, view)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+        psFree(outRO);
+        return false;
+    }
+
     // Renormalising for pixels, because that's what magic desires
     if (psMetadataLookupBool(&mdok, recipe, "RENORM")) {