Changeset 25027 for branches/pap/ippMonitor/def/detStackedImfile.d

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippMonitor/def/detStackedImfile.d (modified) (2 diffs)

branches/pap/ippMonitor/def/detStackedImfile.d

@@ -7 +7 @@
 
 # XXX change uri to path_base in db
-ARGS  ARG1 detStackedImfile.det_id=$det_id
-ARGS  ARG1 detStackedImfile.iteration=$iteration
+ARGS  ARG1 detStackedImfile.det_id=$detStackedImfile.det_id
+ARGS  ARG1 detStackedImfile.iteration=$detStackedImfile.iteration
+ARGS  ARG1 detStackedImfile.class_id=$detStackedImfile.class_id
 ARGS  ARG1 camera=$detRun.camera
 ARGS  ARG1 basename=$detStackedImfile.uri
+ARGS  ARG1 class=$detStackedImfile.class_id
 
-#     field         size  format  name      show  link to     extras
+#     field                         size  format  name        show  link to     extras
 FIELD detStackedImfile.det_id,         7,  %s,    det_id
-FIELD detStackedImfile.iteration,      5,  %s,    iteration
+FIELD detStackedImfile.iteration,      5,  %s,    iter
 FIELD detStackedImfile.class_id,       8,  %s,    class_id,   value, detStackedImfile.php, ARG1
 FIELD detStackedImfile.fault,          5,  %d,    fault
@@ -20 +22 @@
 FIELD detStackedImfile.bg_stdev,       8,  %f,    stdev
 FIELD detStackedImfile.bg_mean_stdev,  8,  %f,    [stdev]
-FIELD detStackedImfile.uri,           20,  %s,    uri
-# FIELD recipe, 20,   recipe
+FIELD detStackedImfile.uri,           10,  %s,    uri
+FIELD detRun.camera,                  10, %s,     camera, none
 
 TD_CLASS list_off $fault > 0
 
-TAIL PHP insert_log ('LOG.EXP');
+TAIL PHP insert_log ('LOG.IMFILE');