Changeset 25027 for branches/pap/ippMonitor/def/camProcessedExp.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/camProcessedExp.d (modified) (2 diffs)

branches/pap/ippMonitor/def/camProcessedExp.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
-
-# define image names to be used below
-# IMAGE VAR basename filerule camera class_id
-IMAGE JPEG2 $camProcessedExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE
 
 # define the arguments supplied to the links below (if any)
@@ -32 +28 @@
 FIELD chipRun.chip_id,                   5,   %s,     Chip ID,      value,       chipProcessedImfile.php, ARG2
 FIELD camRun.cam_id,                     5,   %s,     Cam ID,       value,       camProcessedExp.php,     ARG3
+FIELD camRun.state,                      5,   %s,     state,        value,       camProcessedImfile.php,  ARG4
 FIELD camRun.label,                      5,   %s,     Label
-FIELD *,                                 8,   %s,     image,        image=JPEG2, camProcessedImfile.php,  ARG4
 FIELD rawExp.telescope,                 10,   %s,     Telescope
 FIELD rawExp.camera,                    10,   %s,     Camera
 FIELD rawExp.dateobs,                   19,   %T,     Date/Time
-FIELD rawExp.ra,                         8,   %10.6f, RA,           op=OP1      
-FIELD rawExp.decl,                       8,   %10.6f, DEC,          op=OP2
+FIELD rawExp.ra,                         8,   %C, RA,           op=OP1      
+FIELD rawExp.decl,                       8,   %C, DEC,          op=OP2
 FIELD rawExp.object,                    10,   %s,     Object
 FIELD rawExp.filter,                    10,   %s,     FILTER