IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28654


Ignore:
Timestamp:
Jul 9, 2010, 5:06:44 PM (16 years ago)
Author:
Serge CHASTEL
Message:

Summary images for warpStageExp, stackSummary and diffSummary. generate script can now use OP values

Location:
trunk/ippMonitor
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/Makefile.in

    r28621 r28654  
    144144$(DESTWWW)/warpFailedSkyfiles.php \
    145145$(DESTWWW)/diffSummary.php \
     146$(DESTWWW)/diffSummary_Images.php \
    146147$(DESTWWW)/diffRun.php \
    147148$(DESTWWW)/diffInputSkyfile.php \
    … …  
    151152$(DESTWWW)/stackRun.php \
    152153$(DESTWWW)/stackSummary.php \
     154$(DESTWWW)/stackSummary_Images.php \
    153155$(DESTWWW)/stackInputSkyfile.php \
    154156$(DESTWWW)/stackProcessedSkyfile.php \

  • trunk/ippMonitor/def/warpStageExp.d

    r27892 r28654  
    1 TABLE warpRun, fakeRun, camRun, chipRun, rawExp
     1TABLE warpRun, fakeRun, camRun, chipRun, rawExp, warpSummary
    22TITLE Warp Stage Exposures
    33FILE  warpStageExp.php
    44MENU  ipp.science.dat
    55
     6#
     7# Images pathnames are extracted from warpSummary
     8# using ipp_filename.pl with basename:
     9#   $warpSummary.path_base . $warpSummary.projection_cell
     10# . is the string concatenation operator
     11#
    612WHERE warpRun.fake_id = fakeRun.fake_id
    713WHERE fakeRun.cam_id = camRun.cam_id
    814WHERE camRun.chip_id = chipRun.chip_id
    915WHERE chipRun.exp_id = rawExp.exp_id
     16WHERE warpSummary.warp_id = warpRun.warp_id
    1017
    1118ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id
    … …  
    1724OP   OP1  $rawExp.ra * 57.295783
    1825OP   OP2  $rawExp.decl * 57.295783
     26OP   OP3  $warpSummary.path_base . $warpSummary.projection_cell
     27
     28# define image names to be used below
     29# IMAGE VAR basename filerule camera class_id
     30# ARGS  ARG6 warpRun.warp_id=$warpRun.warp_id
     31# ARGS  ARG6 warpSummary.skycell_id=$warpSummary.skycell_id
     32# ARGS  ARG6 camera=$rawExp.camera
     33# ARGS  ARG6 basename=$warpSkyfile.path_base
     34IMAGE JPEG3 OP3 PPSKYCELL.JPEG2 $rawExp.camera NONE
     35ARGS ARG7 name=$warpSummary.path_base.$warpSummary.projection_cell
     36ARGS ARG7 rule=PPSKYCELL.JPEG1
     37ARGS ARG7 camera=GPC1
     38ARGS ARG7 class_id=NONE
     39
    1940
    2041#     field                   size  format  name         show    link to         extras
    … …  
    2546FIELD fakeRun.fake_id,           7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
    2647FIELD warpRun.warp_id,           7, %d,     Warp ID,      value,  warpStageExp.php,        ARG5
     48FIELD *,                         8, %s,     image,        image=JPEG3, getimage.php,  ARG7
    2749FIELD warpRun.state,             7, %s,     state
    2850FIELD warpRun.label,             7, %s,     label
    … …  
    4264FIELD rawExp.comment,           65, %s,     Comment
    4365
     66FIELD warpSummary.path_base,      5, %s,     path_base,   none
     67FIELD warpSummary.projection_cell,      5, %s,     projection_cell,   none
     68
    4469# FIELD rawExp.bg_mean_stdev,    5, %7.2f,  <backgnd>
    4570# FIELD chipPendingExp.reduction,    20,   reduction

  • trunk/ippMonitor/raw/columns_in_db.php

    r28606 r28654  
    3131            6 => "warpRun",
    3232            7 => "warpSkyCellMap",
     33            8 => "warpSummary",
    3334                     );
    3435

  • trunk/ippMonitor/raw/getimage.php

    r28043 r28654  
    1111// global $PSCONFIG
    1212
     13
    1314### these need to be set to the correct locations!!
    1415$MISSING = "missing.png";
    … …  
    2021}
    2122
    22 
    2323putenv("PSCONFDIR=$PSCONFDIR");
    2424putenv("PSCONFIG=$PSCONFIG");
    … …  
    2828
    2929if ($debug) {
     30  echo "DEBUG1<br>";
    3031  echo "args: $args<br>";
    3132  echo "path: $PATH<br>";
    3233  echo "perl: $PERLLIB<br>";
    3334  echo "bindir: $BINDIR<br>";
     35  echo "site=$SITE<br>\n";
    3436}
    3537
    … …  
    4345
    4446if ($debug) {
     47  echo "DEBUG2<br>";
    4548  echo "basename: $basename<br>";
    4649  echo "filerule: $filerule<br>";
    … …  
    6467
    6568if ($debug) {
    66   exec ("which ipp_filename.pl", $output, $status);
    67   echo "which ipp_filename.pl output:<br>";
     69  echo "DEBUG3<br>";
     70  $output = array();
     71  exec ("which $BINDIR/ipp_filename.pl", $output, $status);
     72  echo "which $BINDIR/ipp_filename.pl output:<br>";
    6873  for ($i = 0; $i < count($output); $i++) {
    6974    echo "output $i: $output[$i]<br>";
    … …  
    7176  echo "status:   $status<br>";
    7277
     78  $output = array();
    7379  exec ("whoami", $output, $status);
    7480  echo "which whoami output:<br>";
    … …  
    7985}
    8086
    81 exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
     87/* --site=$SITE */
     88$output = array();
     89exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id 2> /tmp/errors", $output, $status);
    8290
    8391# use these to check the environment
    … …  
    9199
    92100if ($debug) {
     101  echo "DEBUG4<br>";
     102  echo "Command = ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>\n";
    93103  echo "basename: $basename<br>";
    94104  for ($i = 0; $i < count($output); $i++) {
    95105    echo "output $i: $output[$i]<br>";
    96106  }
    97   echo "output:   $output[0]<br>";
    98107  echo "status:   $status<br>";
    99108  echo "filename: $filename<br>";

  • trunk/ippMonitor/raw/ipp.science.dat

    r26947 r28654  
    3636menulink  | menuselect   | link    | Warp Skyfile Inputs          | warpStageSkyfileInputs.php
    3737menulink  | menuselect   | link    | Warp Processed Skyfiles      | warpProcessedSkyfiles.php
    38 # menulink  | menuselect   | link    | Warp Processed Skyfiles      | warpProcessedSkyfiles_Images.php
    3938menulink  | menuselect   | link    | Warp Failed Skyfiles         | warpFailedSkyfiles.php
    4039

  • trunk/ippMonitor/raw/ipp.stack.dat

    r28143 r28654  
    33menutop   | menutop      | plain   | &nbsp;                       |
    44menulink  | menuselect   | link    | Stack Summary                | stackSummary.php
     5menulink  | menuselect   | link    | Stack Summary w/ Images        | stackSummary_Images.php
    56menulink  | menuselect   | link    | Stack Run                    | stackRun.php
    67menulink  | menuselect   | link    | Stack Input Skyfile          | stackInputSkyfile.php
    … …  
    1112menutop   | menutop      | plain   | &nbsp;                       |
    1213menulink  | menuselect   | link    | Diff Summary                 | diffSummary.php
     14menulink  | menuselect   | link    | Diff Summary w/ Images       | diffSummary_Images.php
    1315menulink  | menuselect   | link    | Diff Run                     | diffRun.php
    1416menulink  | menuselect   | link    | Diff Input Skyfile           | diffInputSkyfile.php

  • trunk/ippMonitor/scripts/generate

    r28601 r28654  
    162162    }
    163163
     164    foreach $opword (@opwords) {
     165        &parse_opwords ($opword);
     166    }
     167
    164168    foreach $imagedef (@imagedefs) {
    165169        &parse_imagedef ($imagedef);
    166     }
    167 
    168     foreach $opword (@opwords) {
    169         &parse_opwords ($opword);
    170170    }
    171171
    … …  
    446446            next;
    447447        }
     448
    448449    }
    449450}
    … …  
    625626    ($var, $name, $rule, $camera, $class) = split (" ", $value);
    626627    $name   = &parse_fieldname ($name);
     628    if (exists $ops{$name}) {
     629        #if OPx was defined, replace it by its value
     630        $name = $ops{$name};
     631        $name =~ s/\s+//g;
     632    }
    627633    $camera = &parse_fieldname ($camera);
    628634    $class  = &parse_fieldname ($class);
Note: See TracChangeset for help on using the changeset viewer.