Changeset 18340 for trunk/ippMonitor/def

Timestamp:

Jun 27, 2008, 10:23:19 AM (18 years ago)

Author:

eugene

Message:

cleaning up various science stages

Location:

trunk/ippMonitor/def

Files:

• camProcessedExp_failure.d (modified) (3 diffs)
• camStageExp.d (added)
• chipPendingExp.d (modified) (1 diff)
• chipPendingImfile.d (modified) (1 diff)
• chipProcessedImfile.d (modified) (1 diff)
• chipProcessedImfile_failure.d (modified) (2 diffs)
• chipStageExp.d (added)
• rawScienceExp.d (modified) (1 diff)

trunk/ippMonitor/def/camProcessedExp_failure.d

@@ -1 +1 @@
 TABLE camRun, camProcessedExp, chipRun, rawExp
 TITLE Camera Processed (No Images)
-FILE  camProcessedExp_NoImages.php
+FILE  camProcessedExp_failure.php
 MENU  ipp.science.dat
 
@@ -26 +26 @@
 OP   OP2  $rawExp.decl * 57.295783
 
-#     field                             size  format  name          show         link to                  extras
-FIELD chipRun.exp_id,                    5,   %d,     Exp ID,       value,       chipProcessedImfile.php, ARG1
-FIELD rawExp.exp_name,                   5,   %s,     Exp Name,     value,       rawImfile.php,  ARG1
-FIELD chipRun.chip_id,                   5,   %d,     chip ID
-FIELD camRun.cam_id,                     5,   %d,     cam ID,       value,       chipProcessedExp.php,    ARG1
+#     field                             size  format  name          show         link to                      extras
+FIELD chipRun.exp_id,                    5,   %d,     Exp ID,       value,       chipProcessedImfile.php,     ARG1
+FIELD rawExp.exp_name,                   5,   %s,     Exp Name,     value,       rawImfile.php,               ARG1
+FIELD chipRun.chip_id,                   5,   %d,     chip ID,      value,       chipProcessedExp.php,        ARG1
+FIELD camRun.cam_id,                     5,   %d,     cam ID,       value,       camProcessedExp_failure.php, ARG2
 FIELD rawExp.telescope,                 10,   %s,     Telescope
 FIELD rawExp.camera,                    10,   %s,     Camera
@@ -50 +50 @@
 FIELD camProcessedExp.path_base,         5,   %s,     path_base,    none
 FIELD rawExp.exp_id,                     5,   %s,     Exp ID,       none
+
+TAIL PHP insert_log ('LOG.IMFILE');

trunk/ippMonitor/def/chipPendingExp.d

@@ -28 +28 @@
 FIELD rawExp.bg,                 5, %.2f,   backgnd
 FIELD rawExp.bg_stdev,           5, %.2f,   stdev    
-FIELD rawExp.comment,            5, %s,     CMMTOBS
+FIELD rawExp.comment,           65, %s,     Comment
 
 # FIELD rawExp.bg_mean_stdev,    5, %7.2f,  <backgnd>

trunk/ippMonitor/def/chipPendingImfile.d

@@ -1 @@
-TABLE chipPendingImfile
-TITLE chipPendingImfile
-FILE  chipPendingImfile.php
-MENU  ipp.imfiles.dat
+TABLE chipRun, rawExp
+TITLE Chip Pending Imfiles
+FILE  chipPendingExp.php
+MENU  ipp.science.dat
 
-#     field          size  format  name           show   link to     extras
-FIELD exp_id,         5,   %s,     Exp ID
-FIELD class_id,       5,   %s,     Class ID
-FIELD uri,            5,   %s,     URI
-FIELD recipe,         5,   %s,     recipe
-FIELD guide_version,  5,   %s,     guide version
-FIELD chip_version,   5,   %s,     chip version
+# limit this table to non-OBJECT types of images
+WHERE chipRun.state = 'run'
+WHERE chipRun.exp_id = rawExp.exp_id
+
+ARGS  ARG1  exp_id=$chipRun.exp_id
+
+OP   OP1  $rawExp.ra * 57.295783
+OP   OP2  $rawExp.decl * 57.295783
+
+#     field                   size  format  name         show    link to         extras
+FIELD chipRun.exp_id,            5, %d,     Exp ID
+FIELD rawExp.exp_name,           5, %s,     Exp Name,    value,  rawImfile.php,  ARG1
+FIELD chipRun.chip_id,           7, %d,     chip ID
+FIELD chipRun.state,             7, %s,     state
+FIELD rawExp.telescope,         10, %s,     Telescope
+FIELD rawExp.camera,            10, %s,     Camera
+FIELD rawExp.dateobs,           19, %T,     Date/Time
+FIELD rawExp.ra,                 5, %10.6f, RA,          op=OP1    
+FIELD rawExp.decl,               5, %10.6f, DEC,         op=OP2
+FIELD rawExp.object,             8, %s,     Object
+FIELD rawExp.filter,            10, %s,     FILTER
+FIELD rawExp.exp_time,           5, %.2f,   exp_time    
+FIELD rawExp.airmass,            5, %.4f,   airmass     
+FIELD rawExp.bg,                 5, %.2f,   backgnd
+FIELD rawExp.bg_stdev,           5, %.2f,   stdev    
+FIELD rawExp.comment,           65, %s,     Comment

trunk/ippMonitor/def/chipProcessedImfile.d

@@ -24 +24 @@
 FIELD rawExp.exp_name,                    5, %s,     Exp Name,    value,  chipProcessedImfile.php, ARG2
 FIELD chipProcessedImfile.class_id,       5, %s,     Class ID
-FIELD chipRun.chip_id,                    7, %d,     chip ID
+FIELD chipRun.chip_id,                    7, %s,     chip ID
 FIELD rawExp.telescope,                  10, %s,     Telescope
 FIELD rawExp.camera,                     10, %s,     Camera

trunk/ippMonitor/def/chipProcessedImfile_failure.d

@@ -13 +13 @@
 
 ARGS  ARG2 chipRun.chip_id=$chipRun.chip_id
+ARGS  ARG2 chipProcessedImfile.class_id=$chipProcessedImfile.class_id
 ARGS  ARG2 camera=$rawExp.camera
 ARGS  ARG2 basename=$chipProcessedImfile.path_base
@@ -22 +23 @@
 #     field                            size  format  name         show    link to                  extras
 FIELD chipRun.exp_id,                     5, %d,     Exp ID,      value,  rawImfile.php,           ARG1
-FIELD rawExp.exp_name,                    5, %s,     Exp Name,    value,  chipProcessedImfile.php, ARG2
+FIELD rawExp.exp_name,                    5, %s,     Exp Name,    value,  chipProcessedImfile_failure.php, ARG2
 FIELD chipProcessedImfile.class_id,       5, %s,     Class ID
 FIELD chipRun.chip_id,                    7, %d,     chip ID

trunk/ippMonitor/def/rawScienceExp.d

@@ -29 +29 @@
 FIELD    bg_stdev,     8,  %.2f,   stdev
 FIELD    bg_mean_stdev, 8, %.2f,   [stdev]
+FIELD    comment,      65,  %s,     Comment