Skip to content

Commit

Permalink
Updated queries to remove photozRF references.
Browse files Browse the repository at this point in the history
  • Loading branch information
deoyani committed Feb 20, 2015
1 parent 445abdf commit 8be9fd8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions en/tools/explore/DisplayResults.aspx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ private void getQuery() {
cmd = ExplorerQueries.PhotoTagQuery.Replace("@objId", objId); break;
case "photoZ":
cmd = ExplorerQueries.PhotoZ.Replace("@objId", objId); break;
case "photozRF":
cmd = ExplorerQueries.PhotozRF.Replace("@objId", objId); break;
//case "photozRF":
// cmd = ExplorerQueries.PhotozRF.Replace("@objId", objId); break;

case "Field":
cmd = ExplorerQueries.FieldQuery.Replace("@fieldId", fieldId); break;
Expand Down
7 changes: 4 additions & 3 deletions en/tools/explore/ExploreHelpers/ExplorerQueries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public class ExplorerQueries
//string c1 = "select * from Photoz2 where objid=" + objid;

//PhotzRF
public static string PhotozRF= "select * from PhotozRF where objid=@objId";
//public static string PhotozRF= "select * from PhotozRF where objid=@objId";
//string c2 = "select * from Photoz2 where objid=" + objid;

#region plate
Expand Down Expand Up @@ -282,13 +282,14 @@ public class ExplorerQueries
dbo.fPhotoModeN(po.mode) as mode,po.mjd as 'mjdNum', (po.nDetect-1) as 'Other observations', po.parentID, po.nChild, str(po.extinction_r,7,2) as extinction_r,
str(po.petroRad_r,9,2)+' ± '+str(po.petroRadErr_r,10,3) as 'petrorad_r',
--- photz,photozRF,zoospec
(str(phz.z,7,3)+' ± '+str(phz.zerr,8,4))as 'photoZ_KD', (str(phzrf.z,7,3)+' ± '+str(phzrf.zerr,8,4)) as 'photoZ_RF',
(str(phz.z,7,3)+' ± '+str(phz.zerr,8,4))as 'photoZ_KD',
---(str(phzrf.z,7,3)+' ± '+str(phzrf.zerr,8,4)) as 'photoZ_RF',
case (1*zz.spiral+10*zz.elliptical+100*zz.uncertain) when 1 then 'Spiral' when 10 then 'Elliptical' when 100 then 'Uncertain' else '-' end as 'GalaxyZoo_Morph'
--all joins
from PhotoTag pt
left outer join PhotoObj po on po.objid = pt.objid
left outer join Photoz phz on pt.objid=phz.objid
left outer join PhotozRF phzrf on pt.objid=phzrf.objid
---left outer join PhotozRF phzrf on pt.objid=phzrf.objid
left outer join zooSpec zz on pt.objid=zz.objid
left outer join field f on f.fieldID=pt.fieldID
left outer join photoobjall pa with (nolock)on pa.objid = pt.objid
Expand Down

0 comments on commit 8be9fd8

Please sign in to comment.