Changeset 21230 for branches/pap_branch_20090128/ppSim/src/ppSimLoadForceSources.c

Timestamp:

Jan 29, 2009, 4:26:37 PM (17 years ago)

Author:

Paul Price

Message:

Changing 'weight' to 'variance'. Mainly propagating changes from psModules. Fixed some apparent psphot API changes too.

File:

• branches/pap_branch_20090128/ppSim/src/ppSimLoadForceSources.c (modified) (5 diffs)

branches/pap_branch_20090128/ppSim/src/ppSimLoadForceSources.c

@@ -56 +56 @@
     // Select the spots within range of this readout.  Project the spots to this chip
     for (int i = 0; i < spots->n; i++) {
-        pmAstromObj *obj = spots->data[i];
+        pmAstromObj *obj = spots->data[i];
 
-        psProject (obj->TP, obj->sky, fpa->toSky);
-        psPlaneTransformApply (obj->FP, fpa->fromTPA, obj->TP);
-        psPlaneTransformApply (obj->chip, chip->fromFPA, obj->FP);
+        psProject (obj->TP, obj->sky, fpa->toSky);
+        psPlaneTransformApply (obj->FP, fpa->fromTPA, obj->TP);
+        psPlaneTransformApply (obj->chip, chip->fromFPA, obj->FP);
 
-        // limit the X,Y range of the objs to the selected chip
-        if (obj->chip->x < minX) continue;
-        if (obj->chip->x > maxX) continue;
-        if (obj->chip->y < minY) continue;
-        if (obj->chip->y > maxY) continue;
+        // limit the X,Y range of the objs to the selected chip
+        if (obj->chip->x < minX) continue;
+        if (obj->chip->x > maxX) continue;
+        if (obj->chip->y < minY) continue;
+        if (obj->chip->y > maxY) continue;
 
-        // convert the pmAstromObj to pmSource
+        // convert the pmAstromObj to pmSource
 
         // instantiate a model for the PSF at this location, Io = 1.0
@@ -74 +74 @@
 
         // XXX let the flux limit be a user-defined number of sky sigmas (not just 1.0)
-        // XXX use a fixed radius??
+        // XXX use a fixed radius??
         // float radius = model->modelRadius (model->params, roughNoise);
         // radius = PS_MAX (radius, 1.0);
-        float radius = 5.0;
+        float radius = 5.0;
 
         // construct a source, with model flux pixels set, based on the model
@@ -87 +87 @@
         // psF64 Area = 2.0 * M_PI * axes.major * axes.minor;
 
-        // these are not really needed since we will be fitting for them
+        // these are not really needed since we will be fitting for them
         source->psfMag = NAN;
         source->errMag = NAN;
 
         // insert the source flux in the image
-        // XXX not sure the offset is really 0,0
+        // XXX not sure the offset is really 0,0
         pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, 0.0, 0.0);
         pmSourceAddWithOffset (source, PM_MODEL_OP_FULL | PM_MODEL_OP_NOISE, 0xff, 0.0, 0.0);
@@ -98 +98 @@
         // Blow away the image parts of the source, which makes the memory explode
         RESET(source->pixels);
-        RESET(source->weight);
+        RESET(source->variance);
         RESET(source->maskObj);
         RESET(source->maskView);
@@ -105 +105 @@
         RESET(source->blends);
 
-        psArrayAdd (sources, 100, source);
+        psArrayAdd (sources, 100, source);
         psFree(source);                 // Drop local reference
     }