Index: trunk/ippTools/share/addtool_queue_cam_id.sql
===================================================================
--- trunk/ippTools/share/addtool_queue_cam_id.sql	(revision 25823)
+++ trunk/ippTools/share/addtool_queue_cam_id.sql	(revision 25835)
@@ -8,5 +8,7 @@
         '%s',           -- reduction
         '%s',           -- label
+        '%s',           -- data_group
         '%s',           -- dvodb 
+        '%s',           -- note
 	%d		-- image_only
     FROM camRun
Index: trunk/ippTools/share/camtool_queue_chip_id.sql
===================================================================
--- trunk/ippTools/share/camtool_queue_chip_id.sql	(revision 25823)
+++ trunk/ippTools/share/camtool_queue_chip_id.sql	(revision 25835)
@@ -9,4 +9,6 @@
         '%s',           -- workdir_state
         '%s',           -- label
+        '%s',           -- data_group
+        '%s',           -- dist_group
         '%s',           -- reduction
         '%s',           -- expgroup
@@ -14,5 +16,6 @@
         '%s',           -- tess_id
         '%s',           -- end_stage
-        0               -- magicked
+        0,              -- magicked
+        '%s'           -- note
     FROM chipRun
     WHERE
Index: trunk/ippTools/share/chiptool_completely_processed_exp.sql
===================================================================
--- trunk/ippTools/share/chiptool_completely_processed_exp.sql	(revision 25823)
+++ trunk/ippTools/share/chiptool_completely_processed_exp.sql	(revision 25835)
@@ -7,4 +7,6 @@
     workdir_state,
     label,
+    data_group,
+    dist_group,
     reduction,
     expgroup,
@@ -12,5 +14,6 @@
     tess_id,
     end_stage,
-    all_files_magicked as magicked
+    all_files_magicked as magicked,
+    note
 FROM
     (SELECT
Index: trunk/ippTools/share/disttool_definebyquery_camera.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_camera.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_camera.sql	(revision 25835)
@@ -4,5 +4,6 @@
     rawExp.exp_name as run_tag,
     camRun.magicked,
-    distTarget.label,
+    camRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -12,5 +13,5 @@
 JOIN distTarget ON distTarget.stage = 'camera'
     AND rawExp.filter = distTarget.filter
-    AND camRun.label  = distTarget.label
+    AND camRun.dist_group  = distTarget.dist_group
 JOIN rcInterest USING(target_id)
 LEFT JOIN distRun ON distRun.stage = 'camera' 
Index: trunk/ippTools/share/disttool_definebyquery_chip.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_chip.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_chip.sql	(revision 25835)
@@ -5,4 +5,5 @@
     rawExp.exp_name as run_tag,
     chipRun.label,
+    chipRun.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -10,5 +11,5 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'chip'
-    AND chipRun.label = distTarget.label 
+    AND chipRun.dist_group = distTarget.dist_group 
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_definebyquery_diff.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_diff.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_diff.sql	(revision 25835)
@@ -4,5 +4,6 @@
     diffRun.magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    diffRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -15,5 +16,5 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'diff'
-    AND diffRun.label = distTarget.label
+    AND diffRun.dist_group = distTarget.dist_group
     AND distTarget.filter = rawExp.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_definebyquery_fake.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_fake.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_fake.sql	(revision 25835)
@@ -4,5 +4,6 @@
     CAST(0 AS SIGNED) AS magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    fakeRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -11,5 +12,5 @@
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
-JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.label = distTarget.label
+JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.dist_group = distTarget.dist_group
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_definebyquery_raw.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_raw.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_raw.sql	(revision 25835)
@@ -4,10 +4,11 @@
     rawExp.exp_name AS run_tag,
     rawExp.magicked,
-    distTarget.label,
+    chipRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
 FROM rawExp
 JOIN chipRun USING(exp_id)
-JOIN distTarget ON distTarget.label = chipRun.label AND distTarget.stage = 'raw'
+JOIN distTarget ON distTarget.dist_group = chipRun.dist_group AND distTarget.stage = 'raw'
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_definebyquery_stack.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_stack.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_stack.sql	(revision 25835)
@@ -5,5 +5,6 @@
     -- run tag in the form 'stack.$skycell_id.$stack_id'
     CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
-    distTarget.label,
+    stackRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -11,5 +12,5 @@
 JOIN stackSumSkyfile USING(stack_id)
 JOIN distTarget ON distTarget.stage = 'stack'
-    AND stackRun.label = distTarget.label
+    AND stackRun.dist_group = distTarget.dist_group
     AND stackRun.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_definebyquery_warp.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_warp.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_definebyquery_warp.sql	(revision 25835)
@@ -4,5 +4,6 @@
     warpRun.magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    warpRun.label,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -13,5 +14,5 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'warp' 
-    AND warpRun.label = distTarget.label
+    AND warpRun.dist_group = distTarget.dist_group
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
Index: trunk/ippTools/share/disttool_defineinterest.sql
===================================================================
--- trunk/ippTools/share/disttool_defineinterest.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_defineinterest.sql	(revision 25835)
@@ -1,4 +1,4 @@
 INSERT INTO rcInterest
-    SELECT 0, dest_id, target_id, '@STATE@'
+    SELECT 0, rcDestination.dest_id, distTarget.target_id, '@STATE@'
     FROM distTarget
         JOIN rcDestination
Index: trunk/ippTools/share/disttool_pending_camera.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_camera.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_camera.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -16,4 +17,5 @@
     chipRun.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN camRun ON camRun.cam_id = distRun.stage_id
 JOIN camProcessedExp USING(cam_id)
Index: trunk/ippTools/share/disttool_pending_chip.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_chip.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_chip.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -16,4 +17,5 @@
     chipProcessedImfile.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN chipRun ON chipRun.chip_id = distRun.stage_id
 JOIN rawExp using(exp_id)
Index: trunk/ippTools/share/disttool_pending_diff.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_diff.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_diff.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -18,4 +19,5 @@
     diffSkyfile.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN diffRun ON stage_id = diff_id
 JOIN diffSkyfile using(diff_id)
Index: trunk/ippTools/share/disttool_pending_fake.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_fake.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_fake.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -16,4 +17,5 @@
     0
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN fakeRun ON fakeRun.fake_id = distRun.stage_id
 JOIN fakeProcessedImfile USING(fake_id)
Index: trunk/ippTools/share/disttool_pending_raw.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_raw.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_raw.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -16,4 +17,5 @@
     rawImfile.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN rawExp ON rawExp.exp_id = stage_id
 JOIN rawImfile USING(exp_id)
@@ -35,4 +37,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -49,4 +52,5 @@
     rawExp.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN rawExp ON exp_id = stage_id
 LEFT JOIN distComponent 
Index: trunk/ippTools/share/disttool_pending_stack.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_stack.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_stack.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -18,4 +19,5 @@
     0 AS magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN stackRun
     ON stage_id = stack_id
Index: trunk/ippTools/share/disttool_pending_warp.sql
===================================================================
--- trunk/ippTools/share/disttool_pending_warp.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pending_warp.sql	(revision 25835)
@@ -2,4 +2,5 @@
     distRun.dist_id,
     distRun.label,
+    distTarget.dist_group,
     stage,
     stage_id,
@@ -16,4 +17,5 @@
     warpSkyfile.magicked
 FROM distRun
+JOIN distTarget USING(target_id, stage)
 JOIN warpRun ON stage_id = warp_id
 JOIN warpSkyfile using(warp_id)
Index: trunk/ippTools/share/disttool_pendingfileset.sql
===================================================================
--- trunk/ippTools/share/disttool_pendingfileset.sql	(revision 25823)
+++ trunk/ippTools/share/disttool_pendingfileset.sql	(revision 25835)
@@ -4,5 +4,5 @@
     distRun.stage,
     stage_id,
-    distTarget.label,
+    distTarget.dist_group,
     distTarget.filter,
     CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,
Index: trunk/ippTools/share/faketool_completely_processed_exp.sql
===================================================================
--- trunk/ippTools/share/faketool_completely_processed_exp.sql	(revision 25823)
+++ trunk/ippTools/share/faketool_completely_processed_exp.sql	(revision 25835)
@@ -6,4 +6,6 @@
     workdir,
     label,
+    data_group,
+    dist_group,
     reduction,
     expgroup,
@@ -11,5 +13,6 @@
     tess_id,
     end_stage,
-    epoch
+    epoch,
+    note
 FROM
     (SELECT
Index: trunk/ippTools/share/faketool_queue_cam_id.sql
===================================================================
--- trunk/ippTools/share/faketool_queue_cam_id.sql	(revision 25823)
+++ trunk/ippTools/share/faketool_queue_cam_id.sql	(revision 25835)
@@ -6,4 +6,6 @@
         '%s',           -- workdir
         '%s',           -- label
+        '%s',           -- data_group
+        '%s',           -- dist_group
         '%s',           -- reduction
         '%s',           -- expgroup
@@ -11,5 +13,6 @@
         '%s',           -- tess_id
         '%s',           -- end_stage
-        NULL            -- epoch
+        NULL,           -- epoch
+        '%s'            -- note
     FROM camRun
     WHERE
Index: trunk/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 25823)
+++ trunk/ippTools/share/pxadmin_create_tables.sql	(revision 25835)
@@ -261,10 +261,13 @@
     workdir_state VARCHAR(64),
     label VARCHAR(64),
+    data_group VARCHAR(64),
+    dist_group VARCHAR(64),
     reduction VARCHAR(64),
-     expgroup VARCHAR(64),
+    expgroup VARCHAR(64),
     dvodb VARCHAR(255),
     tess_id VARCHAR(64),
     end_stage VARCHAR(64),
     magicked BIGINT,
+    note VARCHAR(255),
     PRIMARY KEY(chip_id),
     KEY(chip_id), KEY(exp_id),
@@ -272,4 +275,6 @@
     KEY(workdir_state),
     KEY(label),
+    KEY(data_group),
+    KEY(dist_group),
     KEY(expgroup),
     KEY(end_stage),
@@ -367,4 +372,6 @@
     workdir_state VARCHAR(64),
     label VARCHAR(64),
+    data_group VARCHAR(64),
+    dist_group VARCHAR(64),
     reduction VARCHAR(64),
     expgroup VARCHAR(64),
@@ -373,4 +380,5 @@
     end_stage VARCHAR(64),
     magicked BIGINT,
+    note VARCHAR(255),
     PRIMARY KEY(cam_id),
     KEY(cam_id),
@@ -379,4 +387,6 @@
     KEY(workdir_state),
     KEY(label),
+    KEY(data_group),
+    KEY(dist_group),
     KEY(expgroup),
     KEY(end_stage),
@@ -466,5 +476,7 @@
     reduction VARCHAR(64),
     label VARCHAR(64),
+    data_group VARCHAR(64),
     dvodb VARCHAR(255),
+    note  VARCHAR(255),
     image_only TINYINT,
     PRIMARY KEY(add_id),
@@ -474,4 +486,5 @@
     KEY(workdir_state),
     KEY(label),
+    KEY(data_group),
     INDEX(add_id, cam_id),
     FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
@@ -498,4 +511,6 @@
     workdir VARCHAR(255),
     label VARCHAR(64),
+    data_group VARCHAR(64),
+    dist_group VARCHAR(64),
     reduction VARCHAR(64),
     expgroup VARCHAR(64),
@@ -504,8 +519,11 @@
     end_stage VARCHAR(64),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    note VARCHAR(255),
     PRIMARY KEY(fake_id),
     KEY(cam_id),
     KEY(state),
     KEY(label),
+    KEY(data_group),
+    KEY(dist_group),
     KEY(expgroup),
     KEY(end_stage),
@@ -834,4 +852,6 @@
     workdir_state VARCHAR(64),
     label VARCHAR(64),
+    data_group VARCHAR(64),
+    dist_group VARCHAR(64),
     dvodb VARCHAR(255),
     tess_id VARCHAR(64),
@@ -840,4 +860,5 @@
     registered DATETIME,
     magicked BIGINT,
+    note VARCHAR(255),
     PRIMARY KEY(warp_id),
     KEY(warp_id),
@@ -847,4 +868,6 @@
     KEY(workdir_state),
     KEY(label),
+    KEY(data_group),
+    KEY(dist_group),
     KEY(end_stage),
     INDEX(warp_id, fake_id),
@@ -910,4 +933,6 @@
         workdir VARCHAR(255),
         label VARCHAR(64),
+        data_group VARCHAR(64),
+        dist_group VARCHAR(64),
         reduction VARCHAR(64),
         dvodb VARCHAR(255),
@@ -916,4 +941,5 @@
         tess_id VARCHAR(64),
         filter VARCHAR(64),
+        note VARCHAR(255),
         PRIMARY KEY(stack_id),
         KEY(stack_id),
@@ -921,5 +947,7 @@
         KEY(skycell_id),
         KEY(tess_id),
-        KEY(label)
+        KEY(label),
+        KEY(data_group),
+        KEY(dist_group)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -973,4 +1001,6 @@
         workdir VARCHAR(255),
         label VARCHAR(64),
+        data_group VARCHAR(64),
+        dist_group VARCHAR(64),
         reduction VARCHAR(64),
         dvodb VARCHAR(255),
@@ -980,9 +1010,12 @@
         exposure TINYINT DEFAULT 0,
         magicked BIGINT,
+        note VARCHAR(255),
         PRIMARY KEY(diff_id),
         KEY(diff_id),
         KEY(state),
         KEY(tess_id),
-        KEY(label)
+        KEY(label),
+        KEY(data_group),
+        KEY(dist_group)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1055,7 +1088,9 @@
         workdir_state VARCHAR(255),
         label VARCHAR(64),
+        data_group VARCHAR(64),
         dvodb VARCHAR(255),
         registered DATETIME,
         fault SMALLINT,
+        note VARCHAR(255),
         PRIMARY KEY(magic_id),
         KEY(magic_id),
@@ -1063,4 +1098,5 @@
         KEY(workdir_state),
         KEY(label),
+        KEY(data_group),
         KEY(fault),
         FOREIGN KEY(exp_id)  REFERENCES rawExp(exp_id),
@@ -1118,8 +1154,11 @@
         cam_id BIGINT,
         label VARCHAR(64),
+        data_group VARCHAR(64),
         outroot VARCHAR(255),
         recoveryroot VARCHAR(255),
         re_place TINYINT,
         remove TINYINT,
+        fault SMALLINT,
+        note VARCHAR(255),
         PRIMARY KEY(magic_ds_id),
         KEY(magic_ds_id),
@@ -1127,4 +1166,5 @@
         KEY(magic_id),
         KEY(label),
+        KEY(fault),
         FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
         FOREIGN KEY(inv_magic_id) REFERENCES magicRun(magic_id)
@@ -1303,4 +1343,5 @@
     time_stamp  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     fault       SMALLINT,
+    note        VARCHAR(255),
     PRIMARY KEY(dist_id),
     KEY(state),