IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36623 for trunk


Ignore:
Timestamp:
Mar 31, 2014, 2:36:01 PM (12 years ago)
Author:
eugene
Message:

add lensing moments to psphot; allow up to 6x6 psf and aperture residuals in psphot

Location:
trunk
Files:
96 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Ohana/src/libohana/src

  • trunk/Ohana/src/opihi/include/pantasks.h

    r32632 r36623  
    116116
    117117  int active;
    118   int priority;
     118  int nicelevel;
    119119
    120120} Task;
    … …  
    161161
    162162  JobMode     mode;                     /* local or controller? */
    163   int     priority;
     163  int     nicelevel;
    164164  char   *realhost;
    165165

  • trunk/Ohana/src/opihi/include/pcontrol.h

    r36375 r36623  
    120120  int          exit_status;
    121121  int          Reset;
    122   int          priority;
     122  int          nicelevel;
    123123  JobMode      mode;
    124124  JobStat      state;
    … …  
    315315Job   *PullJobByID (IDtype JobID, int *StackID);
    316316Job   *PullJobFromStackByID (int StackID, int ID);
    317 IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts);
     317IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts);
    318318void   DelJob (Job *job);
    319319Host  *UnlinkJobAndHost (Job *job);

  • trunk/Ohana/src/opihi/pantasks/ControllerOps.c

    r34088 r36623  
    259259  }
    260260 
    261   if (job[0].priority) {
     261  if (job[0].nicelevel) {
    262262    char tmp[64];
    263     snprintf (tmp, 64, " -nice %d", job[0].priority);
     263    snprintf (tmp, 64, " -nice %d", job[0].nicelevel);
    264264    strcat (cmd, tmp);
    265265  }

  • trunk/Ohana/src/opihi/pantasks/JobOps.c

    r32632 r36623  
    107107    job[0].mode = JOB_CONTROLLER;
    108108  }
    109   job[0].priority = task[0].priority;
     109  job[0].nicelevel = task[0].nicelevel;
    110110
    111111  /* we need our own copy of task[0].argv argc is the number of valid args, like the usual command line.  we

  • trunk/Ohana/src/opihi/pantasks/LocalJob.c

    r32632 r36623  
    162162
    163163  /* set nice level for the child process -- maybe I should not exit here... */
    164   if (job[0].priority) {
    165       status = setpriority (PRIO_PROCESS, pid, job[0].priority);
     164  if (job[0].nicelevel) {
     165      status = setpriority (PRIO_PROCESS, pid, job[0].nicelevel);
    166166      if (status == -1) {
    167           gprint (GP_ERR, "error setting priority\n");
     167          gprint (GP_ERR, "error setting nice level\n");
    168168          perror ("setpriority: ");
    169169          exit (2);

  • trunk/Ohana/src/opihi/pantasks/TaskOps.c

    r32632 r36623  
    487487
    488488  NewTask[0].active = TRUE;
    489   NewTask[0].priority = 0;
     489  NewTask[0].nicelevel = 0;
    490490  return (NewTask);
    491491}

  • trunk/Ohana/src/opihi/pantasks/init.c

    r32632 r36623  
    3434  {1, "halt",       halt,          "halt the scheduler (no job harvesting)"},
    3535  {1, "host",       task_host,     "define host machine for a task"},
    36   {1, "nice",       task_nice,     "set nice priority level for a task"},
     36  {1, "nice",       task_nice,     "set nice level for a task"},
    3737  {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
    3838  {1, "kill",       kill_job,      "kill job"},

  • trunk/Ohana/src/opihi/pantasks/init_server.c

    r32632 r36623  
    3535  {1, "delete",     delete_job,    "delete job"},
    3636  {1, "host",       task_host,     "define host machine for a task"},
    37   {1, "nice",       task_nice,     "set nice priority level for a task"},
     37  {1, "nice",       task_nice,     "set nice level for a task"},
    3838  {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
    3939  {1, "kill",       kill_job,      "kill job"},

  • trunk/Ohana/src/opihi/pantasks/task_nice.c

    r32632 r36623  
    44
    55  char *endptr = NULL;
    6   int priority;
     6  int nicelevel;
    77  Task *task;
    88
    99  if (argc != 2) {
    10     gprint (GP_ERR, "USAGE: nice (priority)\n");
     10    gprint (GP_ERR, "USAGE: nice (nicelevel)\n");
    1111    return (FALSE);
    1212  }
    … …  
    2020  }
    2121
    22   priority = strtol (argv[1], &endptr, 10);
     22  nicelevel = strtol (argv[1], &endptr, 10);
    2323  if (*endptr) goto fail;
    24   if (priority < 0) goto fail;
    25   if (priority > 20) goto fail;
     24  if (nicelevel < 0) goto fail;
     25  if (nicelevel > 20) goto fail;
    2626
    27   task[0].priority = priority;
     27  task[0].nicelevel = nicelevel;
    2828  JobTaskUnlock();
    2929  return (TRUE);
    3030
    3131fail:
    32     gprint (GP_ERR, "ERROR: nice (priority) -- priority must be an integer 0 to 20\n");
     32    gprint (GP_ERR, "ERROR: nice (nicelevel) -- nicelevel must be an integer 0 to 20\n");
    3333    return (FALSE);
    3434}

  • trunk/Ohana/src/opihi/pclient/job.c

    r32632 r36623  
    33int job (int argc, char **argv) {
    44
    5   int i, N, pid, status, priority;
     5  int i, N, pid, status, nicelevel;
    66  char **targv;
    77
    8   priority = 0;
     8  nicelevel = 0;
    99  if ((N = get_argument (argc, argv, "-nice"))) {
    1010    remove_argument (N, &argc, argv);
    11     priority = atoi (argv[N]);
     11    nicelevel = atoi (argv[N]);
    1212    remove_argument (N, &argc, argv);
    1313  }
    … …  
    6262
    6363  /* set nice level for the child process */
    64   if (priority) {
    65       status = setpriority (PRIO_PROCESS, pid, priority);
     64  if (nicelevel) {
     65      status = setpriority (PRIO_PROCESS, pid, nicelevel);
    6666      if (status == -1) {
    67           gprint (GP_ERR, "error setting priority\n");
     67          gprint (GP_ERR, "error setting nicelevel\n");
    6868          perror ("setpriority: ");
    6969          exit (2);

  • trunk/Ohana/src/opihi/pcontrol/JobOps.c

    r36375 r36623  
    207207}
    208208
    209 IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts) {
     209IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts) {
    210210
    211211  int JobID;
    … …  
    232232
    233233  job[0].mode     = mode;
    234   job[0].priority = priority;
     234  job[0].nicelevel = nicelevel;
    235235
    236236  job[0].state = 0;

  • trunk/Ohana/src/opihi/pcontrol/StartJob.c

    r32632 r36623  
    2525  bzero (line, Nline);
    2626  strcpy (line, "job");
    27   if (job[0].priority) {
     27  if (job[0].nicelevel) {
    2828    char tmp[64];
    29     snprintf (tmp, 64, " -nice %d", job[0].priority);
     29    snprintf (tmp, 64, " -nice %d", job[0].nicelevel);
    3030    strcat (line, tmp);
    3131  }

  • trunk/Ohana/src/opihi/pcontrol/job.c

    r32632 r36623  
    55  char *Host = NULL;
    66  char **targv = NULL;
    7   int i, N, Mode, targc, Timeout, priority;
     7  int i, N, Mode, targc, Timeout, nicelevel;
    88  IDtype JobID;
    99  char **xhosts = NULL;
    … …  
    4343  }
    4444
    45   priority = 0;
     45  nicelevel = 0;
    4646  if ((N = get_argument (argc, argv, "-nice"))) {
    4747    remove_argument (N, &argc, argv);
    48     priority = atoi (argv[N]);
     48    nicelevel = atoi (argv[N]);
    4949    remove_argument (N, &argc, argv);
    5050  }
    … …  
    7676
    7777  // a JobID < 0 mean the job was not accepted
    78   JobID = AddJob (Host, Mode, Timeout, priority, targc, targv, Nxhosts, xhosts);
     78  JobID = AddJob (Host, Mode, Timeout, nicelevel, targc, targv, Nxhosts, xhosts);
    7979  gprint (GP_LOG, "JobID: %d\n", (int) JobID);
    8080  return (TRUE);
    … …  
    8282 usage:
    8383    gprint (GP_ERR, "USAGE: job [options] (arg0) (arg1) ... (argN)\n");
    84     gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host)\n");
     84    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host) -nice (level)\n");
    8585    gprint (GP_ERR, "  arguments of the form @MAX_THREADS@ will be replaced when the job is launched\n");
    8686

  • trunk/Ohana/src/opihi/pcontrol/status.c

    r36375 r36623  
    154154
    155155    PrintID (GP_LOG, job[0].JobID);
    156     gprint (GP_LOG, " %2d ", job[0].priority);
     156    gprint (GP_LOG, " %2d ", job[0].nicelevel);
    157157    for (j = 0; j < job[0].argc; j++) {
    158158      gprint (GP_LOG, "%s ", job[0].argv[j]);

  • trunk/ippScripts/scripts/ipp_apply_burntool_single.pl

  • trunk/ippScripts/scripts/publish_file.pl

  • trunk/ippTools/src/fftool.c

    r36555 r36623  
    180180    psString whereClause = psDBGenerateWhereConditionSQL(skycalWhereMD, NULL);
    181181    psStringAppend(&where, "\nAND %s", whereClause);
    182     psStringAppend(&select, where);
     182    psStringAppend(&select, " %s", where);
    183183    psFree(whereClause);
    184184    psFree(skycalWhereMD);

  • trunk/ippTools/src/remotetool.c

    r36515 r36623  
    149149    psFree(limitString);
    150150  }
    151   if (!p_psDBRunQueryF(config->dbh, query)) {
     151  if (!p_psDBRunQuery(config->dbh, query)) {
    152152    psError(PS_ERR_UNKNOWN, false, "database error");
    153153    psFree(query);
    … …  
    313313{
    314314  PS_ASSERT_PTR_NON_NULL(config, false);
    315   PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
     315  // PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
    316316 
    317317  psMetadata *where = psMetadataAlloc();
    … …  
    341341{
    342342  PS_ASSERT_PTR_NON_NULL(config, false);
    343   PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
     343  // PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
    344344 
    345345  psMetadata *where = psMetadataAlloc();

  • trunk/ippconfig/recipes/ppSub.config

  • trunk/ippconfig/recipes/reductionClasses.mdc

  • trunk/psModules/src/camera/pmFPAfileIO.c

    r36375 r36623  
    3939#include "pmSourceDiffStats.h"
    4040#include "pmSourceSatstar.h"
     41#include "pmSourceLensing.h"
    4142#include "pmSource.h"
    4243#include "pmSourceFitModel.h"

  • trunk/psModules/src/camera/pmReadoutFake.c

    r35768 r36623  
    2727#include "pmSourceDiffStats.h"
    2828#include "pmSourceSatstar.h"
     29#include "pmSourceLensing.h"
    2930#include "pmSource.h"
    3031#include "pmSourceFitModel.h"

  • trunk/psModules/src/extras/pmThreadTools.c

    r35768 r36623  
    3737#include "pmSourcePhotometry.h"
    3838#include "pmSourceSatstar.h"
     39#include "pmSourceLensing.h"
    3940#include "pmSource.h"
    4041

  • trunk/psModules/src/extras/pmVisual.c

    r34403 r36623  
    4141// #include "pmSourceDiffStats.h"
    4242#include "pmSourceSatstar.h"
     43// #include "pmSourceLensing.h"
    4344// #include "pmSource.h"
    4445// #include "pmSourceFitModel.h"

  • trunk/psModules/src/imcombine/pmPSFEnvelope.c

    r35455 r36623  
    2727#include "pmSourceDiffStats.h"
    2828#include "pmSourceSatstar.h"
     29#include "pmSourceLensing.h"
    2930#include "pmSource.h"
    3031#include "pmSourceFitModel.h"

  • trunk/psModules/src/imcombine/pmSubtractionSimple.c

    r35938 r36623  
    3434#include "pmSourceSatstar.h"
    3535
     36#include "pmSourceLensing.h"
    3637#include "pmSource.h"
    3738

  • trunk/psModules/src/imcombine/pmSubtractionStamps.c

    r34403 r36623  
    2626#include "pmSourceDiffStats.h"
    2727#include "pmSourceSatstar.h"
     28#include "pmSourceLensing.h"
    2829#include "pmSource.h"
    2930

  • trunk/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1212pmSourceIO_CMF_PS1_V1.v1.c
        1313pmSourceIO_CMF_PS1_V4.c
         14pmSourceIO_CMF_PS1_V5.c
        1415pmSourceIO_CMF_PS1_SV1.c
        1516pmSourceIO_CMF_PS1_SV2.c

  • trunk/psModules/src/objects/Makefile.am

    r36375 r36623  
    4949        pmSourceIO_CMF_PS1_V3.c \
    5050        pmSourceIO_CMF_PS1_V4.c \
     51        pmSourceIO_CMF_PS1_V5.c \
    5152        pmSourceIO_CMF_PS1_SV1.c \
    5253        pmSourceIO_CMF_PS1_SV2.c \
    … …  
    7677        pmGrowthCurve.c \
    7778        pmSourceMatch.c \
     79        pmSourceLensing.c \
    7880        pmDetEff.c \
    7981        pmSourceGroups.c \
    … …  
    125127        pmGrowthCurveGenerate.h \
    126128        pmSourceMatch.h \
     129        pmSourceLensing.h \
    127130        pmDetEff.h \
    128131        pmSourceGroups.h \
    … …  
    145148pmSourceIO_CMF_PS1_V3.c \
    146149pmSourceIO_CMF_PS1_V4.c \
     150pmSourceIO_CMF_PS1_V5.c \
    147151pmSourceIO_CMF_PS1_DV1.c \
    148152pmSourceIO_CMF_PS1_DV2.c \
    … …  
    163167        mksource.pl pmSourceIO_CMF.c.in PS1_V4 pmSourceIO_CMF_PS1_V4.c
    164168
     169pmSourceIO_CMF_PS1_V5.c : pmSourceIO_CMF.c.in mksource.pl
     170        mksource.pl pmSourceIO_CMF.c.in PS1_V5 pmSourceIO_CMF_PS1_V5.c
     171
    165172pmSourceIO_CMF_PS1_DV1.c : pmSourceIO_CMF.c.in mksource.pl
    166173        mksource.pl pmSourceIO_CMF.c.in PS1_DV1 pmSourceIO_CMF_PS1_DV1.c

  • trunk/psModules/src/objects/mksource.pl

    r34403 r36623  
    1919               "PS1_V3", 3,
    2020               "PS1_V4", 4,
     21               "PS1_V5", 5,
    2122    );
    2223%cmfmodes_dv = ("PS1_DV1", 1,

  • trunk/psModules/src/objects/models/pmModel_DEV.c

    r36375 r36623  
    4343#include "pmSourceDiffStats.h"
    4444#include "pmSourceSatstar.h"
     45#include "pmSourceLensing.h"
    4546#include "pmSource.h"
    4647#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_EXP.c

    r36375 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_GAUSS.c

    r36085 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_PGAUSS.c

    r36085 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_PS1_V1.c

    r36085 r36623  
    4242#include "pmSourceDiffStats.h"
    4343#include "pmSourceSatstar.h"
     44#include "pmSourceLensing.h"
    4445#include "pmSource.h"
    4546#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_QGAUSS.c

    r36085 r36623  
    4242#include "pmSourceDiffStats.h"
    4343#include "pmSourceSatstar.h"
     44#include "pmSourceLensing.h"
    4445#include "pmSource.h"
    4546#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_RGAUSS.c

    r36085 r36623  
    4141#include "pmSourceDiffStats.h"
    4242#include "pmSourceSatstar.h"
     43#include "pmSourceLensing.h"
    4344#include "pmSource.h"
    4445#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_SERSIC.c

    r36375 r36623  
    5050#include "pmSourceDiffStats.h"
    5151#include "pmSourceSatstar.h"
     52#include "pmSourceLensing.h"
    5253#include "pmSource.h"
    5354#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/models/pmModel_TRAIL.c

    r36085 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmDetEff.c

    r34403 r36623  
    2424#include "pmSourceDiffStats.h"
    2525#include "pmSourceSatstar.h"
     26#include "pmSourceLensing.h"
    2627#include "pmSource.h"
    2728#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmGrowthCurve.c

    r34403 r36623  
    3737#include "pmSourceDiffStats.h"
    3838#include "pmSourceSatstar.h"
     39#include "pmSourceLensing.h"
    3940#include "pmSource.h"
    4041#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmGrowthCurveGenerate.c

    r34403 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmModelUtils.c

    r36375 r36623  
    3939#include "pmSourceDiffStats.h"
    4040#include "pmSourceSatstar.h"
     41#include "pmSourceLensing.h"
    4142#include "pmSource.h"
    4243#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmMoments.h

    r32347 r36623  
    4444    float Myyyy;   ///< fourth moment
    4545
     46  // float wSum;    ///< window-weighted sum (NOT needed by lensing)
     47
    4648    float Sum;    ///< Pixel sum above sky (background).
    4749    float Peak;   ///< Peak counts above sky.

  • trunk/psModules/src/objects/pmPCM_MinimizeChisq.c

    r36375 r36623  
    3838#include "pmSourceDiffStats.h"
    3939#include "pmSourceSatstar.h"
     40#include "pmSourceLensing.h"
    4041#include "pmSource.h"
    4142#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPCMdata.c

    r36375 r36623  
    3838#include "pmSourceDiffStats.h"
    3939#include "pmSourceSatstar.h"
     40#include "pmSourceLensing.h"
    4041#include "pmSource.h"
    4142#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSF.c

    r35768 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSF_IO.c

    r34403 r36623  
    5454#include "pmSourceDiffStats.h"
    5555#include "pmSourceSatstar.h"
     56#include "pmSourceLensing.h"
    5657#include "pmSource.h"
    5758#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSFtry.c

    r34403 r36623  
    3636#include "pmSourceDiffStats.h"
    3737#include "pmSourceSatstar.h"
     38#include "pmSourceLensing.h"
    3839#include "pmSource.h"
    3940#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSFtryFitEXT.c

    r35768 r36623  
    3636#include "pmSourceDiffStats.h"
    3737#include "pmSourceSatstar.h"
     38#include "pmSourceLensing.h"
    3839#include "pmSource.h"
    3940#include "pmSourceUtils.h"

  • trunk/psModules/src/objects/pmPSFtryFitPSF.c

    r36123 r36623  
    3434#include "pmSourceDiffStats.h"
    3535#include "pmSourceSatstar.h"
     36#include "pmSourceLensing.h"
    3637#include "pmSource.h"
    3738#include "pmSourceFitModel.h"
    … …  
    120121    pmSourceVisualShowModelFits (psfTry->psf, psfTry->sources, maskVal);
    121122
    122     psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n);
     123    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources (%d x %d model)\n", psTimerMark ("psf.fit"), Npsf, psfTry->sources->n, psfTry->psf->trendNx, psfTry->psf->trendNy);
    123124    psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, psfTry->sources->n);
    124125

  • trunk/psModules/src/objects/pmPSFtryMakePSF.c

    r35768 r36623  
    3535#include "pmSourceDiffStats.h"
    3636#include "pmSourceSatstar.h"
     37#include "pmSourceLensing.h"
    3738#include "pmSource.h"
    3839#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSFtryMetric.c

    r34403 r36623  
    3535#include "pmSourceDiffStats.h"
    3636#include "pmSourceSatstar.h"
     37#include "pmSourceLensing.h"
    3738#include "pmSource.h"
    3839#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmPSFtryModel.c

    r36123 r36623  
    3636#include "pmSourceDiffStats.h"
    3737#include "pmSourceSatstar.h"
     38#include "pmSourceLensing.h"
    3839#include "pmSource.h"
    3940#include "pmSourceFitModel.h"
    … …  
    111112
    112113    // set the max order (0 = constant) which the number of psf stars can support:
     114    int MaxOrderForStars = 0;
     115
     116    // we require only 3 stars for n = 0, increase stars / cell for higher order
     117    if (sources->n >=  16) MaxOrderForStars = 1; //  4 cells, 4 per cell
     118    if (sources->n >=  54) MaxOrderForStars = 2; //  9 cells, 6 per cell
     119    if (sources->n >= 128) MaxOrderForStars = 3; // 16 cells, 8 per cell
     120    if (sources->n >= 300) MaxOrderForStars = 4; // 25 cells, 12 per cell
     121    if (sources->n >  576) MaxOrderForStars = 5; // 36 cells, 16 per cell
     122
    113123    // rule of thumb: require 3 stars per 'cell' (order+1)^2
    114     int MaxOrderForStars = 0;
    115     if (sources->n >= 12) MaxOrderForStars = 1; // 4 cells
    116     if (sources->n >= 27) MaxOrderForStars = 2; // 9 cells
    117     if (sources->n >= 48) MaxOrderForStars = 3; // 16 cells
    118     if (sources->n >  75) MaxOrderForStars = 4; // 25 cells
     124    // if (sources->n >= 12) MaxOrderForStars = 1; // 4 cells
     125    // if (sources->n >= 27) MaxOrderForStars = 2; // 9 cells
     126    // if (sources->n >= 48) MaxOrderForStars = 3; // 16 cells
     127    // if (sources->n >= 75) MaxOrderForStars = 4; // 25 cells
     128    // if (sources->n > 108) MaxOrderForStars = 5; // 36 cells
    119129
    120130    int orderMax = PS_MAX (options->psfTrendNx, options->psfTrendNy);

  • trunk/psModules/src/objects/pmPhotObj.c

    r34403 r36623  
    3636#include "pmSourceDiffStats.h"
    3737#include "pmSourceSatstar.h"
     38#include "pmSourceLensing.h"
    3839#include "pmSource.h"
    3940

  • trunk/psModules/src/objects/pmSource.c

    r36375 r36623  
    4141#include "pmSourcePhotometry.h"
    4242#include "pmSourceSatstar.h"
     43#include "pmSourceLensing.h"
    4344#include "pmSource.h"
    4445
    … …  
    6869    psFree(tmp->galaxyFits);
    6970    psFree(tmp->radialAper);
     71    psFree(tmp->lensingOBJ);
     72    psFree(tmp->lensingPSF);
    7073    psTrace("psModules.objects", 10, "---- end ----\n");
    7174}
    … …  
    166169    source->diffStats = NULL;
    167170    source->galaxyFits = NULL;
     171    source->lensingOBJ = NULL;
     172    source->lensingPSF = NULL;
    168173    source->radialAper = NULL;
    169174    source->parent = NULL;
    … …  
    249254
    250255    source->region           = in->region;
     256
     257    // XXX I am not copying the pointers to things like the blends, satstar profile, galaxyFits, etc
    251258
    252259    return(source);

  • trunk/psModules/src/objects/pmSource.h

    r36375 r36623  
    120120    pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
    121121    pmSourceGalaxyFits *galaxyFits;     ///< fits to galaxy models (psphotFullForce only)
     122    pmSourceLensing *lensingOBJ;        ///< lensing moments parameters (per object)
     123    pmSourceLensing *lensingPSF;        ///< lensing moments parameters (psf, interpolated)
    122124    psArray *radialAper;                ///< radial flux in circular apertures
    123125    pmSource *parent;                   ///< reference to the master source from which this is derived

  • trunk/psModules/src/objects/pmSourceContour.c

    r34403 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344

  • trunk/psModules/src/objects/pmSourceExtendedPars.h

    r36375 r36623  
    118118pmSourceGalaxyFits *pmSourceGalaxyFitsAlloc (void);
    119119
    120 
    121120/// @}
    122121# endif /* PM_SOURCE_H */

  • trunk/psModules/src/objects/pmSourceFitModel.c

    r36375 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourcePhotometry.h"

  • trunk/psModules/src/objects/pmSourceFitPCM.c

    r36375 r36623  
    3838#include "pmSourceDiffStats.h"
    3939#include "pmSourceSatstar.h"
     40#include "pmSourceLensing.h"
    4041#include "pmSource.h"
    4142#include "pmSourcePhotometry.h"

  • trunk/psModules/src/objects/pmSourceFitSet.c

    r36375 r36623  
    3939#include "pmSourceDiffStats.h"
    4040#include "pmSourceSatstar.h"
     41#include "pmSourceLensing.h"
    4142#include "pmSource.h"
    4243#include "pmSourcePhotometry.h"

  • trunk/psModules/src/objects/pmSourceGroups.c

    r34403 r36623  
    2525#include "pmSourceDiffStats.h"
    2626#include "pmSourceSatstar.h"
     27#include "pmSourceLensing.h"
    2728#include "pmSource.h"
    2829#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO.c

    r36441 r36623  
    4747#include "pmSourceDiffStats.h"
    4848#include "pmSourceSatstar.h"
     49#include "pmSourceLensing.h"
    4950#include "pmSource.h"
    5051#include "pmSourceFitModel.h"
    … …  
    597598            PM_SOURCES_WRITE("PS1_V3",    CMF_PS1_V3);
    598599            PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
     600            PM_SOURCES_WRITE("PS1_V5",    CMF_PS1_V5);
    599601            PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
    600602            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
    … …  
    11161118            PM_SOURCES_READ_PSF("PS1_V3",    CMF_PS1_V3);
    11171119            PM_SOURCES_READ_PSF("PS1_V4",    CMF_PS1_V4);
     1120            PM_SOURCES_READ_PSF("PS1_V5",    CMF_PS1_V5);
    11181121            PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
    11191122            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
    … …  
    13891392        PM_SOURCES_READ_XSRC("PS1_V3",    CMF_PS1_V3);
    13901393        PM_SOURCES_READ_XSRC("PS1_V4",    CMF_PS1_V4);
     1394        PM_SOURCES_READ_XSRC("PS1_V5",    CMF_PS1_V5);
    13911395        PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
    13921396        PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
    … …  
    14281432        PM_SOURCES_READ_XFIT("PS1_V3",    CMF_PS1_V3);
    14291433        PM_SOURCES_READ_XFIT("PS1_V4",    CMF_PS1_V4);
     1434        PM_SOURCES_READ_XFIT("PS1_V5",    CMF_PS1_V5);
    14301435        PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
    14311436        PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
    … …  
    14661471        PM_SOURCES_READ_XRAD("PS1_V3",    CMF_PS1_V3);
    14671472        PM_SOURCES_READ_XRAD("PS1_V4",    CMF_PS1_V4);
     1473        PM_SOURCES_READ_XRAD("PS1_V5",    CMF_PS1_V5);
    14681474        PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
    14691475        PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
    … …  
    15041510        PM_SOURCES_READ_XGAL("PS1_V3",    CMF_PS1_V3);
    15051511        PM_SOURCES_READ_XGAL("PS1_V4",    CMF_PS1_V4);
     1512        PM_SOURCES_READ_XGAL("PS1_V5",    CMF_PS1_V5);
    15061513        PM_SOURCES_READ_XGAL("PS1_SV1",   CMF_PS1_SV1);
    15071514        PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);

  • trunk/psModules/src/objects/pmSourceIO.h

    r36441 r36623  
    3737MK_PROTO(CMF_PS1_V3);
    3838MK_PROTO(CMF_PS1_V4);
     39MK_PROTO(CMF_PS1_V5);
    3940MK_PROTO(CMF_PS1_SV1);
    4041MK_PROTO(CMF_PS1_SV2);

  • trunk/psModules/src/objects/pmSourceIO_CFF.c

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_CMF.c.in

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"
    … …  
    178179        @>PS1_V2,PS1_SV?@         psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_M4C",      PS_DATA_F32, "fourth momemt cos theta",                    moments.M_c4);
    179180        @>PS1_V2,PS1_SV?@         psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_M4S",      PS_DATA_F32, "fourth momemt sin theta",                    moments.M_s4);
     181
     182        // Lensing parameters:
     183        if (source->lensingOBJ && source->lensingOBJ->smear) {
     184          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X11);
     185          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X12);
     186          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SM_OBJ",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->X22);
     187          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SM_OBJ",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->e1);
     188          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SM_OBJ",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingOBJ->smear->e2);
     189        }
     190
     191        if (source->lensingOBJ && source->lensingOBJ->shear) {
     192          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X11);
     193          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X12);
     194          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SH_OBJ",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->X22);
     195          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SH_OBJ",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->e1);
     196          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_OBJ",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingOBJ->shear->e2);
     197        }
     198
     199        if (source->lensingOBJ && source->lensingPSF->smear) {
     200          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X11);
     201          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X12);
     202          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SM_PSF",  PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->X22);
     203          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SM_PSF",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->e1);
     204          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SM_PSF",   PS_DATA_F32, "smear polarizability element (objects)",     source->lensingPSF->smear->e2);
     205        }
     206
     207        if (source->lensingOBJ && source->lensingPSF->shear) {
     208          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X11_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X11);
     209          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X12_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X12);
     210          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_X22_SH_PSF",  PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->X22);
     211          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E1_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e1);
     212          @>PS1_V4@               psMetadataAdd (row, PS_LIST_TAIL, "LENS_E2_SH_PSF",   PS_DATA_F32, "shear polarizability element (objects)",     source->lensingPSF->shear->e2);
     213        }
    180214
    181215        @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "MOMENTS_R1",       PS_DATA_F32, "first radial moment",                        moments.Mrf);

  • trunk/psModules/src/objects/pmSourceIO_CMP.c

    r35768 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_MatchedRefs.c

    r35560 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_OBJ.c

    r35768 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_RAW.c

    r34403 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_SMPDATA.c

    r36441 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceIO_SX.c

    r35768 r36623  
    4444#include "pmSourceDiffStats.h"
    4545#include "pmSourceSatstar.h"
     46#include "pmSourceLensing.h"
    4647#include "pmSource.h"
    4748#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceMatch.c

    r35383 r36623  
    2525#include "pmSourceDiffStats.h"
    2626#include "pmSourceSatstar.h"
     27#include "pmSourceLensing.h"
    2728#include "pmSource.h"
    2829#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceMoments.c

    r36375 r36623  
    4242#include "pmSourceDiffStats.h"
    4343#include "pmSourceSatstar.h"
     44#include "pmSourceLensing.h"
    4445#include "pmSource.h"
    4546
    … …  
    435436        }
    436437    }
     438    // NOT needed : source->moments->wSum = Sum;
     439
    437440    source->moments->Mxx = XX/Sum;
    438441    source->moments->Mxy = XY/Sum;

  • trunk/psModules/src/objects/pmSourceOutputs.c

    r35768 r36623  
    3333#include "pmSourceDiffStats.h"
    3434#include "pmSourceSatstar.h"
     35#include "pmSourceLensing.h"
    3536#include "pmSource.h"
    3637#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourcePhotometry.c

    r36375 r36623  
    4040#include "pmSourceDiffStats.h"
    4141#include "pmSourceSatstar.h"
     42#include "pmSourceLensing.h"
    4243#include "pmSource.h"
    4344#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourcePlotApResid.c

    r34403 r36623  
    4242#include "pmSourceDiffStats.h"
    4343#include "pmSourceSatstar.h"
     44#include "pmSourceLensing.h"
    4445#include "pmSource.h"
    4546#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourcePlotMoments.c

    r34403 r36623  
    4545#include "pmSourceDiffStats.h"
    4646#include "pmSourceSatstar.h"
     47#include "pmSourceLensing.h"
    4748#include "pmSource.h"
    4849#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourcePlotPSFModel.c

    r35768 r36623  
    4646#include "pmSourceDiffStats.h"
    4747#include "pmSourceSatstar.h"
     48#include "pmSourceLensing.h"
    4849#include "pmSource.h"
    4950#include "pmSourceFitModel.h"

  • trunk/psModules/src/objects/pmSourceSky.c

    r35560 r36623  
    4141#include "pmSourceDiffStats.h"
    4242#include "pmSourceSatstar.h"
     43#include "pmSourceLensing.h"
    4344#include "pmSource.h"
    4445

  • trunk/psModules/src/objects/pmSourceUtils.c

    r35560 r36623  
    4141#include "pmSourceDiffStats.h"
    4242#include "pmSourceSatstar.h"
     43#include "pmSourceLensing.h"
    4344#include "pmSource.h"
    4445

  • trunk/psModules/src/objects/pmSourceVisual.c

    r35768 r36623  
    2323#include "pmSourceDiffStats.h"
    2424#include "pmSourceSatstar.h"
     25#include "pmSourceLensing.h"
    2526#include "pmSource.h"
    2627#include "pmSourceFitModel.h"

  • trunk/psModules/src/psmodules.h

    r36085 r36623  
    135135#include <pmSourceSatstar.h>
    136136#include <pmSourceDiffStats.h>
     137#include <pmSourceLensing.h>
    137138#include <pmSource.h>
    138139#include <pmSourceFitModel.h>

  • trunk/psphot/src

  • trunk/psphot/src/Makefile.am

    r36441 r36623  
    208208        psphotMakeGrowthCurve.c        \
    209209        psphotMagnitudes.c             \
     210        psphotLensing.c        \
    210211        psphotSetMaskBits.c            \
    211212        psphotSkyReplace.c             \

  • trunk/psphot/src/psphot.h

    r36441 r36623  
    144144bool            psphotMagnitudesReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, pmReadout *readout, psArray *sources, pmPSF *psf);
    145145bool            psphotMagnitudes_Threaded (psThreadJob *job);
     146
     147bool            psphotLensing (pmConfig *config, const pmFPAview *view, const char *filerule);
     148bool            psphotLensingReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
     149bool            psphotLensingPSFtrendsReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
    146150
    147151bool            psphotEfficiency (pmConfig *config, const pmFPAview *view, const char *filerule);

  • trunk/psphot/src/psphotApResid.c

    r34404 r36623  
    214214
    215215        // XXX make this user-configurable?
    216         if (source->psfMagErr > 0.01) continue;
     216        if (source->psfMagErr > 0.03) continue;
    217217
    218218        // aperture residual for this source
    … …  
    267267
    268268    // set the max order (0 = constant) which the number of psf stars can support:
    269     // rule of thumb: require 3 stars per 'cell' (order+1)^2
     269    // we require only 3 stars for n = 0, increase stars / cell for higher order
    270270    int MaxOrderForStars = 0;
    271     if (Npsf >= 12) MaxOrderForStars = 1; // 4 cells
    272     if (Npsf >= 27) MaxOrderForStars = 2; // 9 cells
    273     if (Npsf >= 48) MaxOrderForStars = 3; // 16 cells
    274     if (Npsf >  75) MaxOrderForStars = 4; // 25 cells
     271    if (Npsf >=  16) MaxOrderForStars = 1; // 4 cells
     272    if (Npsf >=  54) MaxOrderForStars = 2; // 9 cells
     273    if (Npsf >= 128) MaxOrderForStars = 3; // 16 cells
     274    if (Npsf >= 300) MaxOrderForStars = 4; // 25 cells
     275    if (Npsf >  576) MaxOrderForStars = 5; // 36 cells
    275276
    276277    pmTrend2DMode mode = PM_TREND_MAP;

  • trunk/psphot/src/psphotChoosePSF.c

    r35769 r36623  
    399399    char *modelName = pmModelClassGetName (psf->type);
    400400    psLogMsg ("psphot.pspsf", PS_LOG_WARN, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
    401     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
     401    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f (%d x %d model)\n", modelName, psf->ApResid, psf->dApResid, psf->trendNx, psf->trendNy);
    402402
    403403    psFree (options);

  • trunk/psphot/src/psphotReadout.c

    r36375 r36623  
    340340    // calculate source magnitudes
    341341    if (!psphotMagnitudes(config, view, filerule)) { // pass 1 (detections->allSources)
    342       psErrorStackPrint(stderr, "Unable to do magnitudes.");
     342        psErrorStackPrint(stderr, "Unable to do magnitudes.");
    343343        psErrorClear();
    344344    }
     345
     346    // calculate lensing parameters
     347    if (!psphotLensing(config, view, filerule)) {
     348        psErrorStackPrint(stderr, "Unable to do lensing parameters.");
     349        psErrorClear();
     350    }
     351
    345352    if (!psphotEfficiency(config, view, filerule)) { // pass 1
    346353        psErrorStackPrint(stderr, "Unable to determine detection efficiencies from fake sources");
    … …  
    353360    // replace background in residual image
    354361    if (!psphotSkyReplace (config, view, filerule)) { // pass 1
    355       psErrorStackPrint(stderr, "Unable to replace sky");
    356       psErrorClear();
     362        psErrorStackPrint(stderr, "Unable to replace sky");
     363        psErrorClear();
    357364    }
    358365
    359366    // drop the references to the image pixels held by each source
    360367    if (!psphotSourceFreePixels (config, view, filerule)) { // pass 1
    361       psErrorStackPrint(stderr, "Unable to free source pixels");
    362       psErrorClear();
     368        psErrorStackPrint(stderr, "Unable to free source pixels");
     369        psErrorClear();
    363370    }
    364371

  • trunk/psphot/src/psphotStackImageLoop.c

Note: See TracChangeset for help on using the changeset viewer.