IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 30, 2012, 2:49:37 PM (14 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20111122/ippMonitor
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20111122/ippMonitor

  • branches/eam_branches/ipp-20111122/ippMonitor/czartool/czartool/czarconfig.xml

    r32359 r33638  
    2121  <gpc1database>
    2222    <name>gpc1</name>
    23     <host>ippdb03</host>
     23    <host>ippdb01</host>
    2424    <user>ippMonitor</user>
    2525    <password>ippMonitor</password>

  • branches/eam_branches/ipp-20111122/ippMonitor/def/lapExposures.d

    r31816 r33638  
    66UNRESTRICTED WHERE 0=1
    77
    8 ARGS  ARG1      rawImfile.exp_id=$lapExp.exp_id
    9 ARGS  ARG2      chipRun.chip_id=$lapExp.chip_id
    10 ARGS  ARG3      chipRun.chip_id=$lapExp.pair_id
    11 ARGS  ARG4      camRun.cam_id=$camRun1.cam_id
    12 ARGS  ARG5      camRun.cam_id=$camRun2.cam_id
    13 ARGS  ARG6      fakeRun.fake_id=$fakeRun1.fake_id
    14 ARGS  ARG7      fakeRun.fake_id=$fakeRun2.fake_id
    15 ARGS  ARG8      warpRun.warp_id=$warpRun1.warp_id
    16 ARGS  ARG9      warpRun.warp_id=$warpRun2.warp_id
    17 ARGS  ARG10     diffRun.diff_id=$diffRun.diff_id
     8ARGS  ARG1      rawImfile.exp_id=$lapExp.exp_id
     9ARGS  ARG2      chipRun.chip_id=$lapExp.chip_id
     10ARGS  ARG3      chipRun.chip_id=$lapExp.pair_id
     11ARGS  ARG4      camRun.cam_id=$camRun1.cam_id
     12ARGS  ARG5      camRun.cam_id=$camRun2.cam_id
     13ARGS  ARG6      fakeRun.fake_id=$fakeRun1.fake_id
     14ARGS  ARG7      fakeRun.fake_id=$fakeRun2.fake_id
     15ARGS  ARG8      warpRun.warp_id=$warpRun1.warp_id
     16ARGS  ARG9      warpRun.warp_id=$warpRun2.warp_id
     17ARGS  ARG10     diffRun.diff_id=$diffRun.diff_id
    1818
    19 #     field                   size  format  name         show    link to                  extras
    20 FIELD lapRun.seq_id,          6, %d,     seq_id
    21 FIELD lapExp.lap_id,          6, %d,     lap_id
    22 FIELD lapExp.data_state,      6, %s,     State (lapExp)
    23 FIELD lapExp.exp_id,          6, %d,     Exp ID,        value, rawImfile.php, ARG1
    24 FIELD lapExp.chip_id,         6, %d,     Chip1 (lapExp.chip_id),        value, chipStageExp.php, ARG2
    25 FIELD chipRun1.state AS ch1state,          6, %s,    Chip1 State
    26 FIELD camRun1.cam_id AS cam_id_1,         6, %d,     Cam1 ID,   value, camStageExp.php, ARG4
    27 FIELD camRun1.state AS ca1state,          6, %s,     Cam1 State
    28 FIELD fakeRun1.fake_id AS fake_id_1,         6, %d,     Fake1 ID,       value, fakeStageExp.php, ARG6
    29 FIELD fakeRun1.state AS fa1state,          6, %s,     Fake1 State
    30 FIELD warpRun1.warp_id AS warp_id_1,         6, %d,     Warp1 ID,       value, warpStageExp.php, ARG8
    31 FIELD warpRun1.state AS wa1state,          6, %s,     Warp1 State
    32 FIELD lapExp.pair_id,         6, %d,     Chip2 ID (lapExp.chip_id),     value, chipStageExp.php, ARG3
    33 FIELD chipRun2.state AS ch2state,          6, %s,    Chip2 State
    34 FIELD camRun2.cam_id AS cam_id_2,         6, %d,     Cam2 ID,   value, camStageExp.php, ARG5
    35 FIELD camRun2.state AS ca2state,          6, %s,     Cam2 State
    36 FIELD fakeRun2.fake_id AS fake_id_2,         6, %d,     Fake2 ID,       value, fakeStageExp.php, ARG7
    37 FIELD fakeRun2.state AS fa2state,          6, %s,     Fake2 State
    38 FIELD warpRun2.warp_id AS warp_id_2,         6, %d,     Warp2 ID,       value, warpStageExp.php, ARG9
    39 FIELD warpRun2.state AS wa2state,          6, %s,     Warp2 State
    40 FIELD diffRun.diff_id,          6, %d,     Diff ID,     value, diffStageExp.php, ARG10
    41 FIELD diffRun.state AS diState,          6, %s,     Diff State
    42 FIELD lapRun.tess_id,         8, %s,     tess_id
    43 FIELD lapRun.projection_cell, 10, %s,    ProjCell
    44 FIELD lapRun.filter,          7, %s,     Filter
    45 FIELD lapRun.state,           15, %s,    State (lapRun)
    46 FIELD lapRun.label,           15, %s,    Label
    47 FIELD lapRun.dist_group,      15, %s,    Dist Group
    48 FIELD lapRun.registered,      19, %T,    Registered
    49 FIELD lapRun.fault,           3, %d,     fault
    50 FIELD lapRun.quick_sass_id,   6, %d,     quick_sass_id
    51 FIELD lapRun.final_sass_id,   6, %d,     final_sass_id
    52 FIELD lapExp.private,         2, %d,     Private
    53 FIELD lapExp.pairwise,        2, %d,     Pairwise
    54 FIELD lapExp.active,          2, %d,     Active
    55 FIELD rawExp.dateobs,         19, %T,     Date/Time
    56 FIELD rawExp.object,          8, %s,     Object
    57 FIELD rawExp.comment,         80, %s,    Comment
     19#     field                        size  format  name                       show   link to           extras
     20FIELD lapRun.seq_id,                  6, %d,     seq_id
     21FIELD lapExp.lap_id,                  6, %d,     lap_id
     22FIELD lapExp.data_state,              6, %s,     State (lapExp)
     23FIELD lapExp.exp_id,                  6, %d,     Exp ID,                    value, rawImfile.php,    ARG1
     24FIELD lapExp.chip_id,                 6, %d,     Chip1 (lapExp.chip_id),    value, chipStageExp.php, ARG2
     25FIELD chipRun1.state AS ch1state,     6, %s,     Chip1 State
     26FIELD camRun1.cam_id AS cam_id_1,     6, %d,     Cam1 ID,                   value, camStageExp.php,  ARG4
     27FIELD camRun1.state AS ca1state,      6, %s,     Cam1 State
     28FIELD fakeRun1.fake_id AS fake_id_1,  6, %d,     Fake1 ID,                  value, fakeStageExp.php, ARG6
     29FIELD fakeRun1.state AS fa1state,     6, %s,     Fake1 State
     30FIELD warpRun1.warp_id AS warp_id_1,  6, %d,     Warp1 ID,                  value, warpStageExp.php, ARG8
     31FIELD warpRun1.state AS wa1state,     6, %s,     Warp1 State
     32FIELD lapExp.pair_id,                 6, %d,     Chip2 ID (lapExp.chip_id), value, chipStageExp.php, ARG3
     33FIELD chipRun2.state AS ch2state,     6, %s,     Chip2 State
     34FIELD camRun2.cam_id AS cam_id_2,     6, %d,     Cam2 ID,                   value, camStageExp.php,  ARG5
     35FIELD camRun2.state AS ca2state,      6, %s,     Cam2 State               
     36FIELD fakeRun2.fake_id AS fake_id_2,  6, %d,     Fake2 ID,                  value, fakeStageExp.php, ARG7
     37FIELD fakeRun2.state AS fa2state,     6, %s,     Fake2 State             
     38FIELD warpRun2.warp_id AS warp_id_2,  6, %d,     Warp2 ID,                  value, warpStageExp.php, ARG9
     39FIELD warpRun2.state AS wa2state,     6, %s,     Warp2 State             
     40FIELD diffRun.diff_id,                6, %d,     Diff ID,                   value, diffStageExp.php, ARG10
     41FIELD diffRun.state AS diState,       6, %s,     Diff State
     42FIELD lapRun.tess_id,                 8, %s,     tess_id
     43FIELD lapRun.projection_cell,        10, %s,     ProjCell
     44FIELD diffInputSkyfile.skycell_id,   10, %s,     Skycell ID
     45FIELD lapRun.filter,                  7, %s,     Filter
     46FIELD lapRun.state,                  15, %s,     State (lapRun)
     47FIELD lapRun.label,                  15, %s,     Label
     48FIELD lapRun.dist_group,             15, %s,     Dist Group
     49FIELD lapRun.registered,             19, %T,     Registered
     50FIELD lapRun.fault,                   3, %d,     fault
     51FIELD lapRun.quick_sass_id,           6, %d,     quick_sass_id
     52FIELD lapRun.final_sass_id,           6, %d,     final_sass_id
     53FIELD lapExp.private,                 2, %d,     Private
     54FIELD lapExp.pairwise,                2, %d,     Pairwise
     55FIELD lapExp.active,                  2, %d,     Active
     56FIELD rawExp.dateobs,                19, %T,     Date/Time
     57FIELD rawExp.object,                  8, %s,     Object
     58FIELD rawExp.comment,                80, %s,     Comment
    5859
    5960# MODE summary

  • branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_getplot.php

    r32178 r33638  
    3030else if ($type=="st")
    3131$filePath = "$path/czarplot_cluster.png";
     32else if ($type=="id")
     33$filePath = "$path/ippToPsps_density_".$label.".png";
    3234
    3335

  • branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_ipptopsps.php

    r32851 r33638  
    155155echo "<br>";
    156156
     157echo "<br>";
     158 echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=id&label=$selectedLabel&stage=$selectedStage&plottype=$plotType\"><br>";
     159echo "<br>";
     160
    157161echo "</table>";
    158162

  • branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php

    r32851 r33638  
    169169echo "<tr><td>Postage stamp server status</td><td><a href=\"http://pstamp.ipp.ifa.hawaii.edu/status.php\"><font color=\"blue\">here</font></a></td></tr>";
    170170echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
    171 echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a></td></tr>";
     171echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a></td></tr>";
    172172echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
    173173echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp0022.ifa.hawaii.edu/ps1sc/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";
    … …  
    492492    createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
    493493
    494     createFormattedTableCell(0, null, "Reverts:", 0, "$columnHeaderColor");
     494    createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
    495495
    496496    foreach ($stages as &$stage) {
    … …  
    498498        if ($stage == "burntool") continue;
    499499        $reverting = getRevertStatus($db, $stage);
    500         $link =
    501             "czartool_labels.php?pass=".$pass
    502             ."&proj=".$proj
    503             ."&mode=" .$selectedMode
    504             ."&label=".$selectedLabel
    505             ."&stage=".$selectedStage
    506             ."&plottype=".$plotType
    507             ."&revertstage=".$stage
    508             ."&revertmode=";
    509 
    510         if(!$reverting) {$label =  "Start";$link = $link . "on";}
    511         if($reverting) {$label = "Stop";$link = $link . "off";}
     500        #$link =
     501        #    "czartool_labels.php?pass=".$pass
     502        #    ."&proj=".$proj
     503        #    ."&mode=" .$selectedMode
     504        #    ."&label=".$selectedLabel
     505        #    ."&stage=".$selectedStage
     506        #    ."&plottype=".$plotType
     507        #    ."&revertstage=".$stage
     508        #    ."&revertmode=";
     509#
     510        #if(!$reverting) {$label =  "Start";$link = $link . "on";}
     511        #if($reverting) {$label = "Stop";$link = $link . "off";}
     512        if(!$reverting) {$label =  "no";}
     513        if($reverting) {$label = "yes";}
    512514        unset($reverting);
    513         createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
     515        #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
     516        createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
    514517        #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";
    515518

  • branches/eam_branches/ipp-20111122/ippMonitor/scripts/skyplot.dvo

    r27674 r33638  
    88 black
    99 gold
     10 orange
    1011end
    1112
    … …  
    1718 7
    1819 3
     20 0
    1921end
    2022
    … …  
    2628 0.9
    2729 1.3
     30 0.5
    2831end
    2932
Note: See TracChangeset for help on using the changeset viewer.