Changeset 35552

Timestamp:

May 9, 2013, 11:33:22 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/ppImage/src

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (3 diffs)
• ppImageAuxiliaryMask.c (copied) (copied from trunk/ppImage/src/ppImageAuxiliaryMask.c )
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageLoop.c (modified) (1 diff)
• ppImageOptions.c (modified) (4 diffs)
• ppImagePhotom.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/ppImage/src/Makefile.am

@@ -65 +65 @@
         ppImageMemory.c \
         ppImageAddNoise.c \
-        ppImageRandomGaussian.c
+        ppImageRandomGaussian.c \
+        ppImageAuxiliaryMask.c
 
 CLEANFILES = *~

branches/eam_branches/ipp-20130419/ppImage/src/ppImage.h

@@ -30 +30 @@
     bool doMaskLow;                     // mask low pixels
     bool doMask;                        // Mask bad pixels
+    bool doAuxMask;                     // apply auxillary mask
     bool doNonLin;                      // Non-linearity correction
     bool doOverscan;                    // Overscan subtraction
@@ -126 +127 @@
   psU16 maskstat_magic;
   psU16 maskstat_advisory;
+
+  psString auxVideoMask;                // auxillary video mask file
   
 } ppImageOptions;
@@ -312 +315 @@
 void ppImageRandomGaussianFree(void);
 
+bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options, psMetadata *stats);
 
 #endif

branches/eam_branches/ipp-20130419/ppImage/src/ppImageDetrendReadout.c

@@ -50 +50 @@
         char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
         if (Vptr) {
-          hasVideo = true;
+          hasVideo = options->hasVideo = true;
           psLogMsg ("ppImage.detrend", PS_LOG_INFO, "VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
         }

branches/eam_branches/ipp-20130419/ppImage/src/ppImageLoop.c

@@ -188 +188 @@
             ESCAPE("Unable to mosaic chip");
         }
+
+        if (!ppImageAuxiliaryMask(config, view, options, stats)) {
+            ESCAPE("Unable to apply auxiliary mask");
+        }
+
         timeDetrend += psTimerClear(TIMER_DETREND);
 

branches/eam_branches/ipp-20130419/ppImage/src/ppImageOptions.c

@@ -10 +10 @@
     // psFree(options->nonLinearData);
     // psFree(options->nonLinearSource);
+    psFree(options->auxVideoMask);
 }
 
@@ -24 +25 @@
     options->doVarianceBuild = false;   // Build internal variance
     options->doMask          = false;   // Mask bad pixels
+    options->doAuxMask       = false;   // apply auxillary mask
     options->doNonLin        = false;   // Non-linearity correction
     options->doOverscan      = false;   // Overscan subtraction
@@ -116 +118 @@
     options->normClass       = NULL;    // per-class normalizations refer to this class
 
+    options->auxVideoMask    = NULL;    // auxillary video mask file name
+
     return options;
 }
@@ -228 +232 @@
     options->doMaskBurntool  = psMetadataLookupBool(NULL, recipe, "MASK.BURNTOOL");
     options->doVarianceBuild = psMetadataLookupBool(NULL, recipe, "VARIANCE.BUILD");
+    options->doAuxMask       = psMetadataLookupBool(NULL, recipe, "MASK.AUXMASK");
+    if (options->doAuxMask) {
+        // if we are applying an auxiliary mask we can optionally apply another
+        // mask to video cells only. 
+        psString auxVideoMask = psMetadataLookupStr(NULL, recipe, "AUX.VIDEO.MASK");
+        // save the value if defined and not the value "NULL"
+        if (auxVideoMask && strcmp(auxVideoMask, "NULL")) {
+            options->auxVideoMask = psStringCopy(auxVideoMask);
+        }
+    }
 
     // Mask recipe options (note that mask bit values are set in ppImageSetMaskBits.c)

branches/eam_branches/ipp-20130419/ppImage/src/ppImagePhotom.c

@@ -46 +46 @@
                 }
                 psErrorClear();
-                psphotFilesActivate(config, false);
+                //                psphotFilesActivate(config, false);
             }