Changeset 41071
- Timestamp:
- Nov 7, 2019, 3:51:47 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
- 2 copied
-
dbconfig/cam.md (modified) (1 diff)
-
dbconfig/changes.txt (modified) (1 diff)
-
extperl/Apache2-SOAP-0.73.tar.gz (copied) (copied from branches/ccl_branches/ipp-20190806/extperl/Apache2-SOAP-0.73.tar.gz )
-
extperl/file-extattr-master.tar.gz (copied) (copied from branches/ccl_branches/ipp-20190806/extperl/file-extattr-master.tar.gz )
-
ippTools/share/pxadmin_create_tables.sql (modified) (4 diffs)
-
ippconfig/recipes/ppImage.config (modified) (2 diffs)
-
ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)
-
ippconfig/recipes/reductionClasses.mdc (modified) (1 diff)
-
psastro/src/psastroMetadataStats.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dbconfig/cam.md
r37769 r41071 120 120 background_model S16 0 121 121 astrom_chips S64 0 122 ast_r0 F32 0.0 123 ast_d0 F32 0.0 124 ast_t0 F32 0.0 125 ast_s0 F32 0.0 126 ast_rs F32 0.0 127 ast_ds F32 0.0 122 128 END 123 129 -
trunk/dbconfig/changes.txt
r38454 r41071 2532 2532 2533 2533 -- 2534 2534 2535 ALTER TABLE ippRelease ADD COLUMN accessLevelMin INT DEFAULT 0 AFTER ubercal_file 2536 2537 -- Update camProcessedExp to store astrometry results from smfs -- 2538 2539 ALTER TABLE camProcessedExp ADD COLUMN ast_r0 FLOAT after astrom_chips; 2540 ALTER TABLE camProcessedExp ADD COLUMN ast_d0 FLOAT after ast_r0; 2541 ALTER TABLE camProcessedExp ADD COLUMN ast_t0 FLOAT after ast_d0; 2542 ALTER TABLE camProcessedExp ADD COLUMN ast_s0 FLOAT after ast_t0; 2543 ALTER TABLE camProcessedExp ADD COLUMN ast_rs FLOAT after ast_s0; 2544 ALTER TABLE camProcessedExp ADD COLUMN ast_ds FLOAT after ast_rs; 2545 2546 -- Update addRun to store hostname info -- 2547 2548 ALTER TABLE addRun ADD COLUMN hostname varchar(64) after minidvodb_name; 2549 ALTER TABLE minidvodbProcessed ADD COLUMN hostname varchar(64) after fault; 2550 2551 -- 2552 UPDATE dbversion set schema_version = '1.1.81', updated= CURRENT_TIMESTAMP(); 2553 -- 2554 -
trunk/ippTools/share/pxadmin_create_tables.sql
r38157 r41071 524 524 background_model SMALLINT, 525 525 astrom_chips BIGINT, 526 ast_r0 FLOAT, 527 ast_d0 FLOAT, 528 ast_t0 FLOAT, 529 ast_s0 FLOAT, 530 ast_rs FLOAT, 531 ast_ds FLOAT, 526 532 PRIMARY KEY(cam_id), 527 533 KEY(fault), … … 539 545 stage VARCHAR(64), 540 546 stage_id BIGINT, 547 stage_extra1 INT, 541 548 state VARCHAR(64), 542 549 workdir VARCHAR(255), … … 1447 1454 proj_id BIGINT, 1448 1455 registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 1449 timestamp TIMESTAMP ,1456 timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 1450 1457 fault SMALLINT, 1451 1458 PRIMARY KEY(req_id), … … 2202 2209 dvodb VARCHAR(255), 2203 2210 ubercal_file VARCHAR(255), 2211 accessLevelMin INT DEFAULT 0, 2204 2212 PRIMARY KEY(rel_id), 2205 2213 UNIQUE KEY(surveyID, release_name), -
trunk/ippconfig/recipes/ppImage.config
r40619 r41071 1406 1406 # Photometry and astrometry only (for pre-reduced data) 1407 1407 PPIMAGE_PA METADATA 1408 BASE.FITS BOOL FALSE # Save base detrended image?1409 BASE.MASK.FITS BOOL FALSE # Save base detrended image?1410 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1411 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image?1412 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image?1413 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 1414 OVERSCAN BOOL FALSE # Overscan subtraction1415 NONLIN BOOL FALSE # Non-linearity correction; not implemented 1416 BIAS BOOL FALSE # Bias subtraction1417 DARK BOOL FALSE # Dark subtraction1418 SHUTTER BOOL FALSE # Shutter correction1419 FLAT BOOL FALSE # Flat-field normalisation1420 MASK BOOL FALSE # Mask bad pixels1421 MASK.BUILD BOOL FALSE # Build internal mask?1422 FRINGE BOOL FALSE # Fringe subtraction1423 BIN1.FITS BOOL TRUE # Save 1st binned chip image?1424 BIN2.FITS BOOL TRUE # Save 2nd binned chip image?1425 BIN1.JPEG BOOL TRUE # Save 1st binned jpeg?1426 BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg?1427 PHOTOM BOOL TRUE # Source identification and photometry1428 ASTROM.CHIP BOOL FALSE # Astrometry per chip?1429 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic?1408 BASE.FITS BOOL FALSE # Save base detrended image? 1409 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 1410 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 1411 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 1412 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 1413 CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? 1414 OVERSCAN BOOL FALSE # Overscan subtraction 1415 NONLIN BOOL FALSE # Non-linearity correction; not implemented 1416 BIAS BOOL FALSE # Bias subtraction 1417 DARK BOOL FALSE # Dark subtraction 1418 SHUTTER BOOL FALSE # Shutter correction 1419 FLAT BOOL FALSE # Flat-field normalisation 1420 MASK BOOL FALSE # Mask bad pixels 1421 MASK.BUILD BOOL FALSE # Build internal mask? 1422 FRINGE BOOL FALSE # Fringe subtraction 1423 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 1424 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 1425 BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? 1426 BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? 1427 PHOTOM BOOL TRUE # Source identification and photometry 1428 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 1429 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 1430 1430 END 1431 1431 … … 2593 2593 END 2594 2594 2595 # for localhost test without bias, dark, flat, mask - ccl 2019.11.06 2596 CHIP_LOCALHOSTTEST METADATA 2597 BASE.FITS BOOL FALSE # Save base detrended image? 2598 BASE.MASK.FITS BOOL FALSE # Save base detrended image? 2599 BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? 2600 CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? 2601 CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? 2602 OVERSCAN BOOL TRUE # Overscan subtraction 2603 NONLIN BOOL FALSE # Non-linearity correction; not implemented 2604 BIAS BOOL FALSE # Bias subtraction 2605 DARK BOOL FALSE # Dark subtraction 2606 SHUTTER BOOL FALSE # Shutter correction 2607 FLAT BOOL FALSE # Flat-field normalisation 2608 MASK BOOL FALSE # Mask bad pixels 2609 MASK.BUILD BOOL TRUE # Build internal mask image 2610 BIN1.FITS BOOL TRUE # Save 1st binned chip image? 2611 BIN2.FITS BOOL TRUE # Save 2nd binned chip image? 2612 PHOTOM BOOL TRUE # Source identification and photometry 2613 ASTROM.CHIP BOOL FALSE # Astrometry per chip? 2614 ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? 2615 BACKGROUND BOOL TRUE # Subtract background? 2616 END -
trunk/ippconfig/recipes/ppStatsFromMetadata.config
r36914 r41071 276 276 ENTRY VAL ASTROM_CHIPS U64 BITWISEOR -astrom_chips 277 277 278 ENTRY VAL AST_R0 F32 CONSTANT -ast_r0 279 ENTRY VAL AST_D0 F32 CONSTANT -ast_d0 280 ENTRY VAL AST_T0 F32 CONSTANT -ast_t0 281 ENTRY VAL AST_S0 F32 CONSTANT -ast_s0 282 ENTRY VAL AST_RS F32 CONSTANT -ast_rs 283 ENTRY VAL AST_DS F32 CONSTANT -ast_ds 284 278 285 ENTRY VAL ZPT_OBS F32 SAMPLE_MEAN -zpt_obs 279 286 ENTRY VAL ZPT_ERR F32 RMS -zpt_err -
trunk/ippconfig/recipes/reductionClasses.mdc
r40875 r41071 1873 1873 END 1874 1874 1875 # for localhost test without bias, dark, flat, mask - ccl 2019.11.06 1876 LOCALHOSTTEST METADATA 1877 CHIP_PPIMAGE STR LOCALHOSTTEST 1878 CHIP_PSPHOT STR CHIP 1879 JPEG_BIN1 STR PPIMAGE_J1 1880 JPEG_BIN2 STR PPIMAGE_J2 1881 PSASTRO STR DEFAULT_RECIPE 1882 # this is for running addstar 1883 ADDSTAR STR ADDSTAR 1884 END 1885 -
trunk/psastro/src/psastroMetadataStats.c
r27065 r41071 38 38 psMetadataItemSupplement(&status, stats, header, "CERROR"); 39 39 psMetadataItemSupplement(&status, stats, header, "NASTRO"); 40 psMetadataItemSupplement(&status, stats, header, "AST_R0"); 41 psMetadataItemSupplement(&status, stats, header, "AST_D0"); 42 psMetadataItemSupplement(&status, stats, header, "AST_T0"); 43 psMetadataItemSupplement(&status, stats, header, "AST_S0"); 44 psMetadataItemSupplement(&status, stats, header, "AST_RS"); 45 psMetadataItemSupplement(&status, stats, header, "AST_DS"); 40 46 } 41 47
Note:
See TracChangeset
for help on using the changeset viewer.
