Changeset 13462 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

May 21, 2007, 6:24:29 PM (19 years ago)

Author:

Paul Price

Message:

Trying to incorporate psphot into ppSub. It doesn't work yet; waiting on Gene's input.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -6 +6 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <psphot.h>
 
 #include "ppSub.h"
@@ -174 +175 @@
 #endif
 
+    psFree(kernels);
+    psFree(stamps);
+    psFree(solution);
 
-        psFree(kernels);
-        psFree(stamps);
-        psFree(solution);
-        return true;
+    pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT");
+    pmFPACopy(photFile->fpa, inRO->parent->parent->parent);
 
-    ERROR:
-        psFree(kernels);
-        psFree(stamps);
-        psFree(solution);
-        return false;
+    psphotReadout(config, view);
+
+    pmFPAfileActivate(config->files, false, "PSPHOT.INPUT");
+
+    return true;
+
+ERROR:
+    psFree(kernels);
+    psFree(stamps);
+    psFree(solution);
+    return false;
 }