Changeset 34041 for branches/meh_branches/ppstack_test/psModules/src/camera/pmReadoutFake.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmReadoutFake.c (modified) (7 diffs)

branches/meh_branches/ppstack_test/psModules/src/camera/pmReadoutFake.c

@@ -162 +162 @@
             fakeRadius = PS_MAX(fakeRadius, fakeModel->modelRadius(fakeModel->params, minFlux));
         }
+        //MEH - add some outputs to test --
+        psTrace("psModules.camera", 10, "TESTING:: source at %f,%f: radius %f fakeradius %f minflux %f psf params later \n",
+                fakeModel->params->data.F32[PM_PAR_XPOS],fakeModel->params->data.F32[PM_PAR_YPOS],radius,fakeRadius,minFlux);
+        //MEH -- seems radius is passed as float 0.0.. hardcode test - 
+
         if (radius > 0) {
             fakeRadius = PS_MAX(fakeRadius, radius);
@@ -210 +215 @@
     const pmPSF *psf = args->data[7];         // PSF
     float minFlux = PS_SCALAR_VALUE(args->data[8], F32); // Minimum flux
-    float radius = PS_SCALAR_VALUE(args->data[9], F32);  // Minimum radius
+    float radius = PS_SCALAR_VALUE(args->data[9], S32);  // Minimum radius - typecast to float from S32 outside of PS_SCALAR_VALUE otherwise sets 0.0 
     bool circularise = PS_SCALAR_VALUE(args->data[10], U8); // Circularise PSF?
     bool normalisePeak = PS_SCALAR_VALUE(args->data[11], U8); // Normalise for peak?
     int groupIndex = PS_SCALAR_VALUE(args->data[12], S32); // Group index
     int cellIndex = PS_SCALAR_VALUE(args->data[13], S32);  // Cell index
+
+    //MEH
+    psTrace("psModules.camera", 10, "TESTING:thread: radius %f minflux %f  \n",radius,minFlux);
 
     return readoutFake(readout, groups, x, y, mag, xOffset, yOffset, psf, minFlux, radius, circularise,
@@ -242 +250 @@
     return old;
 }
-
 
 bool pmReadoutFakeFromVectors(pmReadout *readout, int numCols, int numRows,
@@ -287 +294 @@
     }
 
+    psTrace("psModules.camera", 10, "TESTING:prethread: radius %d minflux %f threaded %d \n",radius,minFlux,threaded);
     if (threaded) {
         for (int i = 0; i < groups->groups->n; i++) {
@@ -303 +311 @@
                 psArrayAdd(args, 1, (pmPSF*)psf);
                 PS_ARRAY_ADD_SCALAR(args, minFlux, PS_TYPE_F32);
+                //MEH - S32 is proper type here
                 PS_ARRAY_ADD_SCALAR(args, radius, PS_TYPE_S32);
                 PS_ARRAY_ADD_SCALAR(args, circularise, PS_TYPE_U8);
@@ -349 +358 @@
 }
 
-
 bool pmReadoutFakeFromSources(pmReadout *readout, int numCols, int numRows, const psArray *sources,
                               pmSourceMode sourceMask, const psVector *xOffset, const psVector *yOffset,
@@ -392 +400 @@
     mag->n = numGood;
 
+    //MEH -- convert int->float for calling downstream since nothing calls Vectors directly? psphot does.. argh!
+    psTrace("psModules.camera", 10, "TESTING:: radius %d minflux %f  \n",radius,minFlux);
+
     bool status = pmReadoutFakeFromVectors(readout, numCols, numRows, x, y, mag, xOffset, yOffset, psf,
                                            minFlux, radius, circularise, normalisePeak);