IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34740


Ignore:
Timestamp:
Nov 29, 2012, 2:44:33 PM (14 years ago)
Author:
watersc1
Message:

database changes for skycal and background_model information. Into the right tag this time.

Location:
tags/ipp-20121026
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • tags/ipp-20121026/dbconfig

  • tags/ipp-20121026/dbconfig/changes.txt

    r33032 r34740  
    22552255--update addRun set stage_extra1 = -1 where stage = 'cam' <= 483624;
    22562256
     2257ALTER TABLE warpSkyfile add column background_model SMALLINT after maskfrac_advisory;
     2258ALTER TABLE stackSumSkyfile add column background_model SMALLINT after software_ver;
     2259
     2260ALTER TABLE skycalResult ADD column n_detections INT after n_astrom;
     2261ALTER TABLE skycalResult ADD column n_extended INT after n_detections;
     2262
     2263UPDATE dbversion set schema_version = '1.1.72', updated= CURRENT_TIMESTAMP();

  • tags/ipp-20121026/dbconfig/stack.md

    r30945 r34740  
    5353    fault              S16    0       # Key
    5454    software_ver    STR         16
     55    background_model   S16    0
    5556    quality            S16    0
    5657END

  • tags/ipp-20121026/dbconfig/staticsky.md

    r32963 r34740  
    5454    sigma_dec      F32    0.0
    5555    n_astrom       S32    0
     56    n_detections   S32    0
     57    n_extended     S32    0
    5658    zpt_obs        F32    0.0
    5759    zpt_stdev      F32    0.0

  • tags/ipp-20121026/dbconfig/warp.md

    r28375 r34740  
    7474    maskfrac_magic  F32     0.0
    7575    maskfrac_advisory F32   0.0
     76    background_model  S16   0
    7677END
    7778

  • tags/ipp-20121026/ippTools

  • tags/ipp-20121026/ippTools/share/pxadmin_create_tables.sql

    r34429 r34740  
    996996    maskfrac_magic FLOAT,
    997997    maskfrac_advisory FLOAT,
     998    background_model SMALLINT,
    998999    PRIMARY KEY(warp_id, skycell_id, tess_id),
    9991000    KEY(good_frac),
    … …  
    10781079        good_frac FLOAT,
    10791080        mjd_obs DOUBLE,
    1080         quality SMALLINT NOT NULL DEFAULT 0,
    10811081        fault SMALLINT,
    10821082        software_ver VARCHAR(16),
     1083        background_model SMALLINT,
     1084        quality SMALLINT NOT NULL DEFAULT 0,
    10831085        PRIMARY KEY(stack_id),
    10841086        KEY(dtime_stack),
    … …  
    21152117      sigma_dec FLOAT,
    21162118      n_astrom INT,
     2119      n_detections INT,
     2120      n_extended INT,
    21172121      zpt_obs FLOAT,
    21182122      zpt_stdev FLOAT,

  • tags/ipp-20121026/ippTools/share/staticskytool_result.sql

    r33919 r34740  
    77    stackRun.skycell_id,
    88    count(stackRun.filter) AS num_filters,
     9    TRUNCATE(skycell.radeg/15., 4) AS rahours,
     10    skycell.radeg,
     11    skycell.decdeg,
    912    skycell.glong,
    1013    skycell.glat

  • tags/ipp-20121026/ippTools/share/staticskytool_todo.sql

    r33034 r34740  
    77    stackRun.tess_id,
    88    stackRun.skycell_id,
     9    TRUNCATE(skycell.radeg/15., 4) as rahours,
     10    skycell.radeg,
     11    skycell.decdeg,
     12    skycell.glong,
     13    skycell.glat,
    914    IFNULL(Label.priority, 10000) AS priority
    1015FROM staticskyRun
    1116JOIN staticskyInput USING (sky_id)
    1217JOIN stackRun USING (stack_id)
     18JOIN skycell USING(tess_id, skycell_id)
    1319LEFT JOIN staticskyResult USING(sky_id)
    1420LEFT JOIN Label ON staticskyRun.label = Label.label

  • tags/ipp-20121026/ippTools/src

  • tags/ipp-20121026/ippTools/src/stacktool.c

    r34586 r34740  
    10061006    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
    10071007
     1008    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
     1009   
    10081010    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
    10091011            ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
    … …  
    10671069                               fault,
    10681070                               software_ver,
     1071                               background_model,
    10691072                               quality
    10701073          )) {
    … …  
    11211124    PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">=");
    11221125    PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackSumSkyfile.mjd_obs", "<=");
    1123 
     1126    PXOPT_COPY_S16(config->args, where, "-background_model","stackSumSkyfile.background_model", "==");
    11241127
    11251128//  The following three selectors are incompatible with the sql so omit them

  • tags/ipp-20121026/ippTools/src/stacktoolConfig.c

    r34586 r34740  
    190190    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
    191191
     192    psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
     193   
    192194    // -sumskyfile
    193195    psMetadata *sumskyfileArgs= psMetadataAlloc();
    … …  
    201203    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
    202204#endif
     205    psMetadataAddS16(sumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "search by background model version", 0);
    203206    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK,             "search by stackRun.label", NULL);
    204207    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK,        "search by stackRun.data_group (LIKE comparison)", NULL);

  • tags/ipp-20121026/ippTools/src/staticskytool.c

    r34286 r34740  
    132132    pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
    133133    pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
     134#ifdef notdef
    134135    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
    135136    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
     137    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_min",   "skycell.radeg/15",          ">=");
     138    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_max",   "skycell.radeg/15",          "<=");
     139    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_min",     "skycell.radeg",             ">=");
     140    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_max",     "skycell.radeg",             "<=");
     141    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_min",    "skycell.decdeg",             ">=");
     142    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_max",    "skycell.decdeg",             "<=");
     143#endif
     144    if (!pxskycellAddWhere(config, whereMD)) {
     145        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
     146        return false;
     147    }
    136148
    137149    // find the number of requested filters:
    … …  
    12631275
    12641276    PXOPT_LOOKUP_STR(hostname, config->args,    "-hostname", false, false);
    1265 //    PXOPT_LOOKUP_S32(n_stars, config->args,     "-n_stars", false, false);
    12661277    PXOPT_LOOKUP_S32(n_astrom, config->args,    "-n_astrom", false, false);
     1278    PXOPT_LOOKUP_S32(n_detections, config->args,    "-n_detections", false, false);
     1279    PXOPT_LOOKUP_S32(n_extended, config->args,    "-n_extended", false, false);
    12671280
    12681281    PXOPT_LOOKUP_STR(path_base, config->args,   "-path_base", false, false);
    … …  
    13031316        sigma_dec,
    13041317        n_astrom,
     1318        n_detections,
     1319        n_extended,
    13051320        zpt_obs,
    13061321        zpt_stdev,

  • tags/ipp-20121026/ippTools/src/staticskytoolConfig.c

    r34168 r34740  
    5555    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
    5656    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
     57    pxskycellAddArguments(definebyqueryArgs);
     58#ifdef notdef
    5759    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_min", 0, "define min galactic latitude", NAN);
    5860    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_max", 0, "define max galactic latitude", NAN);
     61    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_min", 0, "define min RA in hours", NAN);
     62    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_max", 0, "define max RA in hours", NAN);
     63    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_min", 0, "define min RA in degrees", NAN);
     64    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_max", 0, "define max RA in degrees", NAN);
     65    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_min", 0, "define min DEC in degrees", NAN);
     66    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_max", 0, "define max DEC in degrees", NAN);
     67#endif
    5968    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
    6069    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
    … …  
    204213    // psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_stars", 0,            "define number of stars", 0);
    205214    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_astrom", 0,            "define number of astrometry reference objects", 0);
     215    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_detections", 0,        "define number of detections", 0);
     216    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_extended", 0,          "define number of extended detections", 0);
    206217
    207218    psMetadataAddStr(addskycalresultArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);

  • tags/ipp-20121026/ippTools/src/warptool.c

    r34081 r34740  
    11011101    PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
    11021102
     1103    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
     1104   
    11031105    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s pswarp %s streaks %s\n",
    11041106            ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_pswarp,ver_streaks);
    … …  
    11591161                           maskfrac_dynamic,
    11601162                           maskfrac_magic,
    1161                            maskfrac_advisory
     1163                           maskfrac_advisory,
     1164                           background_model
    11621165        )) {
    11631166        if (!psDBRollback(config->dbh)) {
    … …  
    13921395    PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "LIKE");
    13931396    PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
     1397    PXOPT_COPY_S16(config->args, where, "-background_model", "warpSkyfile.background_model", "==");
    13941398    pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
    13951399    pxAddLabelSearchArgs (config, where, "-data_group",   "warpRun.data_group", "LIKE");

  • tags/ipp-20121026/ippTools/src/warptoolConfig.c

    r32469 r34740  
    237237    psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-maskfrac_advisory", 0, "define advisory mask fraction", NAN);
    238238
     239    psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
    239240   
    240241    // -warped
    … …  
    254255    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-data_group",  PS_META_DUPLICATE_OK, "search by warpRun data_group", NULL);
    255256    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-dist_group",  PS_META_DUPLICATE_OK, "search by warpRun dist_group", NULL);
     257    psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-background_model", 0, "search by background model version", 0);
    256258    // add magic related arguments
    257259    pxmagicAddArguments(warpedArgs);
Note: See TracChangeset for help on using the changeset viewer.