Context Navigation

← Previous Change
Next Change →

ippMonitor

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

: 20 edited

. (modified) (1 prop)
ippMonitor/czartool/czartool/Plotter.pm (modified) (2 diffs, 1 prop)
ippMonitor/czartool/czartool/czarconfig.xml (modified) (2 diffs)
ippMonitor/def/camIQstats.d (modified) (1 diff)
ippMonitor/def/camProcessedExp.d (modified) (1 diff)
ippMonitor/def/camProcessedExp_Images.d (modified) (2 diffs)
ippMonitor/def/camProcessedExp_NoImages.d (modified) (1 diff)
ippMonitor/def/camProcessedImfile.d (modified) (1 diff)
ippMonitor/def/camStageExp.d (modified) (1 diff)
ippMonitor/def/chipIQstats.d (modified) (1 diff)
ippMonitor/def/chipProcessedExp.d (modified) (1 diff)
ippMonitor/def/chipProcessedImfile.d (modified) (1 diff)
ippMonitor/def/chipStageExp.d (modified) (1 diff)
ippMonitor/def/diffInputSkyfile.d (modified) (1 diff)
ippMonitor/def/diffProcessedSkyfile.d (modified) (1 diff)
ippMonitor/def/diffProcessedSkyfile_Images.d (modified) (1 diff)
ippMonitor/def/diffRun.d (modified) (1 diff)
ippMonitor/def/rawBurntoolState.d (modified) (1 diff)
ippMonitor/def/warpProcessedSkyfiles.d (modified) (1 diff)
ippMonitor/def/warpProcessedSkyfiles_Images.d (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ps2-tc3-20130727

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140423 (added)	merged: 36693-36694,36737-36741,36745-36746,36748-36750,36764-36770,36790-36798,36800,36803-36809,36813-36814,36816-36820,36823-36832
/branches/eam_branches/ipp-20140610 (added)	merged: 36845,36884-36885,36898-36912,36916-36923,36925,36928,36932-36947,36974-36980,36982-36999,37001-37012,37014,37017-37029
/branches/eam_branches/ipp-20140717 (added)	merged: 37083-37086,37089-37093,37097-37101,37107-37113,37115,37127-37129,37132-37138,37156-37163,37166-37186,37189-37192,37197-37201,37204-37244
/branches/eam_branches/ipp-20140813 (added)	merged: 37260,37305-37310,37344,37348,37350-37351,37353
/branches/eam_branches/ipp-ops-20130712 (added)	merged: 37064-37069
/tags/ipp-20130712 (added)	merged: 35815,35819,35822-35825,35832,35834-35835,35840,35847,35851,35855,35857-35858,35863,35866,35879-35880,35885-35886,35891,35898,35905,35907-35910,35912-35915,35922-35923,35930,35933-35935,35940-35941,35949,35954,35959,35965,35974,35978,36016,36020,36034,36038-36039,36049,36052,36056,36109-36110,36112,36122,36125,36127,36129,36134,36136,36138-36141,36171-36172,36179,36181,36184,36224,36265,36288,36359,36376-36381,36402,36405,36414,36432,36451,36458,36460,36464,36475,36496,36499,36502,36573,36592-36593,36604,36606,36636-36637,36646,36648,36652,36654,36656,36667,36672,36686,36689-36690,36692,36703,36705,36751,36774-36778,36780,36782-36783,36822,36842,36881,36915,36971,37058-37063
/trunk	merged: 36681,36683-36685,36687-36688,36691,36695,36697-36702,36704,36706-36732,36734-36736,36744,36747,36752-36763,36771-36773,36779,36781,36784-36789,36799,36801-36802,36810-36812,36815,36821,36833-36841,36844,36846-36871,36874,36879,36882,36886,36888,36890,36892,36894,36896-36897,36913-36914,36924,36948,36950-36951,36953,36955,36957,36959,36961,36963,36966,36968,36970,36972,36981,37000,37013,37015-37016,37030-37056,37070-37071,37073,37075-37081,37087,37094-37096,37102,37104,37106,37114,37116-37118,37120,37122-37123,37125,37130-37131,37139,37142-37143,37145,37148,37151-37152,37154,37164-37165,37187,37193,37195,37202,37245-37254,37256,37259,37261,37274,37279,37290,37311-37313,37315,37318-37319,37321,37325-37327,37334,37354-37362,37364-37365,37368-37369,37375,37381,37384-37385
/branches/eam_branches/ipp-20140206	removed
/branches/eam_branches/ipp-20140214	removed
/branches/eam_branches/ipp-20140226	removed
/branches/eam_branches/ipp-20140402	removed
/tags/ipp-20140114	removed

branches/eam_branches/ps2-tc3-20130727/ippMonitor/czartool/czartool/Plotter.pm

Property svn:mergeinfo set to (toggle deleted branches)

/branches/czw_branch/20120906/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20110710/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20110906/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20111110/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20120405/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20120601/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20120627/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20120805/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20120905/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20121130/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20121219/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20130207/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20130307/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20130419/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20130509/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20140214/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20140423/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20140610/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20140717/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-20140813/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/eam_branches/ipp-ops-20130712/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/haf_add201112/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/tags/ipp-20130712/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/tags/ipp-20140114/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/trunk/ippMonitor/czartool/czartool/Plotter.pm	merged	eligible
/branches/czw_branch/20101203/ippMonitor/czartool/czartool/Plotter.pm	29907-30631
/branches/eam_branches/ipp-20101103/ippMonitor/czartool/czartool/Plotter.pm	29657-29920
/branches/eam_branches/ipp-20101205/ippMonitor/czartool/czartool/Plotter.pm	29959-30585
/branches/eam_branches/ipp-20110213/ippMonitor/czartool/czartool/Plotter.pm	30628-31149
/branches/eam_branches/ipp-20110404/ippMonitor/czartool/czartool/Plotter.pm	31166-31444
/branches/eam_branches/ipp-20110505/ippMonitor/czartool/czartool/Plotter.pm	31458-31658
/branches/sc_branches/ippMonitorLap/czartool/czartool/Plotter.pm	31685-31815

-              r35742
+              r37403
         "set ylabel \"Space (TB)\";" .
         "set xtic rotate by -90 scale 0;" .
+        "set yrange [:100];" .
         "plot '".$tmpFile->filename."' " .
         "using 2:xtic(1) t \"Used\" lt 7," .
 …
         "set style data histograms;" .
         "set ylabel \"Space (TB)\";" .
+        "set yrange [:100];" .
         "set xtic rotate by -90 scale 0;" .
         "plot '".$tmpFile->filename."' " .

branches/eam_branches/ps2-tc3-20130727/ippMonitor/czartool/czartool/czarconfig.xml

-              r35742
+              r37403
   <gpc1database>
     <name>gpc1</name>
     <host>scidbm</host>
+    <host>scidbs1</host>
     <user>ippuser</user>
     <password>ippuser</password>
 …
     <serverinterval>20 MINUTE</serverinterval>
     <!-- whitespace-separated server list for servers we want roboczar to check -->
     <interestedservers>stdscience distribution summitcopy registration stack publishing pstamp </interestedservers>
+    <interestedservers>stdscience distribution summitcopy registration stack pstamp </interestedservers>
     <!-- <interestedservers>pstamp</interestedservers> -->
   </roboczar>

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camIQstats.d

-              r27892
+              r37403
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camProcessedExp.d

-              r27892
+              r37403
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 # define the arguments supplied to the links below (if any)

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camProcessedExp_Images.d

-              r34011
+              r37403
 FILE  camProcessedExp_Images.php
 MENU  ipp.science.dat
-UNRESTRICTED AND 0>1
 # the following WHERE clauses are added to all queries joined by AND
 …
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 # define image names to be used below
 # IMAGE VAR basename filerule camera class_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camProcessedExp_NoImages.d

-              r27892
+              r37403
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 # define the arguments supplied to the links below (if any)

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camProcessedImfile.d

-              r27892
+              r37403
 WHERE camProcessedExp.cam_id = camRun.cam_id
 WHERE chipProcessedImfile.chip_id = camRun.chip_id
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/camStageExp.d

-              r27892
+              r37403
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/chipIQstats.d

-              r27892
+              r37403
 WHERE chipRun.exp_id = rawExp.exp_id
 WHERE chipRun.chip_id = chipProcessedImfile.chip_id
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/chipProcessedExp.d

-              r27892
+              r37403
 WHERE chipRun.state != 'new'
 WHERE chipRun.exp_id = rawExp.exp_id
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/chipProcessedImfile.d

-              r32539
+              r37403
 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
 WHERE chipProcessedImfile.fault = 0
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 #UNRESTRICTED WHERE 0=1

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/chipStageExp.d

-              r27892
+              r37403
 WHERE chipRun.exp_id = rawExp.exp_id
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/diffInputSkyfile.d

-              r27892
+              r37403
 WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+RESTRICT_COUNT AND 0 = 1
+UNRESTRICTED AND 0 = 1
 #        field                            size format  name           show     link to         extras

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/diffProcessedSkyfile.d

-              r27892
+              r37403
 # WHERE diffRun.state = 'full'
 # WHERE diffSkyfile.fault = 0
+RESTRICT_COUNT AND 0 = 1
+UNRESTRICTED AND 0 = 1
 ARGS  ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/diffProcessedSkyfile_Images.d

-              r35660
+              r37403
 FILE  diffProcessedSkyfile_Images.php
 MENU  ipp.stack.dat
+#RESTRICT_COUNT AND dateobs >= CURDATE()
+#UNRESTRICTED AND dateobs >= CURDATE()
 UNRESTRICTED AND 0>1

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/diffRun.d

-              r27892
+              r37403
 FILE  diffRun.php
 MENU  ipp.stack.dat
+#RESTRICT_COUNT WHERE dateobs >= CURDATE()
+#UNRESTRICTED WHERE dateobs >= CURDATE()
 #        field        size  format  name           show     link to         extras

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/rawBurntoolState.d

-              r34014
+              r37403
 # if no query restrictions are supplied, we want to limit the query or it is extremely long running:
+RESTRICT_COUNT WHERE 0>1
+UNRESTRICTED WHERE exp_id = 0
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+# UNRESTRICTED WHERE exp_id = 0
+UNRESTRICTED WHERE dateobs >= CURDATE()
 #        field        size format  name           show          link to   extras

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/warpProcessedSkyfiles.d

-              r32368
+              r37403
 MENU  ipp.science.dat
+UNRESTRICTED WHERE 0=1
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+UNRESTRICTED WHERE dateobs >= CURDATE()
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ps2-tc3-20130727/ippMonitor/def/warpProcessedSkyfiles_Images.d

-              r33847
+              r37403
 MENU  ipp.science.dat
+UNRESTRICTED WHERE 0=1
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+UNRESTRICTED WHERE dateobs >= CURDATE()
+# UNRESTRICTED WHERE 0=1
 # WHERE warpSkyfile.warp_id = warpRun.warp_id

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippMonitor

Legend:

Download in other formats: