IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 6, 2012, 6:32:19 PM (14 years ago)
Author:
watersc1
Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:
branches/czw_branch/20120906/ippMonitor
Files:
11 edited
7 copied

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20120906/ippMonitor

  • branches/czw_branch/20120906/ippMonitor/INSTALL

    r34006 r34772  
    2424# Note: we use a 'science databases (replication) slave' and the ippMonitor read-only account to connect to that database
    2525psconfigure --dbhost scidbs1 --dbuser ippMonitor --dbpass ippMonitor --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     26
     27psconfigure --dbhost scidbm --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     28

  • branches/czw_branch/20120906/ippMonitor/Makefile.in

    r33847 r34772  
    1414PROGRAMS = \
    1515$(DESTBIN)/skyplot.dvo \
     16$(DESTBIN)/skycellplot.dvo \
    1617$(DESTBIN)/czartool_getServerStatus.pl \
    1718$(DESTBIN)/czartool_revert.pl \
    … …  
    5758$(DESTWWW)/simplePlotraw.php \
    5859$(DESTWWW)/skyplot.php \
     60$(DESTWWW)/skycellplot.php \
    5961$(DESTWWW)/getimage.php \
    6062$(DESTWWW)/ipp.czartool.dat \
    … …  
    211213$(DESTWWW)/simplePlotChipImage.php \
    212214$(DESTWWW)/simplePlotCamImage.php \
     215$(DESTWWW)/simplePlotStackImage.php \
     216$(DESTWWW)/simplePlotStaticskyImage.php \
     217$(DESTWWW)/simplePlotSkycalImage.php \
    213218$(DESTWWW)/histogramBackgroundImage.php \
    214219$(DESTWWW)/histogramCamProcessedExpImage.php \
    … …  
    235240$(DESTWWW)/lapRuns.php \
    236241$(DESTWWW)/lapExposures.php \
    237 $(DESTWWW)/lapStacks.php
     242$(DESTWWW)/lapStacks.php \
     243$(DESTWWW)/failedStaticsky.php \
     244$(DESTWWW)/staticsky_failure.php
    238245
    239246PICTURES = \

  • branches/czw_branch/20120906/ippMonitor/czartool/czartool/czarconfig.xml

    r34006 r34772  
    1919
    2020  <!-- gpc1 Db section -->
     21<!--   <gpc1database> -->
     22<!--     <name>gpc1</name> -->
     23<!--     <host>scidbs1</host> -->
     24<!--     <user>ippMonitor</user> -->
     25<!--     <password>ippMonitor</password> -->
     26<!--   </gpc1database> -->
    2127  <gpc1database>
    2228    <name>gpc1</name>
    23     <host>scidbs1</host>
    24     <user>ippMonitor</user>
    25     <password>ippMonitor</password>
     29    <host>scidbm</host>
     30    <user>ippuser</user>
     31    <password>ippuser</password>
    2632  </gpc1database>
    2733

  • branches/czw_branch/20120906/ippMonitor/def/simplePlotCamImage.d

    r34189 r34772  
    1 TABLE camRun, chipRun, rawExp
     1TABLE camProcessedExp, camRun, chipRun, rawExp
    22TITLE New sky plot - cam
    33FILE  simplePlotCamImage.php
    … …  
    77WHERE chipRun.exp_id = rawExp.exp_id
    88WHERE camRun.chip_id = chipRun.chip_id
     9WHERE camProcessedExp.cam_id = camRun.cam_id
    910
    1011#    field                size  format  name           show     link to         extras
    … …  
    2425FIELD rawExp.bg,                  5, %.2f,   backgnd,         restrict
    2526FIELD rawExp.bg_stdev,            5, %.2f,   stdev,           restrict
     27FIELD camProcessedExp.fwhm_major, 5, %.2f,   FWHM_major,      restrict     
    2628
    2729# What to plot

  • branches/czw_branch/20120906/ippMonitor/raw/czartool_labels.php

    r34316 r34772  
    219219      showReplicationsStatus($REPL_HOST_IPPADMIN, $REPL_USER_IPPADMIN, $REPL_PASSWORD_IPPADMIN, $REPL_DBNAME_IPPADMIN);
    220220      showReplicationsStatus($REPL_HOST_ISP, $REPL_USER_ISP, $REPL_PASSWORD_ISP, $REPL_DBNAME_ISP);
     221      showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_DBNAME_NEBULOUS_SECONDARY);
    221222      echo "</table>";
    222223
    … …  
    464465        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
    465466
    466         $link = $defaultlink;
     467        $link = "failedStaticsky.php?pass=" . $pass . "&proj=" . $proj . "&staticskyRun.label=" . $thisLabel . "&staticskyRun.state=".$searchState;
    467468        getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults);
    468469        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);

  • branches/czw_branch/20120906/ippMonitor/raw/ipp.php

    r30454 r34772  
    799799  // echo "<b>class_id: $class_id</b><br>\n";
    800800  // echo "<b>camera:   $camera</b><br>\n";
     801  // echo "<b>filerule:   $filerule</b><br>\n";
    801802
    802803  if (! $class_id) { $class_id = "NONE"; }
    803804
     805  //SCH: I set a default value for the 'camera' which is based on the
     806  //'proj' parameter.
     807  //It's necessary for staticsky logs and it would require to join tables
     808  //back to the warpRun table
     809  if (! $camera) { $camera = strtoupper($_GET['proj']); }
     810
    804811  if ($basename && $camera && $filerule) {
    805 
    806812    // do I need to do this to the output result as well?
    807813    $basename = escapeshellarg($basename);
    … …  
    841847      return;
    842848    }
     849    echo "<b>log filename: $filename</b><br>\n";
    843850
    844851    echo "<pre>\n";
    … …  
    850857  }
    851858}
     859
    852860
    853861// expect image supplied with key=name

  • branches/czw_branch/20120906/ippMonitor/raw/ipp.plots.dat

    r28604 r34772  
    55menulink  | menuselect      | link    | Simple plot - chip                  | simplePlotChipImage.php
    66menulink  | menuselect      | link    | Simple plot - cam                   | simplePlotCamImage.php
     7menulink  | menuselect      | link    | Simple plot - stack                 | simplePlotStackImage.php
     8menulink  | menuselect      | link    | Simple plot - staticsky             | simplePlotStaticskyImage.php
     9menulink  | menuselect      | link    | Simple plot - skycal             | simplePlotSkycalImage.php
    710
    811menutop   | menutop      | plain   | &nbsp;                                 |

  • branches/czw_branch/20120906/ippMonitor/raw/ipp.stack.dat

    r28654 r34772  
    3636menulink  | menuselect   | link    | Static Sky Processed Skyfile | staticskyProcessedSkyfile.php
    3737menulink  | menuselect   | link    | Static Sky Failed Skyfile    | staticskyFailedSkyfile.php
     38menulink  | menuselect   | link    | Static Sky Failed            | failedStaticsky.php

  • branches/czw_branch/20120906/ippMonitor/raw/simplePlotcam.php

    r31102 r34772  
    2828// define restrictiosn to the queries
    2929// ** TABLE RESTRICTIONS **
    30 $WHERE = "WHERE camRun.state != 'new' AND chipRun.exp_id = rawExp.exp_id AND camRun.chip_id = chipRun.chip_id";
     30$WHERE = "WHERE camRun.state != 'new' AND chipRun.exp_id = rawExp.exp_id AND camRun.chip_id = chipRun.chip_id AND camProcessedExp.cam_id = camRun.cam_id";
    3131$WHERE = check_restrict ('rawExp.exp_name', $WHERE, 'string', 1.0);
    3232$WHERE = check_restrict ('rawExp.exp_id', $WHERE, 'string', 1.0);
    … …  
    6262$WHERE = check_restrict ('rawExp.bg_stdev', $WHERE, 'max', 1.0);
    6363$WHERE = check_restrict ('rawExp.comment', $WHERE, 'string', 1.0);
     64$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'string', 1.0);
     65$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'min', 1.0);
     66$WHERE = check_restrict ('camProcessedExp.fwhm_major', $WHERE, 'max', 1.0);
    6467$WHERE = check_ordering ('', $WHERE);
    6568
    … …  
    7376
    7477// get the result table count
    75 $sql = "SELECT count(*) FROM camRun, chipRun, rawExp $WHERE";
     78$sql = "SELECT count(*) FROM camProcessedExp, camRun, chipRun, rawExp $WHERE";
    7679
    7780$qry = $db->query($sql);
    7881if (dberror($qry)) {
    79   echo "<b>error reading camRun, chipRun, rawExp table count</b><br>\n";
     82  echo "<b>error reading camProcessedExp, camRun, chipRun, rawExp table count</b><br>\n";
    8083  echo "<br><small><b> count query : $sql </b></small><br>\n";
    8184  menu_end();
    8285}
    8386if (!$qry->fetchInto($row)) {
    84   echo "<b>error reading camRun, chipRun, rawExp table count</b><br>\n";
     87  echo "<b>error reading camProcessedExp, camRun, chipRun, rawExp table count</b><br>\n";
    8588  echo "<br><small><b> count query : $sql </b></small><br>\n";
    8689  menu_end();
    … …  
    128131$buttonLink = button_restrict_max ('rawExp.bg_stdev', $buttonLink);
    129132$buttonLink = button_restrict_string ('rawExp.comment', $buttonLink);
    130 
     133$buttonLink = button_restrict_string ('camProcessedExp.fwhm_major', $buttonLink);
     134$buttonLink = button_restrict_min ('camProcessedExp.fwhm_major', $buttonLink);
     135$buttonLink = button_restrict_max ('camProcessedExp.fwhm_major', $buttonLink);
    131136// set up the table
    132137echo "<table class=list>\n";
    … …  
    181186write_header_cell ("list", "stdev    ");
    182187write_header_cell ("list", "Date/Time");
     188write_header_cell ("list", "Cam FWHM_major");
    183189echo "</tr>\n";
    184190
    … …  
    193199write_query_row ('rawExp.bg_stdev', 5, 'min');
    194200write_query_row ('rawExp.dateobs', 19, 'min');
     201write_query_row ('camProcessedExp.fwhm_major', 5, 'min');
    195202echo "</tr><tr><td>&le;</td>\n";
    196203echo "<td> &nbsp; </td>\n";
    … …  
    201208write_query_row ('rawExp.bg_stdev', 5, 'max');
    202209write_query_row ('rawExp.dateobs', 19, 'max');
     210write_query_row ('camProcessedExp.fwhm_major', 5, 'max');
    203211echo "</tr>\n";
    204212
    … …  
    228236
    229237// query the database
    230 $sql = "SELECT rawExp.ra,rawExp.decl,rawExp.filter FROM camRun, chipRun, rawExp $WHERE";
     238$sql = "SELECT rawExp.ra,rawExp.decl,rawExp.filter FROM camProcessedExp, camRun, chipRun, rawExp $WHERE";
    231239
    232240$qry = $db->query($sql);

  • branches/czw_branch/20120906/ippMonitor/raw/site.php.in

    r34007 r34772  
    4747$REPL_DBNAME_ISP = "ippc17 (isp)";
    4848
     49$REPL_HOST_NEBULOUS_SECONDARY = "ippdb04.IfA.Hawaii.Edu";
     50$REPL_USER_NEBULOUS_SECONDARY = "ippMonitor";
     51$REPL_PASSWORD_NEBULOUS_SECONDARY = "ippMonitor";
     52$REPL_DBNAME_NEBULOUS_SECONDARY = "ippdb04 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";
     53
     54$REPL_HOST_NEBULOUS_TERNARY = "ippc63.IfA.Hawaii.Edu";
     55$REPL_USER_NEBULOUS_TERNARY = "ippMonitor";
     56$REPL_PASSWORD_NEBULOUS_TERNARY = "ippMonitor";
     57$REPL_DBNAME_NEBULOUS_TERNARY = "ippc63 (secondary nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays)";
    4958
    5059

  • branches/czw_branch/20120906/ippMonitor/scripts/skycellplot.dvo

    r34678 r34772  
    2727 1.1
    2828 0.3
    29  0.3
    30  0.3
    31  0.3
    32  0.3
    33  0.3
     29 0.3001
     30 0.3002
     31 0.3003
     32 0.3004
     33 0.3005
    3434end
    3535
Note: See TracChangeset for help on using the changeset viewer.