Changeset 28684

Timestamp:

Jul 16, 2010, 1:39:21 PM (16 years ago)

Author:

Serge CHASTEL

Message:

WarpStageExp reverted to previous definition

File:

• trunk/ippMonitor/def/warpStageExp.d (modified) (4 diffs)

trunk/ippMonitor/def/warpStageExp.d

@@ -1 @@
-TABLE warpRun, fakeRun, camRun, chipRun, rawExp, warpSummary
+TABLE warpRun, fakeRun, camRun, chipRun, rawExp
 TITLE Warp Stage Exposures
 FILE  warpStageExp.php
 MENU  ipp.science.dat
 
-#
-# Images pathnames are extracted from warpSummary
-# using ipp_filename.pl with basename:
-#   $warpSummary.path_base . $warpSummary.projection_cell
-# . is the string concatenation operator
-#
 WHERE warpRun.fake_id = fakeRun.fake_id
 WHERE fakeRun.cam_id = camRun.cam_id
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
-WHERE warpSummary.warp_id = warpRun.warp_id
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id
@@ -24 +17 @@
 OP   OP1  $rawExp.ra * 57.295783
 OP   OP2  $rawExp.decl * 57.295783
-OP   OP3  $warpSummary.path_base . $warpSummary.projection_cell
-
-# define image names to be used below
-# IMAGE VAR basename filerule camera class_id
-# ARGS  ARG6 warpRun.warp_id=$warpRun.warp_id
-# ARGS  ARG6 warpSummary.skycell_id=$warpSummary.skycell_id
-# ARGS  ARG6 camera=$rawExp.camera
-# ARGS  ARG6 basename=$warpSkyfile.path_base
-IMAGE JPEG3 OP3 PPSKYCELL.JPEG2 $rawExp.camera NONE
-ARGS ARG7 name=$warpSummary.path_base.$warpSummary.projection_cell
-ARGS ARG7 rule=PPSKYCELL.JPEG1
-ARGS ARG7 camera=GPC1
-ARGS ARG7 class_id=NONE
-
 
 #     field                   size  format  name         show    link to         extras
@@ -46 +25 @@
 FIELD fakeRun.fake_id,           7, %d,     Fake ID,      value,  fakeProcessedImfile.php, ARG4
 FIELD warpRun.warp_id,           7, %d,     Warp ID,      value,  warpStageExp.php,        ARG5
-FIELD *,                         8, %s,     image,        image=JPEG3, getimage.php,  ARG7
 FIELD warpRun.state,             7, %s,     state
 FIELD warpRun.label,             7, %s,     label
@@ -64 +42 @@
 FIELD rawExp.comment,           65, %s,     Comment
 
-FIELD warpSummary.path_base,      5, %s,     path_base,   none
-FIELD warpSummary.projection_cell,      5, %s,     projection_cell,   none
-
 # FIELD rawExp.bg_mean_stdev,    5, %7.2f,  <backgnd>
 # FIELD chipPendingExp.reduction,    20,   reduction