Index: trunk/ppstamp/src/ppstampParseCamera.c
===================================================================
--- trunk/ppstamp/src/ppstampParseCamera.c	(revision 15280)
+++ trunk/ppstamp/src/ppstampParseCamera.c	(revision 15388)
@@ -4,4 +4,6 @@
 
 # include "ppstamp.h"
+
+bool ppstampMegacamWorkaround = false;
 
 // Set up the ppstamp output Image file
@@ -53,22 +55,10 @@
         return NULL;
     }
+
+    if (!strcmp(config->cameraName, "MEGACAM")) {
+        // workaround bug 986 and related
+        ppstampMegacamWorkaround = true;
+    }
  
-
-#ifdef notyet
-    if (psTraceGetLevel("ppstamp.config") > 0) {
-        // Get a look inside all the files.
-        psMetadataIterator *filesIter = psMetadataIteratorAlloc(config->files, PS_LIST_HEAD, NULL); // Iterator
-        psMetadataItem *item;               // Item from iteration
-        fprintf(stderr, "Files:\n");
-        while ((item = psMetadataGetAndIncrement(filesIter))) {
-            pmFPAfile *file = item->data.V; // File of interest
-            fprintf(stderr, "%s: %p %p %p (%p) %p\n", file->name,
-                    file->src, file->fpa,
-                    file->camera, file->fpa->camera, file->format);
-        }
-        psFree(filesIter);
-    }
-#endif
-
     return true;
 }