Changeset 30655 for trunk/ppImage/src

Timestamp:

Feb 16, 2011, 3:38:37 PM (15 years ago)

Author:

eugene

Message:

port AddNoise functions into the trunk

Location:

trunk/ppImage/src

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (2 diffs)
• ppImage.h (modified) (3 diffs)
• ppImageAddNoise.c (copied) (copied from tags/ipp-20101215/ppImage/src/ppImageAddNoise.c )
• ppImageLoop.c (modified) (2 diffs)
• ppImageOptions.c (modified) (2 diffs)
• ppImageRandomGaussian.c (copied) (copied from tags/ipp-20101215/ppImage/src/ppImageRandomGaussian.c )

trunk/ppImage/src/Makefile.am

@@ -2 +2 @@
 
 noinst_HEADERS = \
-        ppImage.h 
+        ppImage.h
 
 if HAVE_SVNVERSION
@@ -61 +61 @@
         ppImageFileCheck.c \
         ppImageVersion.c \
-        ppImageMemory.c
+        ppImageMemory.c \
+        ppImageAddNoise.c \
+        ppImageRandomGaussian.c
 
 CLEANFILES = *~

trunk/ppImage/src/ppImage.h

@@ -53 +53 @@
     bool doCrosstalkMeasure;            // measure crosstalk signal
     bool doCrosstalkCorrect;            // apply crosstalk correction
+    bool addNoise;                      // Add noise to degrade MD image to 3pi
 
     // output files requested
@@ -155 +156 @@
 bool ppImageDetrendBias(pmReadout *inputReadout, pmReadout *bias, pmReadout *dark, ppImageOptions *options);
 
-//bool ppImageDetrendNonLinear(pmReadout *input, ppImageOptions *options);
 bool ppImageDetrendNonLinear(pmReadout *input, pmFPAview *linearity, pmConfig *config);
 bool ppImageDetrendNonLinearLookup(pmReadout *input, psMetadataItem *dataItem);
@@ -291 +291 @@
 void ppImageMemoryDump(const char *description);
 
+
+//Functions needed to degrade MD exposures to 3pi exposures
+
+bool ppImageAddNoise(pmConfig *config, ppImageOptions *options, pmFPAview *view, pmFPA *fpa) ;
+double ppImageRandomGaussian (const psRandom *rnd, double mean, double sigma);
+double ppImageRandomGaussianNorm (const psRandom *rnd);
+void ppImageRandomGaussianFree(void);
+
+
 #endif

trunk/ppImage/src/ppImageLoop.c

@@ -125 +125 @@
                     ESCAPE("Unable to measure CTE");
                 }
+
+                // optionally degrade a MD image to 3pi exposure times
+                if (!ppImageAddNoise(config, options, view, input->fpa)){
+                    ESCAPE("Unable to degrade MD image to 3pi");
+                }
             }
 
@@ -152 +157 @@
             ESCAPE("Unable to free detrend images");
         }
-    
+
         // Apply the fringe correction
         if (options->doFringe) {

trunk/ppImage/src/ppImageOptions.c

@@ -42 +42 @@
     options->applyParity     = false;   // Apply Cell parities
     options->doMaskStats     = false;   // Calculate mask fractions
-    
+    options->addNoise        = false;  //Degrade an MD image to a 3pi image
+
     // output files requested
     options->BaseFITS        = false;   // create output image
@@ -239 +240 @@
     options->doPatternCell = psMetadataLookupBool(NULL, recipe, "PATTERN.CELL");
     options->doMaskStats = psMetadataLookupBool(NULL, recipe, "MASK.STATS");
+    options->addNoise = psMetadataLookupBool(NULL, recipe, "ADDNOISE");
 
     options->doStats = false;