Changeset 27851

Timestamp:

May 4, 2010, 9:02:02 AM (16 years ago)

Author:

Paul Price

Message:

Fix query to add 2.5log(t) to zero point.

File:

• trunk/tools/publish_mops.pl (modified) (2 diffs)

trunk/tools/publish_mops.pl

@@ -67 +67 @@
     my $inverse = shift;        # Inverse diff?
 
-    my $exposure = $db->selectrow_hashref("SELECT DISTINCT exp_name, exp_id, chipInput.chip_id, camInput.cam_id, fakeInput.fake_id, warpInput.warp_id, zpt_obs, zpt_stdev, SQRT(sigma_ra*sigma_ra+sigma_dec*sigma_dec) AS astrom_rms FROM diffRun JOIN diffInputSkyfile USING(diff_id) JOIN warpRun AS warpTemplate ON warpTemplate.warp_id = warp1 JOIN fakeRun AS fakeTemplate ON fakeTemplate.fake_id = warpTemplate.fake_id JOIN camProcessedExp ON fakeTemplate.cam_id = camProcessedExp.cam_id JOIN warpRun AS warpInput ON warpInput.warp_id = " . ($inverse ? "warp2" : "warp1") . " JOIN fakeRun AS fakeInput ON fakeInput.fake_id = warpInput.fake_id JOIN camRun AS camInput ON camInput.cam_id = fakeInput.cam_id JOIN chipRun AS chipInput ON chipInput.chip_id = camInput.chip_id JOIN rawExp USING(exp_id) WHERE diff_id = $diff_id") or die "Unable to execute SQL: $DBI::errstr";
+    my $exposure = $db->selectrow_hashref("SELECT DISTINCT rawInput.exp_name, rawInput.exp_id, chipInput.chip_id, camInput.cam_id, fakeInput.fake_id, warpInput.warp_id, zpt_obs + 2.5*LOG10(rawTemplate.exp_time) AS zp, zpt_stdev, SQRT(sigma_ra*sigma_ra+sigma_dec*sigma_dec) AS astrom_rms FROM diffRun JOIN diffInputSkyfile USING(diff_id) JOIN warpRun AS warpTemplate ON warpTemplate.warp_id = warp1 JOIN fakeRun AS fakeTemplate ON fakeTemplate.fake_id = warpTemplate.fake_id JOIN camProcessedExp ON fakeTemplate.cam_id = camProcessedExp.cam_id JOIN camRun AS camTemplate ON camTemplate.cam_id = fakeTemplate.cam_id JOIN chipRun AS chipTemplate ON chipTemplate.chip_id = camTemplate.chip_id JOIN rawExp AS rawTemplate ON rawTemplate.exp_id = chipTemplate.exp_id JOIN warpRun AS warpInput ON warpInput.warp_id = " . ($inverse ? "warp2" : "warp1") . " JOIN fakeRun AS fakeInput ON fakeInput.fake_id = warpInput.fake_id JOIN camRun AS camInput ON camInput.cam_id = fakeInput.cam_id JOIN chipRun AS chipInput ON chipInput.chip_id = camInput.chip_id JOIN rawExp AS rawInput ON rawInput.exp_id = chipInput.exp_id WHERE diff_id = $diff_id") or die "Unable to execute SQL: $DBI::errstr";
 
     my $exp_name = $exposure->{exp_name};
@@ -75 +75 @@
     my $fake_id = $exposure->{fake_id};
     my $warp_id = $exposure->{warp_id};
-    my $zp = $exposure->{zpt_obs};
+    my $zp = $exposure->{zp};
     my $zp_err = $exposure->{zpt_stdev};
     my $astrom_rms = $exposure->{astrom_rms};