Changeset 18875

Timestamp:

Aug 2, 2008, 12:50:27 AM (18 years ago)

Author:

Sebastian Jester

Message:

Identify SDSS tsObj files by presence of PHOT_VER and TARG_VER rather than CAMCOL and STRIPE - the latter are present also in IPP outputs generated from SDSS input images. Thus, this change is required to be able to run addstar on IPP photometry of SDSS data.

File:

• branches/sj_branch_20080802/Ohana/src/addstar/src/GetFileMode.c (modified) (1 diff)

branches/sj_branch_20080802/Ohana/src/addstar/src/GetFileMode.c

@@ -16 +16 @@
   gfits_scan (header, "EXTEND", "%t", 1, &extend);
     
-  { 
-    int tmp, haveCAMCOL, haveSTRIPE;
-    
-    // SDSS tsObj files have CAMCOL & STRIP keywords present in the header
-    haveCAMCOL = gfits_scan (header, "CAMCOL",  "%d", 1, &tmp);
-    haveSTRIPE = gfits_scan (header, "STRIPE",  "%d", 1, &tmp);
-    if (haveCAMCOL && haveSTRIPE) return SDSS_OBJ;
-  }
+{
+    int tmp, havePHOT_VER, haveTARG_VER;
+
+    // SDSS tsObj files have a version number for the PHOTO and 
+    // TS (target selection) pipelines present as header keywords
+    havePHOT_VER = gfits_scan (header, "PHOT_VER", "%s", 1, &tmp);
+    haveTARG_VER = gfits_scan (header, "TARG_VER", "%s", 1, &tmp);
+    if (havePHOT_VER && haveTARG_VER) return SDSS_OBJ;
+}
 
   if ((Naxis == 2) || TEXTMODE || !simple) {