Changeset 20545

Timestamp:

Nov 5, 2008, 12:41:20 AM (18 years ago)

Author:

Sebastian Jester

Message:

Put changes from 1.2.14.1 on head

File:

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

trunk/Ohana/src/addstar/src/GetFileMode.c

@@ -14 +14 @@
   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) {