IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 8, 2023, 11:54:08 AM (3 years ago)
Author:
eugene
Message:

merge from eam_branches/ipp-20220316. no_warn strncpy; avoid passing NULL to sprintf %s; add code for PATTERN_DEAD_CELLS; fix error in PSF residual image evaluation; drop detailed mask analysis for binned images (not actually used)

Location:
trunk/psModules
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules

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

    r42338 r42379  
    256256        status = pmPatternRowAmpRead(view, file, config);
    257257        break;
     258      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
     259        status = pmPatternDeadCellsRead(view, file, config);
     260        break;
    258261      case PM_FPA_FILE_SX:
    259262      case PM_FPA_FILE_RAW:
    … …  
    368371      case PM_FPA_FILE_KH_CORRECT:
    369372      case PM_FPA_FILE_PATTERN_ROW_AMP:
     373      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
    370374      case PM_FPA_FILE_JPEG:
    371375      case PM_FPA_FILE_KAPA:
    … …  
    460464      return true;
    461465    }
     466    if (file->type == PM_FPA_FILE_PATTERN_DEAD_CELLS) {
     467      psTrace("psModules.camera", 6, "skip write for %s, no write function defined", file->name);
     468      return true;
     469    }
    462470
    463471    // open the file if not yet opened
    … …  
    560568      case PM_FPA_FILE_PATTERN_ROW_AMP:
    561569        psError(PS_ERR_IO, true, "cannot write type PATTERN.ROW.AMP (%s)", file->name);
     570        break;
     571
     572      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
     573        psError(PS_ERR_IO, true, "cannot write type PATTERN.DEAD.CELLS (%s)", file->name);
    562574        break;
    563575
    … …  
    638650      case PM_FPA_FILE_KH_CORRECT:
    639651      case PM_FPA_FILE_PATTERN_ROW_AMP:
     652      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
    640653      case PM_FPA_FILE_LINEARITY:
    641654      case PM_FPA_FILE_NEWNONLIN:
    … …  
    718731      case PM_FPA_FILE_KH_CORRECT:
    719732      case PM_FPA_FILE_PATTERN_ROW_AMP:
     733      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
    720734      case PM_FPA_FILE_EXPNUM:
    721735        psTrace ("psModules.camera", 6, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
    … …  
    883897      case PM_FPA_FILE_KH_CORRECT:
    884898      case PM_FPA_FILE_PATTERN_ROW_AMP:
     899      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
    885900      case PM_FPA_FILE_LINEARITY:
    886901      case PM_FPA_FILE_NEWNONLIN:
    … …  
    10891104      case PM_FPA_FILE_KH_CORRECT:
    10901105      case PM_FPA_FILE_PATTERN_ROW_AMP:
     1106      case PM_FPA_FILE_PATTERN_DEAD_CELLS:
    10911107      case PM_FPA_FILE_SX:
    10921108      case PM_FPA_FILE_RAW:
Note: See TracChangeset for help on using the changeset viewer.