Context Navigation

← Previous Change
Next Change →

share

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

: 10 edited
: 5 copied

. (modified) (1 prop)
ippTools/share/Makefile.am (modified) (3 diffs)
ippTools/share/camtool_find_processedexp.sql (modified) (1 diff)
ippTools/share/laptool_exposures.sql (modified) (4 diffs)
ippTools/share/laptool_revertsass.sql (copied) (copied from trunk/ippTools/share/laptool_revertsass.sql )
ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
ippTools/share/releasetool_definerelexp.sql (modified) (1 diff)
ippTools/share/releasetool_deleterelexp.sql (copied) (copied from trunk/ippTools/share/releasetool_deleterelexp.sql )
ippTools/share/releasetool_deleterelstack.sql (copied) (copied from trunk/ippTools/share/releasetool_deleterelstack.sql )
ippTools/share/releasetool_setrelstackcalibratedfromskycal.sql (copied) (copied from trunk/ippTools/share/releasetool_setrelstackcalibratedfromskycal.sql )
ippTools/share/remotetool_definebyquery_cam.sql (modified) (1 diff)
ippTools/share/remotetool_definebyquery_chip.sql (modified) (1 diff)
ippTools/share/remotetool_definebyquery_stack.sql (modified) (1 diff)
ippTools/share/remotetool_definebyquery_warp.sql (modified) (1 diff)
ippTools/share/remotetool_dropcomponent.sql (copied) (copied from trunk/ippTools/share/remotetool_dropcomponent.sql )

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ps2-tc3-20130727

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140423 (added)	merged: 36693-36694,36737-36741,36745-36746,36748-36750,36764-36770,36790-36798,36800,36803-36809,36813-36814,36816-36820,36823-36832
/branches/eam_branches/ipp-20140610 (added)	merged: 36845,36884-36885,36898-36912,36916-36923,36925,36928,36932-36947,36974-36980,36982-36999,37001-37012,37014,37017-37029
/branches/eam_branches/ipp-20140717 (added)	merged: 37083-37086,37089-37093,37097-37101,37107-37113,37115,37127-37129,37132-37138,37156-37163,37166-37186,37189-37192,37197-37201,37204-37244
/branches/eam_branches/ipp-20140813 (added)	merged: 37260,37305-37310,37344,37348,37350-37351,37353
/branches/eam_branches/ipp-ops-20130712 (added)	merged: 37064-37069
/tags/ipp-20130712 (added)	merged: 35815,35819,35822-35825,35832,35834-35835,35840,35847,35851,35855,35857-35858,35863,35866,35879-35880,35885-35886,35891,35898,35905,35907-35910,35912-35915,35922-35923,35930,35933-35935,35940-35941,35949,35954,35959,35965,35974,35978,36016,36020,36034,36038-36039,36049,36052,36056,36109-36110,36112,36122,36125,36127,36129,36134,36136,36138-36141,36171-36172,36179,36181,36184,36224,36265,36288,36359,36376-36381,36402,36405,36414,36432,36451,36458,36460,36464,36475,36496,36499,36502,36573,36592-36593,36604,36606,36636-36637,36646,36648,36652,36654,36656,36667,36672,36686,36689-36690,36692,36703,36705,36751,36774-36778,36780,36782-36783,36822,36842,36881,36915,36971,37058-37063
/trunk	merged: 36681,36683-36685,36687-36688,36691,36695,36697-36702,36704,36706-36732,36734-36736,36744,36747,36752-36763,36771-36773,36779,36781,36784-36789,36799,36801-36802,36810-36812,36815,36821,36833-36841,36844,36846-36871,36874,36879,36882,36886,36888,36890,36892,36894,36896-36897,36913-36914,36924,36948,36950-36951,36953,36955,36957,36959,36961,36963,36966,36968,36970,36972,36981,37000,37013,37015-37016,37030-37056,37070-37071,37073,37075-37081,37087,37094-37096,37102,37104,37106,37114,37116-37118,37120,37122-37123,37125,37130-37131,37139,37142-37143,37145,37148,37151-37152,37154,37164-37165,37187,37193,37195,37202,37245-37254,37256,37259,37261,37274,37279,37290,37311-37313,37315,37318-37319,37321,37325-37327,37334,37354-37362,37364-37365,37368-37369,37375,37381,37384-37385
/branches/eam_branches/ipp-20140206	removed
/branches/eam_branches/ipp-20140214	removed
/branches/eam_branches/ipp-20140226	removed
/branches/eam_branches/ipp-20140402	removed
/tags/ipp-20140114	removed

branches/eam_branches/ps2-tc3-20130727/ippTools/share/Makefile.am

-              r36680
+              r37403
         laptool_revertgroup.sql \
         laptool_filtersforgroup.sql \
+        laptool_revertsass.sql \
         vptool_find_rawexp.sql \
         vptool_pendingimfile.sql \
 …
         releasetool_definerelstack.sql \
         releasetool_definerelstack_with_skycal.sql \
+        releasetool_deleterelexp.sql \
+        releasetool_deleterelstack.sql \
         releasetool_listrelstack.sql \
+        releasetool_setrelstackcalibratedfromskycal.sql \
         releasetool_summary.sql \
         releasetool_definerelgroup_select_lap.sql \
 …
         remotetool_definebyquery_warp.sql \
         remotetool_definebyquery_stack.sql \
+        remotetool_dropcomponent.sql \
         remotetool_updatepoll.sql

branches/eam_branches/ps2-tc3-20130727/ippTools/share/camtool_find_processedexp.sql

r33000	r37403
1	1	SELECT
2	2	camProcessedExp.*,
	3	HEX(IFNULL(camProcessedExp.astrom_chips, 0)) AS good_astrom_chips,
3	4	camRun.workdir,
4	5	camRun.label,

branches/eam_branches/ps2-tc3-20130727/ippTools/share/laptool_exposures.sql

-              r31511
+              r37403
+select DISTINCT V3.*,
+       diffRun.diff_id,diffRun.state as diffRun_state,
+       coalesce(CONVERT(sum(diffSkyfile.quality != 0),SIGNED),0) AS diff_bad_quality,
+       coalesce(CONVERT(count(diffSkyfile.diff_id),SIGNED),0) AS diff_component_count
+       FROM
+-- Join the diff information
+-- select DISTINCT V3.*,
+--       diffRun.diff_id,diffRun.state as diffRun_state,
+--       coalesce(CONVERT(sum(diffSkyfile.quality != 0),SIGNED),0) AS diff_bad_quality,
+--       coalesce(CONVERT(count(diffSkyfile.diff_id),SIGNED),0) AS diff_component_count
+--       FROM
+select V3.*,-1 as diff_id ,"full" as diffRun_state,0 as diff_bad_quality,0 AS diff_component_count FROM
+-- Join the warp information
 ( select V2.*,
        warpRun.warp_id,warpRun.state as warpRun_state,
 …
        warpRun.magicked
        FROM
+-- Join the camera and fake information
 ( select V1.*,
        camRun.cam_id,camRun.state as camRun_state,
 …
        coalesce(CONVERT(count(camProcessedExp.cam_id),SIGNED),0) AS cam_component_count,
        fakeRun.fake_id,fakeRun.state as fakeRun_state FROM
+-- Get all the lap, exposure, chip stage information
 ( SELECT DISTINCT
        lap_id,lapRun.tess_id,projection_cell,filter,lapRun.state as lapRun_state, lapRun.registered, lapRun.fault, lapRun.label, lapRun.dist_group,
 …
        GROUP BY lap_id,exp_id
        ) AS V1
+-- End lap/exposure/chip
        LEFT JOIN camRun USING(chip_id) LEFT JOIN camProcessedExp USING(cam_id)
        LEFT JOIN fakeRun USING(cam_id)
        GROUP BY lap_id,exp_id
   ) AS V2
+-- End camera/fake
   LEFT JOIN warpRun USING(fake_id) LEFT JOIN warpSkyfile USING(warp_id)
   GROUP BY lap_id,exp_id
 ) AS V3
+LEFT JOIN
+  (SELECT DISTINCT diff_id,warp1,warp2 FROM diffInputSkyfile) AS DI ON
+  (DI.warp1 = warp_id OR DI.warp2 = warp_id)
+LEFT JOIN diffRun USING(diff_id)
+LEFT JOIN diffSkyfile USING(diff_id)
+-- End warp
+-- LEFT JOIN
+--  (SELECT DISTINCT diff_id,warp1,warp2 FROM diffInputSkyfile) AS DI ON
+--  (DI.warp1 = warp_id OR DI.warp2 = warp_id)
+-- LEFT JOIN diffRun USING(diff_id)
+-- LEFT JOIN diffSkyfile USING(diff_id)
 GROUP BY lap_id,exp_id

branches/eam_branches/ps2-tc3-20130727/ippTools/share/pxadmin_create_tables.sql

r36680	r37403
523	523	quality SMALLINT NOT NULL DEFAULT 0,
524	524	background_model SMALLINT,
	525	astrom_chips BIGINT,
525	526	PRIMARY KEY(cam_id),
526	527	KEY(fault),

branches/eam_branches/ps2-tc3-20130727/ippTools/share/releasetool_definerelexp.sql

r35213	r37403
18	18
19	19	WHERE previousrelexp.relexp_id IS NULL
	20	AND camRun.state = 'full'

branches/eam_branches/ps2-tc3-20130727/ippTools/share/remotetool_definebyquery_cam.sql

-              r36680
+              r37403
+SELECT
+       cam_id AS stage_id
+FROM camRun
+       LEFT JOIN remoteComponent ON (remoteComponent.stage_id = camRun.cam_id)
+       LEFT JOIN remoteRun ON (
+            remoteComponent.remote_id = remoteRun.remote_id AND
+            remoteRun.label = camRun.label
+            )
+SELECT stage_id FROM
+( SELECT cam_id AS stage_id
+    FROM camRun
 WHERE
+camRun.state = 'new' AND
+remoteRun.stage = 'camera' AND
+remote_id IS NULL
+camRun.state = 'new'
+-- where hook %s
+GROUP BY cam_id
+) AS W
+LEFT JOIN
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
+   JOIN remoteComponent USING (remote_id)
+WHERE
+remoteRun.stage = 'camera'
+-- where hook %s
+) AS R
+USING (stage_id)
+WHERE R.remote_id IS NULL

branches/eam_branches/ps2-tc3-20130727/ippTools/share/remotetool_definebyquery_chip.sql

-              r36680
+              r37403
+SELECT
+       chip_id AS stage_id
+FROM chipRun
+       LEFT JOIN remoteComponent ON (remoteComponent.stage_id = chipRun.chip_id)
+       LEFT JOIN remoteRun ON (
+            remoteComponent.remote_id = remoteRun.remote_id AND
+            remoteRun.label = chipRun.label
+            )
+SELECT stage_id FROM
+( SELECT chip_id AS stage_id
+    FROM chipRun
 WHERE
+chipRun.state = 'new' AND
+(remoteRun.stage = 'chip' OR remoteRun.stage IS NULL) AND
+remoteComponent.remote_id IS NULL
+chipRun.state = 'new'
+-- where hook %s
+GROUP BY chip_id
+) AS W
+LEFT JOIN
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
+   JOIN remoteComponent USING (remote_id)
+WHERE
+remoteRun.stage = 'chip'
+-- where hook %s
+) AS R
+USING (stage_id)
+WHERE R.remote_id IS NULL

branches/eam_branches/ps2-tc3-20130727/ippTools/share/remotetool_definebyquery_stack.sql

-              r36680
+              r37403
+SELECT
+       stack_id AS stage_id
+FROM stackRun
+       LEFT JOIN remoteComponent ON (remoteComponent.stage_id = stackRun.stack_id)
+       LEFT JOIN remoteRun ON (
+            remoteComponent.remote_id = remoteRun.remote_id AND
+            remoteRun.label = stackRun.label
+            )
+SELECT stage_id FROM
+( SELECT stack_id AS stage_id
+    FROM stackRun
 WHERE
+stackRun.state = 'new' AND
+remoteRun.stage = 'stack' AND
+remote_id IS NULL
+stackRun.state = 'new'
+-- where hook %s
+GROUP BY stack_id
+) AS W
+LEFT JOIN
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
+   JOIN remoteComponent USING (remote_id)
+WHERE
+remoteRun.stage = 'stack'
+-- where hook %s
+) AS R
+USING (stage_id)
+WHERE R.remote_id IS NULL

branches/eam_branches/ps2-tc3-20130727/ippTools/share/remotetool_definebyquery_warp.sql

-              r36680
+              r37403
+SELECT
+       warp_id AS stage_id
+FROM warpRun
+       LEFT JOIN remoteComponent ON (remoteComponent.stage_id = warpRun.warp_id)
+       LEFT JOIN remoteRun ON (
+            remoteComponent.remote_id = remoteRun.remote_id AND
+            remoteRun.label = warpRun.label
+            )
+SELECT stage_id FROM
+( SELECT warp_id AS stage_id, count(warpSkyCellMap.skycell_id) AS N
+    FROM warpRun
+    LEFT JOIN warpSkyCellMap USING(warp_id)
 WHERE
+warpRun.state = 'new' AND
+remoteRun.stage = 'warp' AND
+remote_id IS NULL
+warpRun.state = 'new'
+-- where hook %s
+GROUP BY warp_id
+HAVING N != 0
+) AS W
+LEFT JOIN
+(SELECT remote_id,remoteRun.stage,remoteRun.label,remoteComponent.stage_id,remoteRun.state
+   FROM remoteRun
+   JOIN remoteComponent USING (remote_id)
+WHERE
+remoteRun.stage = 'warp'
+-- where hook %s
+) AS R
+USING (stage_id)
+WHERE R.remote_id IS NULL

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippTools/share

Legend:

Download in other formats: