IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 3, 2006, 8:48:10 AM (19 years ago)
Author:
magnier
Message:

defined pmConfigConvertFilename, added to all I/O functions

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9585 r10421  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-10-17 00:41:05 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-12-03 18:48:10 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3131
    3232
    33 bool pmFPAviewWriteMANAPLOT(const pmFPAview *view, pmFPAfile *file)
     33bool pmFPAviewWriteMANAPLOT(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    3434{
    3535    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    3939
    4040    if (view->chip == -1) {
    41         pmFPAWriteMANAPLOT (fpa, view, file);
     41        pmFPAWriteMANAPLOT (fpa, view, file, config);
    4242        return true;
    4343    }
    … …  
    4949
    5050    if (view->cell == -1) {
    51         pmChipWriteMANAPLOT (chip, view, file);
     51        pmChipWriteMANAPLOT (chip, view, file, config);
    5252        return true;
    5353    }
    … …  
    5959
    6060    if (view->readout == -1) {
    61         pmCellWriteMANAPLOT (cell, view, file);
     61        pmCellWriteMANAPLOT (cell, view, file, config);
    6262        return true;
    6363    }
    … …  
    6868    pmReadout *readout = cell->readouts->data[view->readout];
    6969
    70     pmReadoutWriteMANAPLOT (readout, view, file);
     70    pmReadoutWriteMANAPLOT (readout, view, file, config);
    7171    return true;
    7272}
    7373
    7474// read in all chip-level MANAPLOT files for this FPA
    75 bool pmFPAWriteMANAPLOT (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
     75bool pmFPAWriteMANAPLOT (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    7676{
    7777    PS_ASSERT_PTR_NON_NULL(fpa, false);
    … …  
    8282
    8383        pmChip *chip = fpa->chips->data[i];
    84         pmChipWriteMANAPLOT (chip, view, file);
     84        pmChipWriteMANAPLOT (chip, view, file, config);
    8585    }
    8686    return true;
    … …  
    8888
    8989// read in all cell-level MANAPLOT files for this chip
    90 bool pmChipWriteMANAPLOT (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
     90bool pmChipWriteMANAPLOT (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    9191{
    9292    PS_ASSERT_PTR_NON_NULL(chip, false);
    … …  
    9797
    9898        pmCell *cell = chip->cells->data[i];
    99         pmCellWriteMANAPLOT (cell, view, file);
     99        pmCellWriteMANAPLOT (cell, view, file, config);
    100100    }
    101101    return true;
    … …  
    103103
    104104// read in all readout-level MANAPLOT files for this cell
    105 bool pmCellWriteMANAPLOT (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
     105bool pmCellWriteMANAPLOT (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    106106{
    107107    PS_ASSERT_PTR_NON_NULL(cell, false);
    … …  
    112112
    113113        pmReadout *readout = cell->readouts->data[i];
    114         pmReadoutWriteMANAPLOT (readout, view, file);
     114        pmReadoutWriteMANAPLOT (readout, view, file, config);
    115115    }
    116116    return true;
    … …  
    118118
    119119// read in all readout-level Objects files for this cell
    120 bool pmReadoutWriteMANAPLOT (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
     120bool pmReadoutWriteMANAPLOT (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    121121{
    122122    PS_ASSERT_PTR_NON_NULL(readout, false);
    … …  
    136136    // output : filerule
    137137
    138     psString input = pmFPAfileNameFromRule (file->filextra, file, view);
    139     psString output = pmFPAfileNameFromRule (file->filerule, file, view);
    140     psString script = pmFPAfileNameFromRule (file->extname, file, view);
     138    psString tmpName;
     139    tmpName = pmFPAfileNameFromRule (file->filextra, file, view);
     140    psString input = pmConfigConvertFilename (tmpName, config);
     141    psFree (tmpName);
     142
     143    tmpName = pmFPAfileNameFromRule (file->filerule, file, view);
     144    psString output = pmConfigConvertFilename (tmpName, config);
     145    psFree (tmpName);
     146
     147    tmpName = pmFPAfileNameFromRule (file->extname, file, view);
     148    psString script = pmConfigConvertFilename (tmpName, config);
     149    psFree (tmpName);
    141150
    142151    psString line = NULL;
Note: See TracChangeset for help on using the changeset viewer.