Index: trunk/dbconfig/cam.md =================================================================== --- trunk/dbconfig/cam.md (revision 41067) +++ trunk/dbconfig/cam.md (revision 41071) @@ -120,4 +120,10 @@ background_model S16 0 astrom_chips S64 0 + ast_r0 F32 0.0 + ast_d0 F32 0.0 + ast_t0 F32 0.0 + ast_s0 F32 0.0 + ast_rs F32 0.0 + ast_ds F32 0.0 END Index: trunk/dbconfig/changes.txt =================================================================== --- trunk/dbconfig/changes.txt (revision 41067) +++ trunk/dbconfig/changes.txt (revision 41071) @@ -2532,3 +2532,23 @@ -- + ALTER TABLE ippRelease ADD COLUMN accessLevelMin INT DEFAULT 0 AFTER ubercal_file + +-- Update camProcessedExp to store astrometry results from smfs -- + +ALTER TABLE camProcessedExp ADD COLUMN ast_r0 FLOAT after astrom_chips; +ALTER TABLE camProcessedExp ADD COLUMN ast_d0 FLOAT after ast_r0; +ALTER TABLE camProcessedExp ADD COLUMN ast_t0 FLOAT after ast_d0; +ALTER TABLE camProcessedExp ADD COLUMN ast_s0 FLOAT after ast_t0; +ALTER TABLE camProcessedExp ADD COLUMN ast_rs FLOAT after ast_s0; +ALTER TABLE camProcessedExp ADD COLUMN ast_ds FLOAT after ast_rs; + +-- Update addRun to store hostname info -- + +ALTER TABLE addRun ADD COLUMN hostname varchar(64) after minidvodb_name; +ALTER TABLE minidvodbProcessed ADD COLUMN hostname varchar(64) after fault; + +-- +UPDATE dbversion set schema_version = '1.1.81', updated= CURRENT_TIMESTAMP(); +-- + Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 41067) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 41071) @@ -524,4 +524,10 @@ background_model SMALLINT, astrom_chips BIGINT, + ast_r0 FLOAT, + ast_d0 FLOAT, + ast_t0 FLOAT, + ast_s0 FLOAT, + ast_rs FLOAT, + ast_ds FLOAT, PRIMARY KEY(cam_id), KEY(fault), @@ -539,4 +545,5 @@ stage VARCHAR(64), stage_id BIGINT, + stage_extra1 INT, state VARCHAR(64), workdir VARCHAR(255), @@ -1447,5 +1454,5 @@ proj_id BIGINT, registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - timestamp TIMESTAMP, + timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, fault SMALLINT, PRIMARY KEY(req_id), @@ -2202,4 +2209,5 @@ dvodb VARCHAR(255), ubercal_file VARCHAR(255), + accessLevelMin INT DEFAULT 0, PRIMARY KEY(rel_id), UNIQUE KEY(surveyID, release_name), Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 41067) +++ trunk/ippconfig/recipes/ppImage.config (revision 41071) @@ -1406,26 +1406,26 @@ # Photometry and astrometry only (for pre-reduced data) PPIMAGE_PA METADATA - BASE.FITS BOOL FALSE # Save base detrended image? - BASE.MASK.FITS BOOL FALSE # Save base detrended image? - BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? - CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? - OVERSCAN BOOL FALSE # Overscan subtraction - NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL FALSE # Bias subtraction - DARK BOOL FALSE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL FALSE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels - MASK.BUILD BOOL FALSE # Build internal mask? - FRINGE BOOL FALSE # Fringe subtraction - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? - BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? - BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? - PHOTOM BOOL TRUE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? END @@ -2593,2 +2593,24 @@ END +# for localhost test without bias, dark, flat, mask - ccl 2019.11.06 +CHIP_LOCALHOSTTEST METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask image + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? +END Index: trunk/ippconfig/recipes/ppStatsFromMetadata.config =================================================================== --- trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 41067) +++ trunk/ippconfig/recipes/ppStatsFromMetadata.config (revision 41071) @@ -276,4 +276,11 @@ ENTRY VAL ASTROM_CHIPS U64 BITWISEOR -astrom_chips + ENTRY VAL AST_R0 F32 CONSTANT -ast_r0 + ENTRY VAL AST_D0 F32 CONSTANT -ast_d0 + ENTRY VAL AST_T0 F32 CONSTANT -ast_t0 + ENTRY VAL AST_S0 F32 CONSTANT -ast_s0 + ENTRY VAL AST_RS F32 CONSTANT -ast_rs + ENTRY VAL AST_DS F32 CONSTANT -ast_ds + ENTRY VAL ZPT_OBS F32 SAMPLE_MEAN -zpt_obs ENTRY VAL ZPT_ERR F32 RMS -zpt_err Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 41067) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 41071) @@ -1873,2 +1873,13 @@ END +# for localhost test without bias, dark, flat, mask - ccl 2019.11.06 +LOCALHOSTTEST METADATA + CHIP_PPIMAGE STR LOCALHOSTTEST + CHIP_PSPHOT STR CHIP + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + PSASTRO STR DEFAULT_RECIPE + # this is for running addstar + ADDSTAR STR ADDSTAR +END + Index: trunk/psastro/src/psastroMetadataStats.c =================================================================== --- trunk/psastro/src/psastroMetadataStats.c (revision 41067) +++ trunk/psastro/src/psastroMetadataStats.c (revision 41071) @@ -38,4 +38,10 @@ psMetadataItemSupplement(&status, stats, header, "CERROR"); psMetadataItemSupplement(&status, stats, header, "NASTRO"); + psMetadataItemSupplement(&status, stats, header, "AST_R0"); + psMetadataItemSupplement(&status, stats, header, "AST_D0"); + psMetadataItemSupplement(&status, stats, header, "AST_T0"); + psMetadataItemSupplement(&status, stats, header, "AST_S0"); + psMetadataItemSupplement(&status, stats, header, "AST_RS"); + psMetadataItemSupplement(&status, stats, header, "AST_DS"); }