IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 6, 2009, 6:52:51 PM (17 years ago)
Author:
Paul Price
Message:

Making ppSub inverse mode work. Seems to work now --- produces the correct output files for inverse mode on and off, photometry on and off.

Location:
branches/pap/ppSub/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/pap/ppSub/src

    • Property svn:ignore

      •  

        old new  
        1010stamp-h1
        1111ppSubKernel
         12ppSubErrorCodes.h
         13ppSubErrorCodes.c

  • branches/pap/ppSub/src/ppSubFiles.c

    r23711 r23719  
    1212
    1313// Input files
    14 static const char *inputFiles[] = { "PPSUB.OUTPUT", "PPSUB.OUTPUT.MASK", "PPSUB.OUTPUT.VARIANCE",
    15                                     "PPSUB.OUTPUT.KERNELS", "PPSUB.OUTPUT.JPEG1", "PPSUB.OUTPUT.JPEG2",
    16                                     NULL };
     14static const char *inputFiles[] = { "PPSUB.INPUT", "PPSUB.INPUT.MASK", "PPSUB.INPUT.VARIANCE",
     15                                    "PPSUB.INPUT.SOURCES", "PPSUB.REF", "PPSUB.REF.MASK",
     16                                    "PPSUB.REF.VARIANCE", "PPSUB.REF.SOURCES", NULL };
    1717
    1818// Convolved files
    … …  
    2323// Subtraction files
    2424static const char *subFiles[] = { "PPSUB.OUTPUT", "PPSUB.OUTPUT.MASK", "PPSUB.OUTPUT.VARIANCE",
    25                                   "PPSUB.OUTPUT.KERNELS", "PPSUB.OUTPUT.JPEG1", "PPSUB.OUTPUT.JPEG2",
     25                                  "PPSUB.OUTPUT.JPEG1", "PPSUB.OUTPUT.JPEG2",
    2626                                  NULL };
    2727
    … …  
    3030
    3131// Inverse subtraction files
    32 static const char *invFiles[] = { "PPSUB.OUTINV", "PPSUB.OUTINV.MASK", "PPSUB.OUTINV.VARIANCE",
    33                                   "PPSUB.OUTINV.KERNELS", "PPSUB.OUTINV.JPEG1", "PPSUB.OUTINV.JPEG2",
    34                                   NULL };
     32static const char *invFiles[] = { "PPSUB.INVERSE", "PPSUB.INVERSE.MASK", "PPSUB.INVERSE.VARIANCE", NULL };
    3533
    3634// Inverse subtraction photometry
    37 static const char *subPhotFiles[] = { "PPSUB.OUTINV.SOURCES", NULL };
     35static const char *invPhotFiles[] = { "PPSUB.INVERSE.SOURCES", NULL };
     36
     37// PSF files
     38static const char *psfFiles[] = { "PSPHOT.PSF.SAVE", NULL };
    3839
    3940// Calculation (may be either input or output) files
    … …  
    4748    )
    4849{
    49     for (int i = 0; imageFiles[i]; i++) {
    50         pmFPAfileActivate(config->files, files[i], state);
     50    for (int i = 0; files[i]; i++) {
     51        pmFPAfileActivate(config->files, state, files[i]);
    5152    }
    5253    return;
    … …  
    6263    )
    6364{
    64     for (int i = 0; imageFiles[i]; i++) {
     65    for (int i = 0; files[i]; i++) {
    6566        pmFPAfile *file = pmFPAfileSelectSingle(config->files, files[i], 0);
    6667        if (file && file->save == save) {
    67             pmFPAfileActivate(config->files, files[i], state);
     68            pmFPAfileActivate(config->files, state, files[i]);
    6869        }
    6970    }
    … …  
    7677
    7778    if (files & PPSUB_FILES_INPUT) {
    78         filesActivate(inputFiles, state);
     79        filesActivate(config, inputFiles, state);
    7980        filesActivateSave(config, calcFiles, false, state);
    8081    }
    … …  
    9596        filesActivate(config, invPhotFiles, state);
    9697    }
     98    if (files & PPSUB_FILES_PSF) {
     99        filesActivate(config, psfFiles, state);
     100    }
    97101    if (files & PPSUB_FILES_PHOT) {
    98         psphotFilesActivate(config, false);
     102        psphotFilesActivate(config, state);
    99103    }
    100104
    … …  
    110114}
    111115
    112 bool ppSubFilesIterateDown(pmConfig *config)
     116bool ppSubFilesIterateDown(pmConfig *config, ppSubFiles files)
    113117{
    114118    psAssert(config, "Require configuration");
     119
     120    ppSubFilesActivate(config, PPSUB_FILES_ALL, false);
     121    ppSubFilesActivate(config, files, true);
    115122
    116123    pmFPAview *view = pmFPAviewAlloc(0);// View to FPA top
    … …  
    139146    }
    140147
     148    ppSubFilesActivate(config, PPSUB_FILES_ALL, false);
     149
    141150    return true;
    142151}
    143152
    144 bool ppSubFilesIterateUp(pmConfig *config)
     153bool ppSubFilesIterateUp(pmConfig *config, ppSubFiles files)
    145154{
    146155    psAssert(config, "Require configuration");
     156
     157    ppSubFilesActivate(config, PPSUB_FILES_ALL, false);
     158    ppSubFilesActivate(config, files, true);
    147159
    148160    pmFPAview *view = ppSubViewReadout(); // View to readout
    … …  
    171183    }
    172184
     185    ppSubFilesActivate(config, PPSUB_FILES_ALL, false);
     186
    173187    return true;
    174188}
Note: See TracChangeset for help on using the changeset viewer.