Changeset 34082

Timestamp:

Jun 26, 2012, 11:21:22 AM (14 years ago)

Author:

eugene

Message:

check that image is capable of having VIDEO before examining VIDEO

Location:

trunk/ppImage

Files:

• configure.ac (modified) (2 diffs)
• src (modified) (1 prop)
• src/ppImageDetrendReadout.c (modified) (1 diff)

trunk/ppImage/configure.ac

@@ -8 +8 @@
 AM_MAINTAINER_MODE
 
-IPP_STDCFLAGS
+IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -24 +24 @@
 
 IPP_STDOPTS
-CFLAGS="${CFLAGS=} -Wall -Werror"
+IPP_STDCFLAGS
 
 IPP_VERSION

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -35 +35 @@
       }
     }
+
     // Check to see if we're in a chip that contains video
+    // NOTE: this is an esoteric test for a GPC1 feature : this is irrelevant & will not work for other cameras
     bool hasVideo = false;
     {
+      // XXX test for GPC1? or CAN_HAVE_VIDEO in camera config?
+      if (!input) goto done_video_check;
+      if (!input->parent) goto done_video_check;
+      if (!input->parent->parent) goto done_video_check;
+      if (!input->parent->parent->hdu) goto done_video_check;
+      if (!input->parent->parent->hdu->header) goto done_video_check;
       if (psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE")) {
-        psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+        psLogMsg ("ppImage.detrend", PS_LOG_DETAIL, "VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
         char *Vptr = strchr(psMetadataLookupStr(NULL,input->parent->parent->hdu->header,"CELLMODE"),'V');
         if (Vptr) {
           hasVideo = true;
-          psWarning("VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
+          psLogMsg ("ppImage.detrend", PS_LOG_INFO, "VIDEO: %d %d %d\n",(int) options->hasVideo,(int) options->useVideoDark, (int) options->useVideoMask);
         }
       }
     }
-
+    done_video_check:
     
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.