IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 30103


Ignore:
Timestamp:
Dec 17, 2010, 10:06:13 AM (15 years ago)
Author:
eugene
Message:

merge from trunk

Location:
branches/eam_branches/ipp-20101205
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20101205/PS-IPP-Config/lib/PS/IPP/Config.pm

    r29891 r30103  
    11071107    }
    11081108
    1109     if (file_scheme($output) ne 'neb') {
     1109    my $scheme = file_scheme($output);
     1110    if (!$scheme or ($scheme ne 'neb')) {
    11101111        # non-nebulous file we're done
    1111         if ($delete_existing) {
     1112        if ($delete_existing and $self->file_exists($output)) {
    11121113            if (!$self->file_delete($output)) {
    11131114                carp "failed to delete $output";
    … …  
    11811182    my $copies = shift;
    11821183
    1183     if (file_scheme($file) ne 'neb') {
     1184    my $scheme = file_scheme($file);
     1185    if (!$scheme or ($scheme ne 'neb')) {
    11841186        carp "cannot replicate non-neulous file: $file";
    11851187        return 0;

  • branches/eam_branches/ipp-20101205/dbconfig/changes.txt

    r29902 r30103  
    19891989UPDATE dbversion set schema_version = '1.1.66',  updated= CURRENT_TIMESTAMP();
    19901990
     1991-- output format for publishing / unique name for clients
     1992ALTER TABLE publishClient ADD name VARCHAR(64) UNIQUE; -- (Bill's request)
     1993ALTER TABLE publishClient ADD output_format SMALLINT NOT NULL default 1;
     1994
    19911995-- Version 1.1.67
     1996
     1997ALTER TABLE rawImfile ADD column video_cells TINYINT AFTER burntool_state;

  • branches/eam_branches/ipp-20101205/dbconfig/notes.txt

    r13740 r30103  
    88   * build ippbd ('make src' in dbconfig)
    99   * check in dbconfig, ippdb, and ippTools
     10   * update dbversion.schema.version (added by bills)
    1011
    11122007.06.04 : EAM

  • branches/eam_branches/ipp-20101205/dbconfig/publish.md

    r27028 r30103  
    99    workdir      STR         255
    1010    comment      STR         255
     11    name         STR         64
     12    output_format S16        0
    1113END             
    1214                 

  • branches/eam_branches/ipp-20101205/dbconfig/raw.md

    r27149 r30103  
    141141    md5sum      STR         32
    142142    burntool_state  S16     0
     143    video_cells BOOL        f
    143144END

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

    r29792 r30103  
    6464include 'version.php';
    6565echo "</p>";
    66 echo "<p  align=\"center\"> Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses). <br>Documentation can be found <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\">here</a> and cluster load monitored <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\">here</a><br>Current nightly science status: $nsStatus<br>Use <a href=\"$link\"> $plotTypeLink</a> plots <br/><a href=\"http://ipp004.ifa.hawaii.edu/clusterMonitor/top.html\">Who uses the cluster?</a></p>";
     66echo "<p  align=\"center\"> Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses). <br>Documentation can be found <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\">here</a> and cluster load monitored <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\">here</a><br>Current nightly science status: $nsStatus<br>Use <a href=\"$link\"> $plotTypeLink</a> plots <br/><a href=\"http://ipp004.ifa.hawaii.edu/clusterMonitor/top.html\">Who uses the cluster?</a><br><a href=\"http://ipp004.ifa.hawaii.edu/ippMetrics\">IPP Metrics</a><br/><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/PS1_IPP_CzarLogs\">Czar log pages</a></p>";
    6767
    6868
    … …  
    399399        ."&plottype=".$plotType;
    400400
     401    $searchState = "new";
     402    if ($server == "update") $searchState = "update";
     403
    401404    // write rows
    402405    foreach ($labels as &$thisLabel) {
    … …  
    437440        write_table_cell($class, '%s', $anyFaults ? $link : "", $str);
    438441
    439         $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=new";
     442        $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState;
    440443        getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults);
    441444        write_table_cell($class, '%s', $anyFaults ? $link : "", $str);
    442445
    443         $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=new";
     446        $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=".$searchState;
    444447        getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults);
    445448        write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
    446449
    447         $link =  "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=new";
     450        $link =  "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=".$searchState;
    448451        getStateAndFaults($db, $thisLabel, $selectedState, "fake", $str, $anyFaults);
    449452        write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
    450453
    451         $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=new";
     454        $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=".$searchState;
    452455        getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults);
    453456        write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);
    454457
    455         $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=new";
     458        $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=".$searchState;
    456459        getStateAndFaults($db, $thisLabel, $selectedState, "stack", $str, $anyFaults);
    457460        write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
    458461
    459         $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=new";
     462        $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState;
    460463        getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults);
    461464        write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);
    … …  
    605608        ."&allservercmd=stop";
    606609
    607     write_table_cell($class, '%s', $link, "Stop all");
     610    $link = ""; # TODO removed links temporarily
     611        write_table_cell($class, '%s', $link, "Stop all");
    608612    $link = "czartool_labels.php?pass=".$pass
    609613        ."&proj=".$proj
    … …  
    613617        ."&allservercmd=run";
    614618
    615     write_table_cell($class, '%s', $link, "Run all");
     619    $link = ""; # TODO removed links temporarily
     620        write_table_cell($class, '%s', $link, "Run all");
    616621    echo "</tr>\n";
    617622
    … …  
    628633            ."&plottype=".$plotType;
    629634
    630         write_table_cell($class, '%s', $link, $server);
     635        $link = ""; # TODO removed links temporarily
     636            write_table_cell($class, '%s', $link, $server);
    631637        write_table_cell($class, '%s', "", $alive ? "yes" : "NO");
    632638
    … …  
    644650
    645651                $link = $link . "stop";
    646                 write_table_cell($class, '%s', $link, "stop");
     652                $link = ""; # TODO removed links temporarily
     653                    write_table_cell($class, '%s', $link, "stop");
    647654                write_table_cell($class, '%s', "", "");
    648655            }
    … …  
    651658                $link = $link . "run";
    652659                write_table_cell($class, '%s', "", "");
    653                 write_table_cell($class, '%s', $link, "run");
     660                $link = ""; # TODO removed links temporarily
     661                    write_table_cell($class, '%s', $link, "run");
    654662            }
    655663        }
    … …  
    759767###########################################################################
    760768function showReplicationsStatus($replHost, $replUser, $replPassword, $replDatabaseName) {
    761   #print "<br>$replHost, $replUser, $replPassword, $replDatabaseName<br/>";
    762   $dbRepl = DB::connect("mysql://$replUser:$replPassword@$replHost");
    763   if (PEAR::isError($dbRepl)) {
    764     die("MySQL DB connection error: Check the configuration for $replDatabaseName");
    765   }
    766   $res = $dbRepl->query('SHOW SLAVE STATUS');
    767   while ($res->fetchInto($row)) {
    768     # Have a look for Last_Errno in http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html
    769     $errorStatusInMySql = $row[18];
    770     $replStatus = ($errorStatusInMySql==0?"OK":"<font color=\"red\">PROBLEM</font>");
    771     echo "<tr><td>$replDatabaseName</td><td>$replStatus</td></tr>";
    772     if ($errorStatusInMySql!=0) {
    773       echo "<tr><td colspan=\"2\">Connect to $replDatabaseName replication host, execute 'SHOW SLAVE STATUS', and fix the problem.<br/>";
    774       echo "Information <a href=\"http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html\">here</a></td></tr>";
    775     }
    776   }
    777   $dbRepl->disconnect();
     769    #print "<br>$replHost, $replUser, $replPassword, $replDatabaseName<br/>";
     770    $dbRepl = DB::connect("mysql://$replUser:$replPassword@$replHost");
     771    if (PEAR::isError($dbRepl)) {
     772        die("MySQL DB connection error: Check the configuration for $replDatabaseName");
     773    }
     774    $res = $dbRepl->query('SHOW SLAVE STATUS');
     775    while ($res->fetchInto($row)) {
     776        # Have a look for Last_Errno in http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html
     777        $errorStatusInMySql = $row[18];
     778        $replStatus = ($errorStatusInMySql==0?"OK":"<font color=\"red\">PROBLEM</font>");
     779        echo "<tr><td>$replDatabaseName</td><td>$replStatus</td></tr>";
     780        if ($errorStatusInMySql!=0) {
     781            echo "<tr><td colspan=\"2\">Connect to $replDatabaseName replication host, execute 'SHOW SLAVE STATUS', and fix the problem.<br/>";
     782            echo "Information <a href=\"http://dev.mysql.com/doc/refman/5.0/en/show-slave-status.html\">here</a></td></tr>";
     783        }
     784    }
     785    $dbRepl->disconnect();
    778786}
    779787

  • branches/eam_branches/ipp-20101205/ippMonitor/raw/site.php.in

    r29654 r30103  
    2727$REPL_DBNAME_GPC1 = "gpc1";
    2828
    29 $REPL_HOST_NEBULOUS = "ipp0222.IfA.Hawaii.Edu";
     29$REPL_HOST_NEBULOUS = "ippdb02.IfA.Hawaii.Edu";
    3030$REPL_USER_NEBULOUS = "ippMonitor";
    3131$REPL_PASSWORD_NEBULOUS = "ippMonitor";

  • branches/eam_branches/ipp-20101205/pstamp/scripts/pstamp_job_run.pl

    r29885 r30103  
    277277        # silently skip them if they don't exist. Perhaps this should be
    278278        # detected in pstampparse so that the user can be notified with
    279         # a message in parse_error.txt ("warp do not have a background model")
    280         my $cmf_file = $params->{cmf} if ($options & $PSTAMP_SELECT_CMF);
     279        # a message in parse_error.txt ("warp does not have a background model")
    281280        my $psf_file = $params->{psf} if ($options & $PSTAMP_SELECT_PSF);
    282281        my $backmdl_file = $params->{backmdl} if ($options & $PSTAMP_SELECT_BACKMDL);
    283282        my $pattern_file = $params->{pattern} if ($options & $PSTAMP_SELECT_BACKMDL);
     283        my $cmf_file;
     284        if ($stage ne 'chip') {
     285            # we don't ship chip stage cmf files because they may not be censored
     286            $cmf_file = $params->{cmf} if ($options & $PSTAMP_SELECT_CMF);
     287        }
    284288
    285289        my $outdir = dirname($output_base);

  • branches/eam_branches/ipp-20101205/pstamp/scripts/pstampparse.pl

    r29578 r30103  
    126126}
    127127
     128# Adjust the label for requests coming in over the web interaface
     129
     130my $label_changed = 0;
     131if ($label and $label eq "WEB.UP") {
     132    my $lcname = lc($req_name);
     133    if ($lcname =~ /pitt/) {
     134        $label = "PITT";
     135        $label_changed = 1;
     136    } elsif ($lcname =~ /cfa/) {
     137        $label = "CFA";
     138        $label_changed = 1;
     139    } elsif ($lcname =~ /durham/) {
     140        $label = "DURHAM";
     141        $label_changed = 1;
     142    } elsif ($lcname =~ /qub/) {
     143        $label = "QUB";
     144        $label_changed = 1;
     145    }
     146    print "Setting label for $req_name to $label\n" if $label_changed;
     147}
     148
     149
    128150if ($req_id and !$no_update) {
    129151    # update the database with the request name. This will be used as the
    … …  
    131153    my $command = "$pstamptool -updatereq -req_id $req_id  -set_name $req_name";
    132154    $command .= " -set_outProduct $product";
     155    $command .= " -set_label $label" if $label_changed;
    133156    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    134157        run(command => $command, verbose => $verbose);

  • branches/eam_branches/ipp-20101205/pstamp/src/ppstampMakeStamp.c

    r29885 r30103  
    320320        }
    321321        if (readout->mask) {
    322             outReadout->mask = extractStamp(readout->mask, extractRegion,  0);
     322            psImageMaskType maskInitValue = pmConfigMaskGet("BLANK", config);
     323            outReadout->mask = extractStamp(readout->mask, extractRegion,  maskInitValue);
    323324            if (!outReadout->mask) {
    324325                psError(PS_ERR_UNKNOWN, false, "failed to create postage stamp mask image\n");
Note: See TracChangeset for help on using the changeset viewer.