IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

remove unneeded pmFPAfile elements (and from camera.config)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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.