IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 19, 2012, 5:24:19 PM (14 years ago)
Author:
mhuber
Message:

merging latest r34040 trunk changes to branch

Location:
branches/meh_branches/ppstack_test
Files:
38 edited
11 copied

Legend:

Unmodified
Added
Removed

  • branches/meh_branches/ppstack_test

  • branches/meh_branches/ppstack_test/ippMonitor

  • branches/meh_branches/ppstack_test/ippMonitor/INSTALL

    r33415 r34041  
    1515# note that we have a special version for ippmonitor without $PSCONFIG/$PSCONFDIR values:
    1616ipp@ippdb03 / ippdb03 example:
    17  psconfigure --dbhost ippdb01 --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     17# psconfigure --dbhost ippdb01 --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
    1818
     19#ipp@ippdb03 / ippdb01 example:
     20 psconfigure --dbhost ippdb03 --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     21
     22#
     23# Regular installation on ippMonitor.ifa.hawaii.edu
     24# Note: we use a 'science databases (replication) slave' and the ippMonitor read-only account to connect to that database
     25psconfigure --dbhost scidbs1 --dbuser ippMonitor --dbpass ippMonitor --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config

  • branches/meh_branches/ppstack_test/ippMonitor/Makefile.in

    r33415 r34041  
    4747$(DESTWWW)/ipp.dvodb.dat \
    4848$(DESTWWW)/ipp.dvodb.php \
     49$(DESTWWW)/ipp.czar.dat \
     50$(DESTWWW)/ipp.czar.php \
    4951$(DESTWWW)/phptest.php \
    5052$(DESTWWW)/site.php \
    … …  
    222224$(DESTWWW)/minidvodbCopy.php \
    223225$(DESTWWW)/minidvodbProcessed.php \
     226$(DESTWWW)/mergedvodbRun.php \
     227$(DESTWWW)/mergedvodbCopy.php \
     228$(DESTWWW)/mergedvodbProcessed.php \
     229$(DESTWWW)/dvodbStatus.php \
     230$(DESTWWW)/dvodbFaulted.php \
    224231$(DESTWWW)/addRunRun.php \
    225232$(DESTWWW)/addRunProcessed.php \
     233$(DESTWWW)/addRunSummary.php \
    226234$(DESTWWW)/lapSequenceSummary.php \
    227235$(DESTWWW)/lapRuns.php \

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czarpoll.pl

    r33415 r34041  
    3838
    3939my @stages = (
    40         "burntool",
    4140        "chip",
    4241        "cam",
    … …  
    4443        "warp",
    4544        "stack",
     45        "staticsky",
    4646        "diff",
    47         "magic",
    48         "magicDS",
    4947        "dist",
    50         "pub");
     48        "pub",
     49        "chipbackground");
    5150
    5251my @ippToPspsStages = (

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool.pl

    r32093 r34041  
    3232my @publishingLabels = undef;
    3333
    34 my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub");
     34my @stages = ("chip", "cam", "fake", "warp", "stack", "staticsky", "diff", "dist", "pub", "chipbackground");
    3535promptPoll();
    3636
    … …  
    155155
    156156    chomp($label);
    157 
    158     printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------+\n");
    159     printf("|                                                         %32s                                                     |\n", $label);
    160     printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
    161     printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
    162     printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
     157    my $stage;
     158
     159    printf("\n|  %32s  \n", $label);
     160    printf("+------------+");
     161    foreach $stage (@stages) {
     162        print "--------------+"
     163    }
     164    printf("\n");
     165    printf("|   state    |");
     166    foreach $stage (@stages) {
     167
     168        printf("%14s|", $stage)
     169    }
     170    printf("\n");
     171    printf("+------------+");
     172    foreach $stage (@stages) {
     173        print "--------------+"
     174    }
     175    printf("\n");
    163176
    164177    my $state;
    165     my $stage;
    166178    my $i=0;
    167179    foreach $state (@states) {
    … …  
    172184        foreach $stage (@stages) {
    173185
    174             printf("| %10s ", getStateAndFaultsString($label, $state, $stage));
     186            printf("|%14s", getStateAndFaultsString($label, $state, $stage));
    175187        }
    176188
    … …  
    179191    }
    180192
    181     printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
     193    printf("+------------+");
     194    foreach $stage (@stages) {
     195        print "--------------+"
     196    }
     197    printf("\n");
    182198
    183199}
    … …  
    191207    my ($state) = @_;
    192208#print time, $/;
    193     printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n");
    194     printf("|                                                                                         %10s (any faults are shown in parentheses)                                                                 |\n", $state);
    195     printf("+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+\n");
    196     printf("| no  |              label               | distributing? |  publishing?  |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
    197     printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
     209    my $stage;
     210
     211    printf("|\n");
     212    printf("+-----+----------------------------------+---------------+---------------+");
     213    foreach $stage (@stages) {
     214        print "--------------+"
     215    }
     216    printf("\n");
     217    printf("| no  |              label               | distributing? |  publishing?  |");
    198218
    199219    my $stdsLabel;
    … …  
    202222    my $distributing;
    203223    my $publishing;
    204     my $stage;
    205224    my $i=1;
     225    foreach $stage (@stages) {
     226
     227        printf("%14s|", $stage)
     228    }
     229    printf("\n");
     230    printf("+-----+----------------------------------+---------------+---------------+");
     231    foreach $stage (@stages) {
     232        print "--------------+"
     233    }
     234    printf("\n");
     235
    206236    foreach $stdsLabel (@stdscienceLabels) {
    207237
    … …  
    225255        foreach $stage (@stages) {
    226256
    227             printf("| %10s ", getStateAndFaultsString($stdsLabel, $state, $stage));
     257            printf("|%14s", getStateAndFaultsString($stdsLabel, $state, $stage));
    228258        }
    229259
    … …  
    232262    }
    233263
    234     printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
     264    printf("+-----+----------------------------------+---------------+---------------+");
     265    foreach $stage (@stages) {
     266        print "--------------+"
     267    }
     268    printf("\n");
    235269
    236270}

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/CzarDb.pm

    r33415 r34041  
    99
    1010my @stages = (
    11         "burntool",
    1211        "chip",
    1312        "cam",
    … …  
    1615        "stack",
    1716        "diff",
    18         "magic",
    19         "magicDS",
    2017        "dist",
    21         "pub"); # TODO put elsewhere
     18        "pub",
     19        "chipbackground"); # TODO put elsewhere
    2220
    2321my @ippToPspsStages = (

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/DayMetrics.pm

    r32093 r34041  
    4040    $self->{begin} =  "$yesterday " . $self->{config}->getMetricsStartTime();
    4141    $self->{end} = $self->{czarDb}->addInterval($self->{begin}, "1 DAY");
    42     $self->{burntoolEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
     42    $self->{chipEnd} = $self->{czarDb}->addInterval($self->{begin}, "12 HOUR");
    4343
    4444    # create path, dir and html file
    … …  
    6767    my $htmlFile = $self->{htmlFile};
    6868
    69     # summit and burntool exposures
     69    # summit and chip exposures
    7070    my $summitExposures = $self->{gpc1Db}->countScienceExposuresFromLastNight($self->{day});
    71     my $burntoolMetrics = new czartool::StageMetrics("burntool", "all_stdscience_labels", $self->{begin}, $self->{burntoolEnd});
    72     $self->{czarDb}->runAnalysis($burntoolMetrics);
     71    my $chipMetrics = new czartool::StageMetrics("chip", "all_stdscience_labels", $self->{begin}, $self->{chipEnd});
     72    $self->{czarDb}->runAnalysis($chipMetrics);
    7373
    7474    my $previousDay = $self->{czarDb}->subtractInterval($self->{day}, "1 DAY");
    … …  
    7878    print $htmlFile "<a href=\"../$previousDay/index.html\"> \< previous day</a> | <a href=\"../index.html\">all</a> | <a href=\"../$nextDay/index.html\">next day \></a><br>\n";
    7979    print $htmlFile "Measured from $self->{begin} to $self->{end} HST<br>\n";
    80     printf ( $htmlFile "%d exposures taken on summit last night, %d through burntool today</h5>\n",
    81             $summitExposures, $burntoolMetrics->getProcessed() ? $burntoolMetrics->getProcessed() : 0 );
     80    printf ( $htmlFile "%d exposures taken on summit last night, %d through chip today</h5>\n",
     81            $summitExposures, $chipMetrics->getProcessed() ? $chipMetrics->getProcessed() : 0 );
    8282    print $htmlFile "</head>\n";
    8383    print $htmlFile "<body>\n";
    … …  
    9898    my %labelTables;
    9999
    100     my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
     100    my @stages = (
     101            "chip",
     102            "cam",
     103            "fake",
     104            "warp",
     105            "stack",
     106            "staticsky",
     107            "diff",
     108            "dist",
     109            "chipbackground");
    101110
    102111
    … …  
    126135        foreach my $stage ( @stages ){
    127136
    128             my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "burntool") ? $self->{burntoolEnd} : $self->{end});
     137            my $stageMetrics = new czartool::StageMetrics($stage, $label, $self->{begin}, ($stage eq "chip") ? $self->{chipEnd} : $self->{end});
    129138            if (!$self->{czarDb}->runAnalysis($stageMetrics)) {next;}
    130139
    … …  
    253262    print $htmlFile "  <tr>\n";
    254263    print $htmlFile "    <th>Survey</th>\n";
    255     print $htmlFile "    <th>Started burntool</th>\n";
     264    print $htmlFile "    <th>Started chip</th>\n";
    256265    print $htmlFile "    <th>Finished distribution</th>\n";
    257266    print $htmlFile "    <th>Time taken</th>\n";
    … …  
    260269    # OSS survey
    261270    my ($started, $finished, $timeTaken) = undef;
    262     $self->{czarDb}->getDayTimings("OSS.nightlyscience", "burntool", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
     271    $self->{czarDb}->getDayTimings("OSS.nightlyscience", "chip", "diff", $self->{begin}, \$started, \$finished, \$timeTaken);
    263272    $self->printSurveyDetails("OSS", $started, $finished, $timeTaken);
    264273
    … …  
    285294    foreach $mdf (@mdfs) {
    286295
    287         if ($self->{czarDb}->getDayTimings($mdf, "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
     296        if ($self->{czarDb}->getDayTimings($mdf, "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken)) {
    288297
    289298            if ($started && $self->{czarDb}->isBefore($started, $earliest)) {$earliest = $started; $haveStart = 1;}
    … …  
    299308    $self->printSurveyDetails("MDF", $earliest, $latest, $timeTaken);
    300309
    301     $self->{czarDb}->getDayTimings("all_stdscience_labels", "burntool", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
     310    $self->{czarDb}->getDayTimings("all_stdscience_labels", "chip", "dist", $self->{begin}, \$started, \$finished, \$timeTaken);
    302311    $self->printSurveyDetails("All", $started, $finished, $timeTaken);
    303312

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/Gpc1Db.pm

    r33415 r34041  
    2424    elsif ($stage eq "warp") {${$joinTable}="warpSkyfile";}
    2525    elsif ($stage eq "stack") {${$joinTable}="stackSumSkyfile";}
     26    elsif ($stage eq "staticsky") {${$id} = "sky_id"; ${$joinTable}="staticskyResult";}
    2627    elsif ($stage eq "diff") {${$joinTable}="diffSkyfile";}
    2728    elsif ($stage eq "magic") {${$joinTable}="magicNodeResult";}
    … …  
    2930    elsif ($stage eq "dist") {${$joinTable}="distComponent";}
    3031    elsif ($stage eq "pub") {${$joinTable}="publishDone";}
     32    elsif ($stage eq "chipbackground") {${$id}="chip_bg_id"; ${$joinTable}="chipBackgroundImfile";}
    3133    else {
    3234
    … …  
    5153    elsif ($stage eq "warp" ) {return "warpRun";}
    5254    elsif ($stage eq "stack" ) {return "stackRun";}
     55    elsif ($stage eq "staticsky" ) {return "staticskyRun";}
    5356    elsif ($stage eq "diff" ) {return "diffRun";}
    5457    elsif ($stage eq "magic" ) {return "magicRun";}
    … …  
    5659    elsif ($stage eq "dist" ) {return "distRun";}
    5760    elsif ($stage eq "pub" ) {return "publishRun";}
     61    elsif ($stage eq "chipbackground" ) {return "chipBackgroundRun";}
    5862
    5963    return "ERROR";

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/Plotter.pm

    r33415 r34041  
    1111
    1212my @allStages = (
    13         "burntool",
    1413        "chip",
    1514        "cam",
    … …  
    1716        "warp",
    1817        "stack",
     18        "staticsky",
    1919        "diff",
    20         "magic",
    21         "magicDS",
    2220        "dist",
    23         "pub");
     21        "pub",
     22        "chipbackground");
    2423
    2524my @allIppToPspsStages = (

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/czartool/czarconfig.xml

    r33415 r34041  
    2121  <gpc1database>
    2222    <name>gpc1</name>
    23     <host>ippdb01</host>
     23    <host>scidbs1</host>
    2424    <user>ippMonitor</user>
    2525    <password>ippMonitor</password>
    … …  
    2929  <czardatabase>
    3030    <name>czardb</name>
    31     <host>ippdb01</host>
     31    <host>scidbm</host>
    3232    <user>ipp</user>
    3333    <password>ipp</password>
    … …  
    4646
    4747</czarconfig>
     48

  • branches/meh_branches/ppstack_test/ippMonitor/czartool/roboczar.pl

    r32098 r34041  
    2121my $czarDb = $config->getCzarDbInstance();
    2222
    23 my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); # TODO get from Pantasks
     23my @stages = (
     24        "chip",
     25        "cam",
     26        "fake",
     27        "warp",
     28        "stack",
     29        "staticsky",
     30        "diff",
     31        "dist",
     32        "chipbackground"); # TODO get from Pantasks
    2433
    2534my @interestedServers = $config->getRoboczarInterestedServers();

  • branches/meh_branches/ppstack_test/ippMonitor/def/addRunRun.d

    r31320 r34041  
    99
    1010#     field                   size  format  name         show    link to                  extras
    11 FIELD distinct(addRun.add_id),        5, %d,     add ID
     11FIELD addRun.add_id,       5, %d,     addID
    1212FIELD addRun.stage,        5, %s,     stage
    13 FIELD addRun.stage_id,          5, %d,     stage ID
    14 FIELD addRun.add_id,        5, %d,     add ID
     13FIELD addRun.stage_id,     5, %d,     stageID
     14FIELD addRun.stage_extra1, 5, %d,     stageExtra1
     15#FIELD addRun.add_id,       5, %d,     addID
    1516FIELD addRun.state,        5, %s,     state
    16 FIELD addRun.workdir,        5, %s,     workdir
    17 FIELD addRun.reduction,        5, %s,     reduction
     17FIELD addRun.workdir,      5, %s,     workdir
     18FIELD addRun.reduction,    5, %s,     reduction
    1819FIELD addRun.label,        5, %s,     label
    19 FIELD addRun.data_group,        5, %s,     data_group
     20FIELD addRun.data_group,   5, %s,     data_group
    2021FIELD addRun.dvodb,        5, %s,     dvodb
    21 FIELD addRun.note,        5, %s,     note
    22 FIELD addRun.image_only,        5, %d,   image_only
    23 FIELD addRun.minidvodb,        5, %d,     minidvodb
    24 FIELD addRun.minidvodb_group,        5, %s,     minidvodb_group
    25 FIELD addRun.minidvodb_name,        5, %s,     minidvodb_name
    26 
    27 
     22FIELD addRun.note,         5, %s,     note
     23FIELD addRun.image_only,   5, %d,   image_only
     24FIELD addRun.minidvodb,    5, %d,     minidvodb
     25FIELD addRun.minidvodb_group, 5, %s,     minidvodb_group
     26FIELD addRun.minidvodb_name,  5, %s,     minidvodb_name

  • branches/meh_branches/ppstack_test/ippMonitor/def/autocode.php

    r29485 r34041  
    2828// ** TABLE RESTRICTIONS **
    2929
     30// Note: the restriction is now moved AFTER the count query
     31// unless the RESTRICT_COUNT keyword is used
    3032if ($restricted == 0) {
    31   if ("$UNRESTRICTED" != "none") {
    32     $WHERE = "$WHERE $UNRESTRICTED";
     33  if ("$RESTRICT_COUNT" != "none") {
     34    $WHERE = "$WHERE $RESTRICT_COUNT";
    3335  }
    3436}
    … …  
    5658  menu_end();
    5759}
     60
     61// Restrict the query if it is necessary
     62if ($restricted == 0) {
     63  if ( ("$UNRESTRICTED" != "none") && ("$RESTRICT_COUNT" == "none") ) {
     64    $WHERE = "$WHERE $UNRESTRICTED";
     65  }
     66}
     67
    5868// set up the row counter variables
    5969if ($ID['from']) {

  • branches/meh_branches/ppstack_test/ippMonitor/def/camProcessedExp_Images.d

    r31828 r34041  
    33FILE  camProcessedExp_Images.php
    44MENU  ipp.science.dat
     5
     6UNRESTRICTED AND 0>1
    57
    68# the following WHERE clauses are added to all queries joined by AND
    … …  
    1012WHERE camProcessedExp.cam_id  = camRun.cam_id
    1113WHERE camProcessedExp.fault = 0
    12 
    1314# define image names to be used below
    1415# IMAGE VAR basename filerule camera class_id

  • branches/meh_branches/ppstack_test/ippMonitor/def/diffSummary_Images.d

    r28654 r34041  
    33FILE  diffSummary_Images.php
    44MENU  ipp.stack.dat
     5
     6UNRESTRICTED AND 0>1
    57
    68WHERE diffRun.diff_id             = diffSkyfile.diff_id

  • branches/meh_branches/ppstack_test/ippMonitor/def/exposureStatus.d

    r29404 r34041  
    22TITLE Exposures Status
    33FILE exposureStatus.php
    4 MENU ipp.imfiles.dat
     4MENU ipp.czar.dat
    55
    66WHERE object != 'ENGINEERING'

  • branches/meh_branches/ppstack_test/ippMonitor/def/gpc1MysqlProcessList.d

    r29481 r34041  
    22TITLE GPC 1 MySql Process List
    33FILE gpc1MysqlProcessList.php
    4 MENU ipp.imfiles.dat
     4MENU ipp.czar.dat
    55
    66FIELD ID,   5,  %d, Process ID

  • branches/meh_branches/ppstack_test/ippMonitor/def/maskStats.d

    r28451 r34041  
    22TITLE Mask Stats
    33FILE  maskStats.php
    4 MENU  ipp.imfiles.dat
     4MENU  ipp.czar.dat
    55
    66WHERE rawExp.exp_id = chipRun.exp_id

  • branches/meh_branches/ppstack_test/ippMonitor/def/minidvodbProcessed.d

    r30453 r34041  
    99
    1010#     field                   size  format  name         show    link to                  extras
    11 FIELD distinct(minidvodbRun.minidvodb_id),        5, %d,     Minidvodb ID
    12 
     11FIELD minidvodbRun.minidvodb_id,        5, %d,     Minidvodb ID
    1312FIELD minidvodbRun.minidvodb_name,          5, %s,     minidvodb_name
    1413FIELD minidvodbRun.minidvodb_group,       5, %s,     minidvodb_group
    15 FIELD minidvodbProcessed.merge_order,        5, %d,     Merge Order
    1614FIELD minidvodbProcessed.dtime_resort,        5, %d,     resort time
    1715FIELD minidvodbProcessed.dtime_relphot,        5, %d,     relphot time
    18 FIELD minidvodbProcessed.dtime_merge,        5, %d,     dvomerge time
    19 FIELD minidvodbProcessed.mergedvodb_path,          25, %s,     mergedvodb_path
     16FIELD minidvodbProcessed.dtime_script,        5, %d,     script time
    2017FIELD state,          5, %s,    State
    2118FIELD minidvodbProcessed.fault,        5, %d,     Fault

  • branches/meh_branches/ppstack_test/ippMonitor/def/minidvodbRun.d

    r30453 r34041  
    99
    1010#     field                   size  format  name         show    link to                  extras
    11 FIELD distinct(minidvodbRun.minidvodb_id),        5, %d,     Minidvodb ID
     11FIELD minidvodbRun.minidvodb_id,        5, %d,     Minidvodb ID
    1212FIELD minidvodbRun.minidvodb_name,          5, %s,     minidvodb_name
    1313FIELD minidvodbRun.minidvodb_group,       5, %s,     minidvodb_group
    1414FIELD minidvodbRun.minidvodb_path,    25, %s,     minidvodb_path
    15 FIELD minidvodbRun.mergedvodb_path,          25, %s,     mergedvodb_path
     15#FIELD minidvodbRun.mergedvodb_path,          25, %s,     mergedvodb_path
    1616FIELD state,          5, %s,    State
    1717FIELD creation_date,        5, %T,     epoch

  • branches/meh_branches/ppstack_test/ippMonitor/def/mopsStatus.d

    r33415 r34041  
    22TITLE MOPS Status
    33FILE mopsStatus.php
    4 MENU ipp.imfiles.dat
     4MENU ipp.czar.dat
    55#WHERE rawExp.obs_mode!='ENGINEERING'
    66

  • branches/meh_branches/ppstack_test/ippMonitor/def/newImfile.d

    r18193 r34041  
    44MENU  ipp.load.dat
    55
     6UNRESTRICTED WHERE 0>1
     7
    68#        field       size  format  name           show   link to         extras
    79FIELD    exp_id,        5, %d,     exposure ID

  • branches/meh_branches/ppstack_test/ippMonitor/def/pzDoneImfile.d

    r16638 r34041  
    33FILE  pzDoneImfile.php
    44MENU  ipp.load.dat
     5
     6UNRESTRICTED AND 0>1
    57
    68WHERE pzDownloadImfile.fault     = 0

  • branches/meh_branches/ppstack_test/ippMonitor/def/pzPendingImfile.d

    r16638 r34041  
    33FILE  pzPendingImfile.php
    44MENU  ipp.load.dat
     5
     6UNRESTRICTED AND 0>1
    57
    68WHERE summitImfile.exp_name  = pzDownloadExp.exp_name

  • branches/meh_branches/ppstack_test/ippMonitor/def/rawBurntoolState.d

    r30690 r34041  
    55
    66# if no query restrictions are supplied, we want to limit the query or it is extremely long running:
     7RESTRICT_COUNT WHERE 0>1
    78UNRESTRICTED WHERE exp_id = 0
    89

  • branches/meh_branches/ppstack_test/ippMonitor/def/rawImfile.d

    r26991 r34041  
    55
    66# HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']);
     7
     8UNRESTRICTED WHERE 0>1
    79
    810OP   OP1  $ra * 57.295783

  • branches/meh_branches/ppstack_test/ippMonitor/def/summitImfile.d

    r16617 r34041  
    33FILE  summitImfile.php
    44MENU  ipp.load.dat
     5
     6UNRESTRICTED WHERE 0>1
    57
    68#        field     size  format  name             show   link to         extras

  • branches/meh_branches/ppstack_test/ippMonitor/def/warpProcessedSkyfiles_Images.d

    r33415 r34041  
    11TABLE  rawExp JOIN chipRun USING(exp_id) JOIN camRun USING(chip_id) JOIN fakeRun USING(cam_id) JOIN warpRun USING(fake_id) JOIN warpSkyfile USING(warp_id)
    22TITLE Warp Processed Skyfiles
    3 FILE  warpProcessedSkyfiles.php
     3FILE  warpProcessedSkyfiles_Images.php
    44MENU  ipp.science.dat
    55

  • branches/meh_branches/ppstack_test/ippMonitor/raw/czartool_getplot.php

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

  • branches/meh_branches/ppstack_test/ippMonitor/raw/czartool_ipptopsps.php

    r33415 r34041  
    2323
    2424if ($ID['menu']) {$myMenu = $ID['menu'];}
    25 else {$myMenu = "ipp.imfiles.dat";}
     25else {$myMenu = "ipp.czar.dat";}
    2626
    2727menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
    … …  
    7878
    7979$debug = 0;
    80 $table = "<table bgcolor=\"#FFFFFF\" width=\"700\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
     80$table = "<table bgcolor=\"#FFFFFF\" width=\"900\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
    8181
    8282
    … …  
    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/meh_branches/ppstack_test/ippMonitor/raw/czartool_labels.php

    r33415 r34041  
    2323
    2424if ($ID['menu']) {$myMenu = $ID['menu'];}
    25 else {$myMenu = "ipp.imfiles.dat";}
     25else {$myMenu = "ipp.czar.dat";}
    2626
    2727menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
    2828
    2929$stages=array(
    30         "burntool",
    3130        "chip",
    3231        "cam",
    … …  
    3433        "warp",
    3534        "stack",
     35        "staticsky",
    3636        "diff",
    37         "magic",
    38         "magicDS",
    3937        "dist",
    40         "pub");
     38        "pub",
     39        "chipbackground");
    4140
    4241$servers=array(
    … …  
    9291
    9392$debug = 0;
    94 $table = "<table bgcolor=\"#FFFFFF\" width=\"700\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
     93$table = "<table bgcolor=\"#FFFFFF\" width=\"900\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
    9594
    9695$labels = getLabels($czardb, $selectedMode);
    … …  
    172171echo "<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>";
    173172echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp0022.ifa.hawaii.edu/ps1sc/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";
    174 echo "<tr><td>Czar log pages</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/PS1_IPP_CzarLogs\"><font color=\"blue\">here</font></a></td></tr>";
     173echo "<tr><td>Czar log pages</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/PS1_IPP_CzarLogs\"><font color=\"blue\">All</font></a>&nbsp;&nbsp;&nbsp;";
     174echo "<a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/PS1_IPP_CzarLog_".(date("Ymd")-date("w")+"1")."\">This week</a>";
     175echo "</td></tr>";
    175176echo "<tr><td>Exposure summary</td><td><a href=\"czartool_exposures.php?pass=$pass&proj=$proj\"><font color=\"blue\">here</font></a></td></tr>";
    176177
    … …  
    216217      showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP);
    217218      showReplicationsStatus($REPL_HOST_IPPADMIN, $REPL_USER_IPPADMIN, $REPL_PASSWORD_IPPADMIN, $REPL_DBNAME_IPPADMIN);
     219      showReplicationsStatus($REPL_HOST_ISP, $REPL_USER_ISP, $REPL_PASSWORD_ISP, $REPL_DBNAME_ISP);
    218220      echo "</table>";
    219221
    … …  
    441443        $anyFaults = false;
    442444
    443         $link = $defaultlink;
    444         getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults);
    445         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
    446 
    447445        $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState;
    448446        getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults);
    … …  
    465463        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
    466464
     465        $link = $defaultlink;
     466        getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults);
     467        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
     468
    467469        $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState;
    468470        getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults);
    … …  
    470472
    471473        $link = $defaultlink;
    472         getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults);
    473         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
    474 
    475         $link = $defaultlink;
    476         getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults);
    477         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
    478 
    479         $link = $defaultlink;
    480474        getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults);
    481475        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
    … …  
    485479        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$publishing) ? "gray" : null);
    486480
     481        $link = $defaultlink;
     482        getStateAndFaults($db, $thisLabel, $selectedState, "chipbackground", $str, $anyFaults);
     483        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
     484
    487485        echo "</tr>\n";
    488486    }
    … …  
    492490    createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
    493491
    494     createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
    495 
    496492    foreach ($stages as &$stage) {
    497493
    498         if ($stage == "burntool") continue;
    499494        $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";}
    512         if(!$reverting) {$label =  "no";}
    513         if($reverting) {$label = "yes";}
     495        if(!$reverting) {$label =  "";}
     496        if($reverting) {$label = "reverting";}
    514497        unset($reverting);
    515         #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
    516498        createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
    517         #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";
    518 
    519499    }
    520500

  • branches/meh_branches/ppstack_test/ippMonitor/raw/ipp.dvodb.dat

    r30453 r34041  
    99             
    1010menulink  | menuselect   | link    | minidvodbRun              | minidvodbRun.php
    11 menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php           
     11menulink  | menuselect   | link    | minidvodbProcessed         | minidvodbProcessed.php   
    1212menulink  | menuselect   | link    | minidvodbCopy               | minidvodbCopy.php           
    1313
     14menutop   | menutop      | plain   | &nbsp;   |
     15
     16menulink  | menuselect   | link    | mergedvodbRun              | mergedvodbRun.php
     17menulink  | menuselect   | link    | mergedvodbProcessed         | mergedvodbProcessed.php   
     18menulink  | menuselect   | link    | mergedvodbCopy               | mergedvodbCopy.php           
     19
     20menutop   | menutop      | plain   | &nbsp;   |
     21
     22menulink  | menuselect   | link    | dvodbStatus               | dvodbStatus.php
     23menulink  | menuselect   | link    | dvodbFaulted               | dvodbFaulted.php           
     24menulink  | menuselect   | link    | addRun Summary        | addRunSummary.php           

  • branches/meh_branches/ppstack_test/ippMonitor/raw/ipp.menu.dat

    r31816 r34041  
    2727menutop   | menutop      | link    | Calibration                  | ipp.cal.php
    2828menutop   | menutop      | link    | Plots                        | ipp.plots.php
     29menutop   | menutop      | link    | Czar                         | ipp.czar.php
    2930menutop   | menutop      | link    | Admin and Debug              | ipp.imfiles.php

  • branches/meh_branches/ppstack_test/ippMonitor/raw/ipp.science.dat

    r28688 r34041  
    3838menulink  | menuselect   | link    | Warp Skyfile Inputs          | warpStageSkyfileInputs.php
    3939menulink  | menuselect   | link    | Warp Processed Skyfiles      | warpProcessedSkyfiles.php
     40#menulink  | menuselect   | link    | Warp Processed Skyfiles w/ Images     | warpProcessedSkyfiles_images.php
    4041menulink  | menuselect   | link    | Warp Failed Skyfiles         | warpFailedSkyfiles.php
    4142

  • branches/meh_branches/ppstack_test/ippMonitor/raw/nightSummary.php

    r33415 r34041  
    5252  $myMenu = $ID['menu'];
    5353} else {
    54   $myMenu = "ipp.imfiles.dat";
     54  $myMenu = "ipp.czar.dat";
    5555}
    5656

  • branches/meh_branches/ppstack_test/ippMonitor/raw/site.php.in

    r31812 r34041  
    2525$REPL_USER_IPPADMIN = "ippMonitor";
    2626$REPL_PASSWORD_IPPADMIN = "ippMonitor";
    27 $REPL_DBNAME_IPPADMIN = "ipp001 (gpc1, isp, ippadmin, czardb)";
     27$REPL_DBNAME_IPPADMIN = "ipp001 (gpc1, isp, ippadmin, czardb, ipptopsps, megacam, ssp, uip)" ;
    2828
    2929$REPL_HOST_NEBULOUS = "ippdb02.IfA.Hawaii.Edu";
    3030$REPL_USER_NEBULOUS = "ippMonitor";
    3131$REPL_PASSWORD_NEBULOUS = "ippMonitor";
    32 $REPL_DBNAME_NEBULOUS = "ippdb02 (Nebulous)";
     32$REPL_DBNAME_NEBULOUS = "ippdb02 (nebulous)";
    3333
    3434$REPL_HOST_PSTAMP = "ippc19.IfA.Hawaii.Edu";
    … …  
    4040$REPL_USER_GPC1 = "ippMonitor";
    4141$REPL_PASSWORD_GPC1 = "ippMonitor";
    42 $REPL_DBNAME_GPC1 = "ippdb03 (gpc1, isp, ippadmin, czardb)";
     42$REPL_DBNAME_GPC1 = "ippdb03 (czardb, gpc1, ippadmin, ipptopsps, megacam, skycells, ssp, uip)";
     43
     44$REPL_HOST_ISP = "ippc17.IfA.Hawaii.Edu";
     45$REPL_USER_ISP = "ippMonitor";
     46$REPL_PASSWORD_ISP = "ippMonitor";
     47$REPL_DBNAME_ISP = "ippc17 (isp)";
     48
     49
    4350
    4451?>

  • branches/meh_branches/ppstack_test/ippMonitor/scripts/generate

    r31816 r34041  
    2929    &init_key ("MODE");
    3030    &init_key ("UNRESTRICTED");
     31    &init_key ("RESTRICT_COUNT");
    3132    &init_key ("TABLE");
    3233    &init_key ("TITLE");
    … …  
    4647        if ($key eq "TABLE") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
    4748        if ($key eq "TYPE")  { ($value) = $value =~ m|^\s*(.+)\s*$|; }
    48         if ($key eq "TOPLOT") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
    49         if ($key eq "PLOTTER") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
    50         if ($key eq "PLOTTITLE") {
    51             ($value) = $value =~ m|^\s*(.+)\s*$|;
    52             $value =~ s/\s/_/g;
    53         }
     49        if ($key eq "TOPLOT") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
     50        if ($key eq "PLOTTER") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
     51        if ($key eq "PLOTTITLE") {
     52            ($value) = $value =~ m|^\s*(.+)\s*$|;
     53            $value =~ s/\s/_/g;
     54        }
    5455
    5556        &set_keypair ($key, $value);
    … …  
    6162            if ($field =~ m|\S+\s+as\s+\S+|) {
    6263                ($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;
    63                 #print STDERR "Case 1\n";
     64                #print STDERR "Case 1\n";
    6465            } elsif ($field =~ m|\S+\s+AS\s+\S+|) {
    65                 #print STDERR "field=$field\n";
    66                 $fieldreal = $field;
    67                 $fieldreal =~ s/\s+AS.*$//;
     66                #print STDERR "field=$field\n";
     67                $fieldreal = $field;
     68                $fieldreal =~ s/\s+AS.*$//;
    6869                #($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;
    69                 #print STDERR "Case 2\n";
     70                #print STDERR "Case 2\n";
    7071            } else {
    7172                $fieldreal = $field;
    72                 #print STDERR "Case 3\n";
     73                #print STDERR "Case 3\n";
    7374            }
    74             #print STDERR "field=[$field]\tfieldreal=[$fieldreal]\n";
     75            #print STDERR "field=[$field]\tfieldreal=[$fieldreal]\n";
    7576
    7677            if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s %-20s\n", $field, $name, $format, $show, $link, $extras; }
    … …  
    141142    &check_key ("MODE", "basic");
    142143    &check_key ("UNRESTRICTED", "none");
     144    &check_key ("RESTRICT_COUNT", "none");
    143145    &check_key ("TABLE", "");
    144146    &check_key ("TITLE", "");
    … …  
    324326# generate a WHERE test for each field (field != *)
    325327sub write_table_restrict {
    326 
    327328    if ($WHERE) {
    328329        print FILE "\$WHERE = \"WHERE $WHERE\";\n";
    … …  
    348349}
    349350
    350 # Generate GROUP BY statement if any 
     351# Generate GROUP BY statement if any
    351352sub write_group_by {
    352353    print FILE "\$WHERE = check_ordering ('$GROUPS', \$WHERE);\n";
    … …  
    536537    @extfields = split (/,/, $extras);
    537538    for ($i = 0; $i < @extfields; $i++) {
    538         # print STDERR $extfields[$i],"\n";
     539        # print STDERR $extfields[$i],"\n";
    539540        ($label, $value, $outline) = &parse_label ($extfields[$i]);
    540         # print STDERR "[",$label,"]","[",$value,"]","[",$outline,"\n";
     541        # print STDERR "[",$label,"]","[",$value,"]","[",$outline,"\n";
    541542        print FILE "  \$link = \$link . \"&$outline\";\n";
    542543    }
    … …  
    553554    # print STDERR "#############################\n";
    554555    # foreach my $key ( keys %linkarg ) {
    555     #   print STDERR "key: $key, value: $linkarg{$key}\n";
     556    #   print STDERR "key: $key, value: $linkarg{$key}\n";
    556557    # }
    557558
    … …  
    560561
    561562    if ($linkarg{$word}) {
    562         # print STDERR "Case 1\n";
     563        # print STDERR "Case 1\n";
    563564        $linkarg{$word} = "$linkarg{$word},$value";
    564565    } else {
    565         # print STDERR "Case 2\n";
     566        # print STDERR "Case 2\n";
    566567        $linkarg{$word} = $value;
    567568    }
    … …  
    585586    # print STDERR "### parse_label ###\n";
    586587    # for ($i = 0; $i < @field; $i++) {
    587     #   print STDERR "field[$i]=$field[$i]\n";
     588    #   print STDERR "field[$i]=$field[$i]\n";
    588589    # }
    589590    # for ($i = 0; $i < @fieldreal; $i++) {
    590     #   print STDERR "fieldreal[$i]=$fieldreal[$i]\n";
     591    #   print STDERR "fieldreal[$i]=$fieldreal[$i]\n";
    591592    # }
    592593    # for ($i = 0; $i < @count; $i++) {
    593     #   print STDERR "count[$i]=$count[$i]\n";
     594    #   print STDERR "count[$i]=$count[$i]\n";
    594595    # }
    595596
    … …  
    598599    if ($string =~ m|\S+=\S+|) {
    599600        ($label, $value) = $string =~ m|(\S+)=(\S+)|;
    600         # print STDERR "value=$value\n";
     601        # print STDERR "value=$value\n";
    601602        if ($value =~ m|^\$|) {
    602603          MATCH_LABEL:
    … …  
    669670    $name   = &parse_fieldname ($name);
    670671    if (exists $ops{$name}) {
    671         #if OPx was defined, replace it by its value
    672         $name = $ops{$name};
    673         $name =~ s/\s+//g;
     672        #if OPx was defined, replace it by its value
     673        $name = $ops{$name};
     674        $name =~ s/\s+//g;
    674675    }
    675676    $camera = &parse_fieldname ($camera);
Note: See TracChangeset for help on using the changeset viewer.