Changeset 25051 for branches/czw_branch/cleanup/pswarp/src/pswarpLoop.c

Timestamp:

Aug 11, 2009, 3:54:00 PM (17 years ago)

Author:

watersc1

Message:

Bringing branch up-to-date at revision 25049

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpLoop.c (modified) (2 diffs)

branches/czw_branch/cleanup/pswarp/src/pswarpLoop.c

@@ -315 +315 @@
 
 
-    // Set variance factor
-    {
-        bool mdok;                      // Status of MD lookup
-        float varFactor = psMetadataLookupF32(&mdok, output->analysis, PSWARP_ANALYSIS_VARFACTOR);
-        long goodPix = psMetadataLookupS64(&mdok, output->analysis, PSWARP_ANALYSIS_GOODPIX);
-        varFactor /= goodPix;
-
-        psMetadataItem *vfItem = psMetadataLookup(outCell->concepts, "CELL.VARFACTOR"); ///< Item to update
-        psAssert(vfItem && vfItem->type == PS_TYPE_F32, "Concept should be as specified.");
-        if (!isfinite(vfItem->data.F32)) {
-            vfItem->data.F32 = varFactor;
-        } else {
-            vfItem->data.F32 *= varFactor;
-        }
-    }
-
     // Set covariance matrix for output
     {
@@ -406 +390 @@
         pmFPAview *view = pmFPAviewAlloc(0); ///< View into skycell
         view->chip = view->cell = view->readout = 0;
-
-        // Need to adjust the weight --- the main operation in psphotReadoutFindPSF is not determining the
-        // signficance of sources, but looking at the significance of individual pixels.
-        // We can adjust the weight directly since this is a deep copy
-        pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa);
-        float vf = psMetadataLookupF32(NULL, photRO->parent->concepts, "CELL.VARFACTOR"); // Variance factor
-        psBinaryOp(photRO->variance, photRO->variance, "*", psScalarAlloc(vf, PS_TYPE_F32));
 
         // grab the sources of interest from the storage location (pmFPAfile PSPHOT.INPUT.CMF)