Changeset 15815

Timestamp:

Dec 13, 2007, 12:14:46 PM (18 years ago)

Author:

Paul Price

Message:

This works with the current version of ppStack.

Location:

trunk/psModules/src/camera

Files:

• pmReadoutFake.c (modified) (2 diffs)
• pmReadoutFake.h (modified) (1 diff)

trunk/psModules/src/camera/pmReadoutFake.c

@@ -47 +47 @@
 #endif
 
-bool pmReadoutFakeFromSources(
-#ifdef PAP_WORK
-    pmReadout *readout, int numCols, int numRows, const psArray *sources,
-    const psVector *xOffset, const psVector *yOffset, pmPSF *psf,
-    float minFlux, int radius, bool circularise
-#else
-    pmReadout *readout, int numCols, int numRows, const psArray *sources,
-    float fwhm, float minFlux
-#endif
-    )
+#ifdef PAP_WORK
+bool pmReadoutFakeFromSources(pmReadout *readout, int numCols, int numRows, const psArray *sources,
+                              const psVector *xOffset, const psVector *yOffset, pmPSF *psf,
+                              float minFlux, int radius, bool circularise)
+#else
+pmReadout *pmReadoutFakeFromSources(int numCols, int numRows, const psArray *sources,
+                                    float fwhm, float minFlux)
+#endif
 {
+#ifdef PAP_WORK
     PS_ASSERT_PTR_NON_NULL(readout, false);
+#else
+    pmReadout *readout = pmReadoutAlloc(NULL);
+#endif
     PS_ASSERT_INT_LARGER_THAN(numCols, 0, false);
     PS_ASSERT_INT_LARGER_THAN(numRows, 0, false);
@@ -213 +215 @@
     }
 
-    return true;
+    return
+#ifdef PAP_WORK
+        true
+#else
+        readout
+#endif
+        ;
+
 }

trunk/psModules/src/camera/pmReadoutFake.h

@@ -29 +29 @@
     );
 #else
-bool pmReadoutFakeFromSources(pmReadout *readout, ///< Output readout, or NULL
-                              int numCols, int numRows, ///< Dimension of image
-                              const psArray *sources, ///< Array of pmSource
-                              float target, ///< Target FWHM
-                              float minFlux ///< Minimum flux to bother about; for setting source radius
+pmReadout *pmReadoutFakeFromSources(int numCols, int numRows, ///< Dimension of image
+                                    const psArray *sources, ///< Array of pmSource
+                                    float target, ///< Target FWHM
+                                    float minFlux ///< Minimum flux to bother about; for setting source radius
     );
 #endif // PAP_WORK