IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 8, 2006, 4:37:08 PM (20 years ago)
Author:
jhoblitt
Message:

normalize psTrace() facility names

Location:
trunk/psModules/src/detrend
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/detrend/pmFlatNormalize.c

    r7860 r8246  
    7171        for (int i = 0; i < numSources; i++) {
    7272            if (sourceMask->data.U8[i]) {
    73                 psTrace(__func__, 7, "Flux for exposure %d is masked.\n", i);
     73                psTrace("psModules.detrend", 7, "Flux for exposure %d is masked.\n", i);
    7474                continue;
    7575            }
    … …  
    8989                sourceFlux->data.F32[i] = NAN;
    9090            }
    91             psTrace(__func__, 7, "Flux for exposure %d is %lf\n", i, exp(sourceFlux->data.F32[i]));
     91            psTrace("psModules.detrend", 7, "Flux for exposure %d is %lf\n", i, exp(sourceFlux->data.F32[i]));
    9292        }
    9393
    … …  
    117117                chipGains->data.F32[i] = NAN;
    118118            }
    119             psTrace(__func__, 7, "Gain for chip %d is %lf\n", i, exp(-chipGains->data.F32[i]));
     119            psTrace("psModules.detrend", 7, "Gain for chip %d is %lf\n", i, exp(-chipGains->data.F32[i]));
    120120        }
    121121
    122         psTrace(__func__, 2, "Iteration %d: difference is %e\n", iter, diff);
     122        psTrace("psModules.detrend", 2, "Iteration %d: difference is %e\n", iter, diff);
    123123
    124124        // Switch the old and new

  • trunk/psModules/src/detrend/pmFringeStats.c

    r7887 r8246  
    33 *  @author Eugene Magnier, IfA
    44 *
    5  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-07-13 02:21:25 $
     5 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-08-09 02:37:07 $
    77 *
    88 *  Copyright 2004 IfA
    … …  
    327327        dfPt[i] = 1.0 / medianSd->sampleStdev;
    328328
    329         psTrace(__func__, 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
     329        psTrace("psModules.detrend", 7, "[%d:%d,%d:%d]: %f %f\n", (int)region.x0, (int)region.x1,
    330330                (int)region.y0, (int)region.y1, fPt[i], dfPt[i]);
    331331    }
    … …  
    671671    int numClipped = 0;                 // Number clipped
    672672    for (int i = 0; i < diffs->n; i++) {
    673         psTrace(__func__, 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
     673        psTrace("psModules.detrend", 10, "Region %d (%d): %f\n", i, mask->data.U8[i], diffs->data.F32[i]);
    674674        if (!mask->data.U8[i] && fabs(diffs->data.F32[i]) > middle + thresh) {
    675             psTrace(__func__, 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
     675            psTrace("psModules.detrend", 5, "Masking %d: %f\n", i, diffs->data.F32[i]);
    676676            mask->data.U8[i] = 1;
    677677            numClipped++;
    … …  
    732732            if (!finite(fringe->f->data.F32[j])) {
    733733                mask->data.U8[j] = 1;
    734                 psTrace(__func__, 9, "Masking region %d because not finite in fringe %d.\n", j, i);
     734                psTrace("psModules.detrend", 9, "Masking region %d because not finite in fringe %d.\n", j, i);
    735735            }
    736736        }
    … …  
    749749    fringeScaleDiffs(diff, science, fringes, scale);
    750750    numClipped = clipRegions(diff, mask, 3.0*rej);
    751     psTrace(__func__, 4, "%d regions clipped in initial pass.\n", numClipped);
     751    psTrace("psModules.detrend", 4, "%d regions clipped in initial pass.\n", numClipped);
    752752
    753753    unsigned int iter = 0;              // Iteration number
    … …  
    756756        iter++;
    757757        scaleMeasure(scale, science, fringes); // The scales
    758         psTrace(__func__, 1, "Fringe scales after iteration %d:\n", iter);
    759         psTrace(__func__, 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
     758        psTrace("psModules.detrend", 1, "Fringe scales after iteration %d:\n", iter);
     759        psTrace("psModules.detrend", 1, "Background: %f %f\n", scale->coeff->data.F32[0], scale->coeffErr->data.F32[0]);
    760760        for (int i = 0; i < scale->nFringeFrames; i++) {
    761             psTrace(__func__, 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
     761            psTrace("psModules.detrend", 1, "%d: %f %f\n", i, scale->coeff->data.F32[i + 1],
    762762                    scale->coeffErr->data.F32[i + 1]);
    763763        }
    … …  
    766766        iterClip = clipRegions(diff, mask, rej); // Number clipped
    767767        numClipped += iterClip;
    768         psTrace(__func__, 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
     768        psTrace("psModules.detrend", 9, "Clipped: %d\tFrac: %f\n", iterClip, (float)numClipped/(float)numRegions);
    769769    } while (iterClip > 0 && iter < nIter && (float)numClipped/(float)numRegions <= 1.0 - keepFrac);
    770770    psFree(diff);
    … …  
    811811    psFree(scienceStats);
    812812
    813     psTrace(__func__, 7, "Fringe solution:\n");
     813    psTrace("psModules.detrend", 7, "Fringe solution:\n");
    814814    for (int i = 0; i < fringeImages->n + 1; i++) {
    815         psTrace(__func__, 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
     815        psTrace("psModules.detrend", 7, "%d: %f %f\n", i, scale->coeff->data.F32[i],
    816816                scale->coeffErr->data.F32[i]);
    817817    }

  • trunk/psModules/src/detrend/pmSubtractBias.c

    r8108 r8246  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2006-08-03 19:37:55 $
     13 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2006-08-09 02:37:07 $
    1515 *
    1616 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    259259                    const pmReadout *bias, const pmReadout *dark)
    260260{
    261     psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,
     261    psTrace("psModules.detrend", 4,
    262262            "---- pmSubtractBias() begin ----\n");
    263263    PS_ASSERT_PTR_NON_NULL(in, NULL);

  • trunk/psModules/src/detrend/pmSubtractSky.c

    r8004 r8246  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-07-28 03:21:19 $
     8 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-08-09 02:37:07 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333static psS32 DetermineNumBits(psStatsOptions data)
    3434{
    35     psTrace("SubtractSky.DetermineNumBits", 4, "Calling DetermineNumBits(0x%x)\n", data);
     35    psTrace("psModules.detrend", 4, "Calling DetermineNumBits(0x%x)\n", data);
    3636
    3737    psS32 i;
    … …  
    4646    }
    4747
    48     psTrace("SubtractSky.DetermineNumBits", 4,
     48    psTrace("psModules.detrend", 4,
    4949            "Calling DetermineNumBits(0x%x) -> %d\n", data, numBits);
    5050    return(numBits);
    … …  
    5858static psU64 getHighestPriorityStatOption(psU64 statOptions)
    5959{
    60     psTrace("SubtractSky.getHighestPriorityStatOption", 4,
     60    psTrace("psModules.detrend", 4,
    6161            "Calling getHighestPriorityStatOption(0x%x)\n", statOptions);
    6262
    … …  
    9595                         psStatsOptions statOptions)
    9696{
    97     psTrace("SubtractSky.binImage", 4, "Calling binImage(%d)\n", binFactor);
     97    psTrace("psModules.detrend", 4, "Calling binImage(%d)\n", binFactor);
    9898
    9999    if (binFactor <= 0) {
    … …  
    148148    psFree(myStats);
    149149
    150     psTrace("SubtractSky.binImage", 4, "Exiting binImage(%d)\n", binFactor);
     150    psTrace("psModules.detrend", 4, "Exiting binImage(%d)\n", binFactor);
    151151    return(origImage);
    152152}
    … …  
    163163static psS32 CalculatePolyTerms(psS32 xOrder, psS32 yOrder)
    164164{
    165     psTrace("SubtractSky.CalculatePolyTerms", 4,
     165    psTrace("psModules.detrend", 4,
    166166            "Calling CalculatePolyTerms(%d, %d)\n", xOrder, yOrder);
    167167
    … …  
    178178        }
    179179    }
    180     psTrace("SubtractSky.CalculatePolyTerms", 4,
     180    psTrace("psModules.detrend", 4,
    181181            "Exiting CalculatePolyTerms(%d, %d) -> %d\n", xOrder, yOrder, localPolyTerms);
    182182    return(localPolyTerms);
    … …  
    198198static psS32 **buildPolyTerms(psS32 xOrder, psS32 yOrder)
    199199{
    200     psTrace("SubtractSky.buildPolyTerms", 4,
     200    psTrace("psModules.detrend", 4,
    201201            "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
    202202
    … …  
    233233    }
    234234
    235     psTrace("SubtractSky.buildPolyTerms", 4,
     235    psTrace("psModules.detrend", 4,
    236236            "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
    237237    return(polyTerms);
    … …  
    258258                      psS32 yOrder)
    259259{
    260     psTrace("SubtractSky.buildPolyTerms", 4,
     260    psTrace("psModules.detrend", 4,
    261261            "Calling buildPolyTerms(%d, %d)\n", xOrder, yOrder);
    262262
    … …  
    276276        xSum*= x;
    277277    }
    278     psTrace("SubtractSky.buildPolyTerms", 4,
     278    psTrace("psModules.detrend", 4,
    279279            "Exiting buildPolyTerms(%d, %d)\n", xOrder, yOrder);
    280280}
    … …  
    297297    psImage *maskImage)
    298298{
    299     psTrace("SubtractSky.ImageFitPolynomial", 4,
     299    psTrace("psModules.detrend", 4,
    300300            "Calling ImageFitPolynomial()\n");
    301301    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
    … …  
    416416    for (i=0;i<localPolyTerms;i++) {
    417417        myPoly->coeff[ polyTerms[i][0] ][ polyTerms[i][1] ] = C->data.F64[i];
    418         psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 6,
     418        psTrace("psModules.detrend", 6,
    419419                "myPoly->coeff[%d][%d] is %f\n", polyTerms[i][0], polyTerms[i][1], myPoly->coeff[ polyTerms[i][0] ][ polyTerms[i][1] ]);
    420420    }
    … …  
    456456    }
    457457
    458     psTrace("SubtractSky.ImageFitPolynomial", 4,
     458    psTrace("psModules.detrend", 4,
    459459            "Exiting ImageFitPolynomial()\n");
    460     //    psTrace(".psModule.pmSubtractSky.ImageFitPolynomial", 4,
     460    //    psTrace("psModules.detrend", 4,
    461461    //            "---- ImageFitPolynomial() end successfully ----\n");
    462462    return(myPoly);
    … …  
    487487        PS_WARN_PTR_NON_NULL(in->parent->concepts);
    488488    }
    489     psTrace(".psModule.pmSubtractSky", 4,
     489    psTrace("psModules.detrend", 4,
    490490            "---- pmSubtractSky() begin ----\n");
    491491
    … …  
    590590        psImageInit(binnedMaskImage, 0);
    591591    }
    592     psTrace(".psModule.pmSubtractSky", 4,
     592    psTrace("psModules.detrend", 4,
    593593            "binnedImage size is (%d, %d)\n", binnedImage->numRows, binnedImage->numCols);
    594594
    … …  
    609609        psF64 binnedStdev = myStats->sampleStdev;
    610610        psFree(myStats);
    611         psTrace(".psModule.pmSubtractSky", 6,
     611        psTrace("psModules.detrend", 6,
    612612                "binned StDev is %f\n", binnedStdev);
    613613
    614614        // Clip all pixels which are more than clipSD sigmas from the mean.
    615         psTrace(".psModule.pmSubtractSky", 6,
     615        psTrace("psModules.detrend", 6,
    616616                "clipSD is %f\n", clipSD);
    617617
    … …  
    705705                trimmedImg->data.F32[row][col]-= binPixel;
    706706
    707                 psTrace(".psModule.pmSubtractSky", 8,
     707                psTrace("psModules.detrend", 8,
    708708                        "image[%d][%d] <--> binnedImage[%.2f][%.2f]: %f\n",
    709709                        row, col, binRowF64-0.5, binColF64-0.5, binPixel);
    … …  
    718718    }
    719719
    720     psTrace(".psModule.pmSubtractSky", 4,
     720    psTrace("psModules.detrend", 4,
    721721            "---- pmSubtractSky() exit successfully ----\n");
    722722    return(in);
Note: See TracChangeset for help on using the changeset viewer.