IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12455


Ignore:
Timestamp:
Mar 15, 2007, 2:29:17 PM (19 years ago)
Author:
magnier
Message:

remove unneeded pmFPAfile elements (and from camera.config)

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

Legend:

Unmodified
Added
Removed

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

    r12299 r12455  
    4747
    4848    psFree (file->filerule);
    49     psFree (file->filextra);
    50     psFree (file->extrule);
    51     psFree (file->extxtra);
    52 
    53     psFree(file->detrend);
     49
     50    psFree (file->filesrc);
     51    psFree (file->detrend);
    5452
    5553    psFree (file->filename);
    … …  
    7371    file->mosaicLevel = PM_FPA_LEVEL_NONE;
    7472
     73    file->type = PM_FPA_FILE_NONE;
     74    file->mode = PM_FPA_MODE_NONE;
     75    file->state = PM_FPA_STATE_CLOSED;
     76
    7577    file->fpa = NULL;
    7678    file->fits = NULL;
    … …  
    8284
    8385    file->filerule = NULL;
    84     file->filextra = NULL;
    85     file->extrule  = NULL;
    86     file->extxtra  = NULL;
    8786
    8887    file->filename = NULL;
    8988    file->extname  = NULL;
    9089
    91     file->type = PM_FPA_FILE_NONE;
    92     file->mode = PM_FPA_MODE_NONE;
    93     file->state = PM_FPA_STATE_CLOSED;
    94 
     90    file->filesrc = NULL;
    9591    file->detrend = NULL;
    9692

  • trunk/psModules/src/camera/pmFPAfile.h

    r12299 r12455  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-08 00:41:32 $
     6 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-03-16 00:29:17 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    3737    PM_FPA_FILE_JPEG,
    3838    PM_FPA_FILE_KAPA,
    39     PM_FPA_FILE_MANAPLOT,
    4039    PM_FPA_FILE_MASK,
    4140    PM_FPA_FILE_WEIGHT,
    … …  
    6059typedef struct
    6160{
    62     pmFPAfileMode mode;   // is this file read, written, or only used internally?
    63     pmFPAfileType type;   // what type of data is read from / written to disk?
    64     pmFPAfileState state;  // have we opened the file, etc?
     61    pmFPAfileMode mode;                 // is this file read, written, or only used internally?
     62    pmFPAfileType type;                 // what type of data is read from / written to disk?
     63    pmFPAfileState state;               // have we opened the file, etc?
    6564
    66     // Desired levels, set by the user
    67     pmFPALevel fileLevel;  // what level in the FPA hierarchy represents a unique file?
    68     pmFPALevel dataLevel;  // at what level do we read/write the data segment?
    69     pmFPALevel freeLevel;  // at what level do we free the data segment?
     65    pmFPALevel fileLevel;               // what level in the FPA hierarchy represents a unique file?
     66    pmFPALevel dataLevel;               // at what level do we read/write the data segment? (request by user)
     67    pmFPALevel freeLevel;               // at what level do we free the data segment? (set by program)
    7068    pmFPALevel mosaicLevel;             // at what level is the mosaic?
    7169
    72     pmFPA *fpa;    // for I/O files, we carry a pointer to the complete fpa
    73     psFits *fits;   // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle
     70    pmFPA *fpa;                         // for I/O files, we carry a pointer to the complete fpa
     71    psFits *fits;                       // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle
    7472
    75     bool phu;             // have we written a PHU for this file?
    76     psMetadata *header;   // pointer (view) to the current hdu header
     73    bool phu;                           // have we written a PHU for this file?
     74    psMetadata *header;                 // pointer (view) to the current hdu header
    7775
    78     pmReadout *readout;   // for internal files, we only carry a single readout
     76    pmReadout *readout;                 // for internal files, we only carry a single readout
    7977
    80     psMetadata *names;   // filenames supplied by the cmdline or detdb are saved here
     78    psMetadata *names;                  // filenames supplied by the cmdline or detdb are saved here
    8179
    82     char *filerule;   // rule for constructing a filename when needed
    83     char *filextra;   // additional information used to define filenames (context dependent)
    84     char *extrule;   // rule for constructing an extension name when needed
    85     char *extxtra;   // additional information used to define extension names (context dependent)
     80    char *filerule;                     // rule for constructing a filename when needed
     81    char *filesrc;                      // rule to find file in pmFPAfile->names list
    8682
    87     char *name;    // the name of the rule (useful for debugging / tracing)
    88     char *filename;   // the current name of an active file
    89     char *extname;   // the current name of an active file extension
     83    char *name;                         // the name of the rule (useful for debugging / tracing)
     84    char *filename;                     // the current name of an active file
     85    char *extname;                      // the current name of an active file extension
    9086
    9187    pmDetrendSelectResults *detrend;    // Detrend information, from pmDetrendSelect
    … …  
    9591    // the following elements are used for WRITE-mode IMAGE-type pmFPAfiles to inform
    9692    // the creation of a new image based on an existing image
    97     pmFPA *src;    // if an output FPA, inherit from this FPA
    98     int xBin;    // desired binning in x direction
    99     int yBin;    // desired binning in y direction
     93    pmFPA *src;                         // if an output FPA, inherit from this FPA
     94    int xBin;                           // desired binning in x direction
     95    int yBin;                           // desired binning in y direction
    10096
    10197    psMetadata *camera;                 // Camera configuration

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

    r12300 r12455  
    6868
    6969    file->filerule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.RULE"));
    70     file->filextra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.XTRA"));
    71     file->extrule  = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.RULE"));
    72     file->extxtra  = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.XTRA"));
    7370
    7471    type = psMetadataLookupStr (&status, data, "FILE.TYPE");
    … …  
    155152
    156153    file->filerule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.RULE"));
    157     file->filextra = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.XTRA"));
    158     file->extrule  = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.RULE"));
    159     file->extxtra  = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "EXTNAME.XTRA"));
    160154
    161155    const char *type = psMetadataLookupStr (&status, data, "FILE.TYPE");
    … …  
    338332    // adjust the rules to identify these files in the file->names data
    339333    psFree (file->filerule);
    340     psFree (file->filextra);
     334    // XXX DROP ME: psFree (file->filesrc);
    341335    file->filerule = psStringCopy ("@FILES");
    342     file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
    343 
    344     // find the matching fileLevel
    345     psMetadata *filemenu = psMetadataLookupPtr (&status, format, "FILE");
    346     if (!filemenu) {
    347         psError (PS_ERR_IO, true, "missing FILE in FORMAT");
    348         return NULL;
    349     }
    350     char *levelName = psMetadataLookupStr (&status, filemenu, "PHU");
    351     if (!levelName) {
    352         psError (PS_ERR_IO, true, "missing PHU in FILE in FORMAT");
    353         return NULL;
    354     }
    355     file->fileLevel = pmFPALevelFromName (levelName);
     336    file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
     337
     338    file->fileLevel = pmFPAPHULevel(format);
    356339    if (file->fileLevel == PM_FPA_LEVEL_NONE) {
    357         psError (PS_ERR_IO, true, "unknown level");
     340        psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name);
     341        psFree(phu);
     342        psFree(fpa);
     343        psFree(format);
     344        psFree(file);
    358345        return NULL;
    359346    }
    … …  
    411398
    412399        // associate the filename with the FPA element
    413         char *name = pmFPAfileNameFromRule (file->filextra, file, view);
     400        char *name = pmFPAfileNameFromRule (file->filesrc, file, view);
    414401
    415402        // save the name association in the pmFPAfile structure
    … …  
    482469    // define the rule to identify these files in the file->names data
    483470    psFree (file->filerule);
    484     psFree (file->filextra);
     471    psFree (file->filesrc);
    485472    file->filerule = psStringCopy ("@FILES");
    486     file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
     473    file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
    487474
    488475    // examine the list of input files and validate their cameras
    … …  
    534521
    535522        // associate the filename with the FPA element
    536         char *name = pmFPAfileNameFromRule (file->filextra, file, view);
     523        char *name = pmFPAfileNameFromRule (file->filesrc, file, view);
    537524
    538525        // save the name association in the pmFPAfile structure
    … …  
    602589    if (!fpa) {
    603590        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
     591        psFree(phu);
     592        psFree(format);
    604593        return NULL;
    605594    }
    … …  
    621610    // adjust the rules to identify these files in the file->names data
    622611    psFree (file->filerule);
    623     psFree (file->filextra);
     612    psFree (file->filesrc);
    624613    file->filerule = psStringCopy ("@FILES");
    625     file->filextra = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
    626 
    627     // find the matching fileLevel
    628     psMetadata *filemenu = psMetadataLookupPtr (&status, format, "FILE");
    629     if (!filemenu) {
    630         psError (PS_ERR_IO, true, "missing FILE in FORMAT");
     614    file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}");
     615
     616    file->fileLevel = pmFPAPHULevel(format);
     617    if (file->fileLevel == PM_FPA_LEVEL_NONE) {
     618        psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name);
    631619        psFree(phu);
    632620        psFree(fpa);
    633         psFree(format);
    634         return NULL;
    635     }
    636     char *levelName = psMetadataLookupStr (&status, filemenu, "PHU");
    637     if (!levelName) {
    638         psError (PS_ERR_IO, true, "missing PHU in FILE in FORMAT");
    639         psFree(phu);
    640         psFree(fpa);
    641         psFree(format);
    642         return NULL;
    643     }
    644     file->fileLevel = pmFPALevelFromName (levelName);
    645     if (file->fileLevel == PM_FPA_LEVEL_NONE) {
    646         psError (PS_ERR_IO, true, "unknown level");
    647         psFree(phu);
    648         psFree(fpa);
     621        psFree(file);
    649622        psFree(format);
    650623        return NULL;
    … …  
    657630        psFree(phu);
    658631        psFree(fpa);
     632        psFree(file);
    659633        psFree(format);
    660634        return NULL;
    … …  
    662636
    663637    // associate the filename with the FPA element
    664     char *name = pmFPAfileNameFromRule (file->filextra, file, view);
     638    char *name = pmFPAfileNameFromRule (file->filesrc, file, view);
    665639
    666640    // save the name association in the pmFPAfile structure
    667641    psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[entry]);
    668642
    669     psFree (view);
    670     psFree (name);
    671     psFree (phu);
    672     psFree (fpa);
     643    psFree(phu);
     644    psFree(fpa);
     645    psFree(view);
     646    psFree(name);
     647    psFree(format);
    673648
    674649    if (found)
    … …  
    881856    }
    882857    file->detrend = results;
    883 
    884     // replace the existing value of filextra with the selected detID
    885     psFree (file->filextra);
    886     file->filextra  = psStringCopy (results->detID);
    887 
    888     // set the fileLevel based on the detDB results
    889     // XXX this is not supplied by the db.  use the config value for now.
    890     // file->fileLevel = results->level;
    891858
    892859    psFree (options);

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

    r12300 r12455  
    2727#include "pmPSF_IO.h"
    2828#include "pmFPA_JPEG.h"
    29 #include "pmFPA_MANAPLOT.h"
    3029#include "pmSourcePlots.h"
    3130#include "pmDetrendDB.h"
    … …  
    108107    }
    109108#if 0
     109    // XXXX can we now drop this?  (EAM 2007.03.15)
    110110    // This should be done by pmFPAfileBlank
    111111    if (file->mode == PM_FPA_MODE_WRITE) {
    … …  
    190190    }
    191191
    192     // determine the file name
    193     // free a name allocated earlier
    194     // XXX for CMP files which defer opening, we have an inconsistent value
    195     // for file->extra here and in the pmFPAfileDefine fucntions.
    196     //
     192    // determine the file name, free a name allocated earlier
    197193    psFree (file->filename);
    198194    file->filename = pmFPAfileNameFromRule (file->filerule, file, view);
    … …  
    202198    }
    203199
    204     // indirect filenames
     200    // indirect filenames: these come from a list on the command line or elsewhere
    205201    if (!strcasecmp (file->filename, "@FILES")) {
    206         char *extra = pmFPAfileNameFromRule (file->filextra, file, view);
    207         if (extra == NULL) {
    208             psError(PS_ERR_IO, false, "error converting extrule to name %s\n", file->extrule);
     202        char *filesrc = pmFPAfileNameFromRule (file->filesrc, file, view);
     203        if (filesrc == NULL) {
     204            psError(PS_ERR_IO, false, "error converting filesrc to name %s\n", file->filesrc);
    209205            return false;
    210206        }
    211207
    212208        psFree (file->filename);
    213         file->filename = psMetadataLookupStr (&status, file->names, extra);
     209        file->filename = psMetadataLookupStr (&status, file->names, filesrc);
    214210
    215211        if (file->filename == NULL) {
    216             psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filextra, extra);
    217             psFree (extra);
     212            psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filesrc, filesrc);
     213            psFree (filesrc);
    218214            return false;
    219215        }
    220216        // psMetadataLookupStr just returns a view, file->filename must be protected
    221217        psMemIncrRefCounter (file->filename);
    222         psFree (extra);
     218        psFree (filesrc);
    223219    }
    224220
    225221    // get name from detrend database
    226     // extrule expands to yield the class_id
    227222    // file->detrend->detID contains the desired -det_id detID -iteration iter string
    228223    if (!strcasecmp (file->filename, "@DETDB")) {
    … …  
    245240                classId = pmFPAfileNameFromRule(rule, file, view);
    246241                if (!classId) {
    247                     psError(PS_ERR_IO, false, "error converting extrule to name: %s\n", rule);
     242                    psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule);
    248243                    return false;
    249244                }
    250245            }
    251246        }
    252         psTrace ("pmFPAfile", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId);
     247        psTrace ("psModules.camera", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId);
    253248        psFree (file->filename);
    254249
    … …  
    260255        }
    261256
    262         psTrace ("pmFPAfile", 6, "got detrend file %s\n", file->filename);
     257        psTrace ("psModules.camera", 6, "got detrend file %s\n", file->filename);
    263258        psFree (classId);
    264259    }
    … …  
    277272      case PM_FPA_FILE_HEADER:
    278273      case PM_FPA_FILE_FRINGE:
    279         psTrace ("pmFPAfile", 5, "opening %s (type: %d)\n", file->filename, file->type);
     274        psTrace ("psModules.camera", 5, "opening %s (type: %d)\n", file->filename, file->type);
    280275        if (!openImage(file, view, mode, config)) {
    281276            psError(PS_ERR_UNKNOWN, false, "Unable to open image %s (type %d)\n", file->filename, file->type);
    … …  
    285280        // open the FITS object files
    286281      case PM_FPA_FILE_CMF:
    287         psTrace ("pmFPAfile", 5, "opening %s (type: %d)\n", file->filename, file->type);
     282        psTrace ("psModules.camera", 5, "opening %s (type: %d)\n", file->filename, file->type);
    288283        file->fits = psFitsOpen (file->filename, mode);
    289284        if (file->fits == NULL) {
    … …  
    302297      case PM_FPA_FILE_JPEG:
    303298      case PM_FPA_FILE_KAPA:
    304       case PM_FPA_FILE_MANAPLOT:
    305         psTrace ("pmFPAfile", 5, "defer opening %s\n", file->filename);
     299        psTrace ("psModules.camera", 5, "defer opening %s\n", file->filename);
    306300        break;
    307301
    … …  
    367361            return false;
    368362        }
    369         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     363        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    370364        break;
    371365    case PM_FPA_FILE_MASK:
    … …  
    374368            return false;
    375369        }
    376         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     370        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    377371        break;
    378372    case PM_FPA_FILE_WEIGHT:
    … …  
    381375            return false;
    382376        }
    383         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     377        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    384378        break;
    385379    case PM_FPA_FILE_HEADER:
    … …  
    388382            return false;
    389383        }
    390         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     384        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    391385        break;
    392386    case PM_FPA_FILE_FRINGE:
    … …  
    395389            return false;
    396390        }
    397         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     391        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    398392
    399393        if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) {
    … …  
    410404    case PM_FPA_FILE_CMF:
    411405        pmFPAviewReadObjects (view, file, config);
    412         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     406        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    413407        break;
    414408
    415409    case PM_FPA_FILE_PSF:
    416410        pmFPAviewReadPSFmodel (view, file, config);
    417         psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
     411        psTrace ("psModules.camera", 5, "reading %s (type: %d)\n", file->filename, file->type);
    418412        break;
    419413
    420414    case PM_FPA_FILE_JPEG:
    421415    case PM_FPA_FILE_KAPA:
    422     case PM_FPA_FILE_MANAPLOT:
    423416        break;
    424417
    … …  
    463456    case PM_FPA_FILE_FRINGE:
    464457        if (pmFPAviewFreeData(view, file)) {
    465             psTrace ("pmFPAfile", 5, "freed %s for %s (type: %d)\n", file->filename, file->name, file->type);
     458            psTrace ("psModules.camera", 5, "freed %s for %s (type: %d)\n", file->filename, file->name, file->type);
    466459            if (file->filename == NULL) {
    467                 psTrace ("pmFPAfile", 5, "filename is not defined for %s\n", file->name);
     460                psTrace ("psModules.camera", 5, "filename is not defined for %s\n", file->name);
    468461            }
    469462        } else {
    … …  
    478471    case PM_FPA_FILE_CMF:
    479472        // pmFPAviewFreeObjects (view, file);
    480         psTrace ("pmFPAfile", 5, "NOT freeing %s (type: %d)\n", file->filename, file->type);
     473        psTrace ("psModules.camera", 5, "NOT freeing %s (type: %d)\n", file->filename, file->type);
    481474        break;
    482475
    … …  
    485478    case PM_FPA_FILE_JPEG:
    486479    case PM_FPA_FILE_KAPA:
    487     case PM_FPA_FILE_MANAPLOT:
    488480        break;
    489481
    … …  
    573565    case PM_FPA_FILE_PSF:
    574566    case PM_FPA_FILE_JPEG:
    575     case PM_FPA_FILE_MANAPLOT:
    576567    case PM_FPA_FILE_KAPA:
    577568      break;
    … …  
    634625    case PM_FPA_FILE_IMAGE:
    635626        pmFPAviewWriteFitsImage(view, file, config);
    636         psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
     627        psTrace ("psModules.camera", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
    637628        break;
    638629    case PM_FPA_FILE_MASK:
    639630        pmFPAviewWriteFitsMask(view, file, config);
    640         psTrace ("pmFPAfile", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa);
     631        psTrace ("psModules.camera", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa);
    641632        break;
    642633    case PM_FPA_FILE_WEIGHT:
    643634        pmFPAviewWriteFitsWeight(view, file, config);
    644         psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
     635        psTrace ("psModules.camera", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
    645636        break;
    646637    case PM_FPA_FILE_HEADER:
    647638      // pmFPAviewWriteFitsWeight(view, file, config);
    648       // psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
     639      // psTrace ("psModules.camera", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
    649640      psAbort ("no HEADER write functions defined");
    650641        break;
    651642    case PM_FPA_FILE_FRINGE:
    652643        pmFPAviewWriteFitsImage (view, file, config);
    653         psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
     644        psTrace ("psModules.camera", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
    654645        pmFPAviewWriteFitsTable(view, file, "FRINGE");
    655         psTrace ("pmFPAfile", 5, "wrote fringe table %s (fpa: %p)\n", file->filename, file->fpa);
     646        psTrace ("psModules.camera", 5, "wrote fringe table %s (fpa: %p)\n", file->filename, file->fpa);
    656647        break;
    657648
    … …  
    661652    case PM_FPA_FILE_CMP:
    662653    case PM_FPA_FILE_CMF:
    663         psTrace ("pmFPAfile", 5, "writing object %s (fpa: %p)\n", file->filename, file->fpa);
     654        psTrace ("psModules.camera", 5, "writing object %s (fpa: %p)\n", file->filename, file->fpa);
    664655        if (!pmFPAviewWriteObjects (view, file, config)) {
    665656            psError(PS_ERR_IO, false, "Failed to write object %s", file->filename);
    … …  
    671662    case PM_FPA_FILE_PSF:
    672663        pmFPAviewWritePSFmodel (view, file, config);
    673         psTrace ("pmFPAfile", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa);
     664        psTrace ("psModules.camera", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa);
    674665        break;
    675666
    676667    case PM_FPA_FILE_JPEG:
    677668        pmFPAviewWriteJPEG (view, file, config);
    678         psTrace ("pmFPAfile", 5, "wrote JPEG %s (fpa: %p)\n", file->filename, file->fpa);
    679         break;
    680 
    681     case PM_FPA_FILE_MANAPLOT:
    682         pmFPAviewWriteMANAPLOT (view, file, config);
    683         psTrace ("pmFPAfile", 5, "wrote MANAPLOT %s (fpa: %p)\n", file->filename, file->fpa);
     669        psTrace ("psModules.camera", 5, "wrote JPEG %s (fpa: %p)\n", file->filename, file->fpa);
    684670        break;
    685671
    686672    case PM_FPA_FILE_KAPA:
    687673        pmFPAviewWriteSourcePlot (view, file, config);
    688         psTrace ("pmFPAfile", 5, "wrote KAPA %s (fpa: %p)\n", file->filename, file->fpa);
     674        psTrace ("psModules.camera", 5, "wrote KAPA %s (fpa: %p)\n", file->filename, file->fpa);
    689675        break;
    690676
    … …  
    753739
    754740            pmFPAAddSourceFromView(file->fpa, fpaname, view, format);
    755             psTrace ("pmFPAfile", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa);
     741            psTrace ("psModules.camera", 5, "created fpa data elements for %s (fpa: %p)\n", file->name, file->fpa);
    756742            break;
    757743    }
    … …  
    767753    case PM_FPA_FILE_JPEG:
    768754    case PM_FPA_FILE_KAPA:
    769     case PM_FPA_FILE_MANAPLOT:
    770755        break;
    771756
    … …  
    814799    case PM_FPA_FILE_CMF:
    815800        psFitsClose (file->fits);
    816         psTrace ("pmFPAfile", 5, "closing %s (type: %d)\n", file->filename, file->type);
     801        psTrace ("psModules.camera", 5, "closing %s (type: %d)\n", file->filename, file->type);
    817802        file->fits = NULL;
    818803        file->phu = NULL;
    … …  
    829814    case PM_FPA_FILE_JPEG:
    830815    case PM_FPA_FILE_KAPA:
    831     case PM_FPA_FILE_MANAPLOT:
    832816        break;
    833817
Note: See TracChangeset for help on using the changeset viewer.