- Timestamp:
- Oct 23, 2007, 10:54:53 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branch_20071023/psModules/src/camera/pmFPAfileIO.c
r15333 r15359 192 192 status = pmPSFmodelReadForView (view, file, config); 193 193 break; 194 case PM_FPA_FILE_ASTROM: 195 status = pmAstromReadForView (view, file, config); 196 break; 194 197 case PM_FPA_FILE_JPEG: 195 198 case PM_FPA_FILE_KAPA: … … 273 276 case PM_FPA_FILE_CMF: 274 277 case PM_FPA_FILE_PSF: 278 case PM_FPA_FILE_ASTROM: 275 279 case PM_FPA_FILE_JPEG: 276 280 case PM_FPA_FILE_KAPA: … … 336 340 // have their data stored on the readout->analysis metadata structure of another 337 341 // (existing) fpa 342 if (file->type == PM_FPA_FILE_CMF) { 343 if (!pmFPAviewCheckDataStatusForSources (view, file)) { 344 psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name); 345 return true; 346 } 347 } 338 348 if (file->type == PM_FPA_FILE_PSF) { 339 349 if (!pmPSFmodelCheckDataStatusForView (view, file)) { … … 342 352 } 343 353 } 344 if (file->type == PM_FPA_FILE_ CMF) {345 if (!pm FPAviewCheckDataStatusForSources(view, file)) {354 if (file->type == PM_FPA_FILE_ASTROM) { 355 if (!pmAstromCheckDataStatusForView (view, file)) { 346 356 psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name); 347 357 return true; … … 449 459 case PM_FPA_FILE_PSF: 450 460 status = pmPSFmodelWriteForView (view, file, config); 461 break; 462 463 case PM_FPA_FILE_ASTROM: 464 status = pmAstromWriteForView (view, file, config); 451 465 break; 452 466 … … 508 522 case PM_FPA_FILE_CMF: 509 523 case PM_FPA_FILE_PSF: 524 case PM_FPA_FILE_ASTROM: 510 525 psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); 511 526 status = psFitsClose (file->fits); … … 574 589 case PM_FPA_FILE_CMF: 575 590 case PM_FPA_FILE_PSF: 591 case PM_FPA_FILE_ASTROM: 576 592 psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name); 577 593 return true; … … 712 728 case PM_FPA_FILE_CMF: 713 729 case PM_FPA_FILE_PSF: 730 case PM_FPA_FILE_ASTROM: 714 731 psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n", 715 732 file->filename, file->name, view->chip, view->cell, view->readout); … … 861 878 status = pmPSFmodelWritePHU (view, file, config); 862 879 break; 880 case PM_FPA_FILE_ASTROM: 881 status = pmAstromWritePHU (view, file, config); 882 break; 863 883 case PM_FPA_FILE_SX: 864 884 case PM_FPA_FILE_RAW:
Note:
See TracChangeset
for help on using the changeset viewer.
