IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 27, 2019, 11:39:38 AM (7 years ago)
Author:
eugene
Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:
branches/eam_branches/ipp-20191011
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20191011

  • branches/eam_branches/ipp-20191011/ippTools/share/pxadmin_create_tables.sql

    r38157 r41170  
    524524    background_model SMALLINT,
    525525    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,
    526532    PRIMARY KEY(cam_id),
    527533    KEY(fault),
    … …  
    539545    stage VARCHAR(64),
    540546    stage_id BIGINT,
     547    stage_extra1 INT,
    541548    state VARCHAR(64),
    542549    workdir VARCHAR(255),
    … …  
    14471454        proj_id BIGINT,
    14481455        registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    1449         timestamp TIMESTAMP,
     1456        timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    14501457        fault SMALLINT,
    14511458        PRIMARY KEY(req_id),
    … …  
    22022209    dvodb       VARCHAR(255),
    22032210    ubercal_file VARCHAR(255),
     2211    accessLevelMin INT DEFAULT 0,
    22042212    PRIMARY KEY(rel_id),
    22052213    UNIQUE KEY(surveyID, release_name),

  • branches/eam_branches/ipp-20191011/ippTools/src

  • branches/eam_branches/ipp-20191011/ippTools/src/addtool.c

    r40803 r41170  
    16681668  PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false);
    16691669  PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     1670 
    16701671
    16711672  if (!psDBTransaction(config->dbh)) {

  • branches/eam_branches/ipp-20191011/ippTools/src/camtool.c

    r36914 r41170  
    524524    PXOPT_LOOKUP_F32(maskfrac_max_advisory, config->args, "-maskfrac_max_advisory", false, false);
    525525   
     526    PXOPT_LOOKUP_F32(ast_r0, config->args, "-ast_r0", false, false);
     527    PXOPT_LOOKUP_F32(ast_d0, config->args, "-ast_d0", false, false);
     528    PXOPT_LOOKUP_F32(ast_t0, config->args, "-ast_t0", false, false);
     529    PXOPT_LOOKUP_F32(ast_s0, config->args, "-ast_s0", false, false);
     530    PXOPT_LOOKUP_F32(ast_rs, config->args, "-ast_rs", false, false);
     531    PXOPT_LOOKUP_F32(ast_ds, config->args, "-ast_ds", false, false);
     532
    526533    // we store actual detection efficiency by adding in zpt_obs
    527534    PXOPT_LOOKUP_F32(deteff_inst, config->args, "-deteff_inst", false, false);
    … …  
    695702        quality,
    696703        background_model,
    697         astrom_chips
     704        astrom_chips,
     705
     706        ast_r0,
     707        ast_d0,
     708        ast_t0,
     709        ast_s0,
     710        ast_rs,
     711        ast_ds
    698712        );
    699713

  • branches/eam_branches/ipp-20191011/ippTools/src/camtoolConfig.c

    r37769 r41170  
    207207    psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-astrom_chips", 0, "chips with successful astrom", 0);
    208208
     209    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_r0", 0,   "define boresite offset in RA", NAN);
     210    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_d0", 0,   "define boresite offset in DEC", NAN);
     211    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_t0", 0,   "define boresite angle", NAN);
     212    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_s0", 0,   "define bosite scale", NAN);
     213    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_rs", 0,   "define bosite scatter in RA", NAN);
     214    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-ast_ds", 0,   "define bosite scatter in DEC", NAN);
     215
    209216    // -processedexp
    210217    psMetadata *processedexpArgs = psMetadataAlloc();

  • branches/eam_branches/ipp-20191011/ippTools/src/pxcam.c

    r28112 r41170  
    186186                         // Here follows the software version and mask statistics which shouldn't be propagated
    187187                         "NULL",
    188                          "NULL",
    189                          "NULL",
    190                          "NULL",
    191                          "NULL",
    192                          "NULL",
    193                          "NULL",
    194                          "NULL",
    195                          "NULL",
    196                          "NULL",
    197                          "NULL",
     188                         "0",
     189                         "0",
     190                         "0",
     191                         "0",
     192                         "0",
     193                         "0",
     194                         "0",
     195                         "0",
     196                         "0",
     197                         "0",
    198198                note     ? note     : "NULL",
    199199                (long long)chip_id

  • branches/eam_branches/ipp-20191011/ippTools/src/stacktool.c

    r39926 r41170  
    12111211    PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
    12121212    PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "LIKE");
    1213     PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "==");
     1213    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
    12141214    PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE");
    12151215    PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "==");

  • branches/eam_branches/ipp-20191011/ippTools/src/stacktoolConfig.c

    r38062 r41170  
    207207    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
    208208    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0,            "search by tess ID (LIKE comparison)", 0);
    209     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,         "search by skycell ID", 0);
     209    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,         "search by skycell ID (LIKE comparison)", 0);
    210210#ifdef notdef
    211211    // These don't work so omit (for now) We probably should create a different mode for this type of search.
Note: See TracChangeset for help on using the changeset viewer.