Changeset 30382

Timestamp:

Jan 26, 2011, 4:04:02 PM (15 years ago)

Author:

rhenders

Message:

changes function and variable names for clarity

File:

• trunk/ippMonitor/raw/czartool_exposures.php (modified) (8 diffs)

trunk/ippMonitor/raw/czartool_exposures.php

@@ -64 +64 @@
 
     $chipDist = array(); getChipDist($db, $date, $surveyStr, &$chipDist);
-    $dist2_hash = array(); getCamDist($db, $date, $surveyStr, &$dist2_hash);
-    $dist3_hash = array(); getWarpDist($db, $date, $surveyStr, &$dist3_hash);
-    $dist4_hash = array(); getStackDist($db, $date, $surveyStr, &$dist4_hash);
+    $camDist = array(); getCamDist($db, $date, $surveyStr, &$camDist);
+    $warpDist = array(); getWarpDist($db, $date, $surveyStr, &$warpDist);
+    $stackDist = array(); getStackDist($db, $date, $surveyStr, &$stackDist);
     $stack_hash = array(); getStackProduced($db, $date, $surveyStr, &$stack_hash);
 
@@ -75 +75 @@
     $wsDiffDist = array();
     $ww1DiffDist = array();
-    getDist5($db, $date, $surveyStr, &$wsDiffDist, &$ww1DiffDist, $wsDiffProduced);
-
-    $ww2DiffDist = array(); getDist6($db, $date, $surveyStr, &$ww2DiffDist);
-    $ssDiffDist = array(); getDist7($db, $date, $surveyStr, &$ssDiffDist);
-
-    $ww2DiffProduced = array(); getDiff2($db, $date, $surveyStr, &$ww2DiffProduced);
-    $ssDiffProduced = array(); gets1d($db, $date, $surveyStr, &$ssDiffProduced); 
+    getWSAndWW1DiffDist($db, $date, $surveyStr, &$wsDiffDist, &$ww1DiffDist, $wsDiffProduced);
+
+    $ww2DiffDist = array(); getWW2DiffDist($db, $date, $surveyStr, &$ww2DiffDist);
+    $ssDiffDist = array(); getSSDiffDist($db, $date, $surveyStr, &$ssDiffDist);
+
+    $ww2DiffProduced = array(); getWW2DiffProduced($db, $date, $surveyStr, &$ww2DiffProduced);
+    $ssDiffProduced = array(); getSSDiffProduced($db, $date, $surveyStr, &$ssDiffProduced); 
 
     $class = "list";
@@ -152 +152 @@
 
         // cam
-        if (!$dist2_hash[$exp_id]) $camDistStr = "N";
-        else $camDistStr = $dist2_hash[$exp_id];
+        if (!$camDist[$exp_id]) $camDistStr = "N";
+        else $camDistStr = $camDist[$exp_id];
 
         // warp
-        if (!$dist3_hash[$exp_id]) $warpDistStr = "N";
-        else $warpDistStr = $dist3_hash[$exp_id];
+        if (!$warpDist[$exp_id]) $warpDistStr = "N";
+        else $warpDistStr = $warpDist[$exp_id];
 
         // stack
-        if (!$stack_hash[$exp_id] && !$dist4_hash[$exp_id]) $stackDistStr = "";
-        else $stackDistStr = $stack_hash[$exp_id] . "/" . $dist4_hash[$exp_id];
+        if (!$stack_hash[$exp_id] && !$stackDist[$exp_id]) $stackDistStr = "";
+        else $stackDistStr = $stack_hash[$exp_id] . "/" . $stackDist[$exp_id];
 
         // WS diff
@@ -353 +353 @@
 ###########################################################################
 #
-# Gets count of TODO distributed
-#
-###########################################################################
-function getDist5($db, $date, $surveyStr, $hash1, $hash2, $wsDiffProduced) {
+# Gets count of WS and WW1 diffs distributed
+#
+###########################################################################
+function getWSAndWW1DiffDist($db, $date, $surveyStr, $hash1, $hash2, $wsDiffProduced) {
 
     $sql = "
@@ -387 +387 @@
 ###########################################################################
 #
-# Gets count of TODO distributed
-#
-###########################################################################
-function getDist6($db, $date, $surveyStr, $hash) {
+# Gets count of WW2 diffs distributed
+#
+###########################################################################
+function getWW2DiffDist($db, $date, $surveyStr, $hash) {
 
     $sql = "
@@ -417 +417 @@
 ###########################################################################
 #
-# Gets count of TODO distributed
-#
-###########################################################################
-function getDist7($db, $date, $surveyStr, $hash) {
+# Gets count of SS diffs distributed
+#
+###########################################################################
+function getSSDiffDist($db, $date, $surveyStr, $hash) {
 
     $sql = "
@@ -448 +448 @@
 ###########################################################################
 #
-# Gets count of TODO distributed
-#
-###########################################################################
-function getDiff2($db, $date, $surveyStr, $hash) {
+# Gets count of WW2 diffs produced
+#
+###########################################################################
+function getWW2DiffProduced($db, $date, $surveyStr, $hash) {
 
     $sql = "
@@ -478 +478 @@
 ###########################################################################
 #
-# Gets count of TODO distributed
-#
-###########################################################################
-function gets1d($db, $date, $surveyStr, $hash) {
+# Gets count of SS diffs produced
+#
+###########################################################################
+function getSSDiffProduced($db, $date, $surveyStr, $hash) {
 
     $sql = "