Changeset 39288 for trunk/Ohana/src/uniphot/src/dcr_correction.c

Timestamp:

Dec 17, 2015, 8:53:56 PM (11 years ago)

Author:

eugene

Message:

merge astrometric corrections into setphot; add some history headers

File:

• trunk/Ohana/src/uniphot/src/dcr_correction.c (modified) (3 diffs)

trunk/Ohana/src/uniphot/src/dcr_correction.c

@@ -26 +26 @@
 
   char type[16];
-  char extname[80];
 
   Header header;
@@ -67 +66 @@
     if (!gfits_fread_ftable_data (f, &ftable, FALSE)) return (FALSE);
     
-    if (!gfits_scan (&theader, "EXTNAME", "%s", 1, extname)) return (FALSE);
+    char word[80];
+    if (!gfits_scan (&theader, "EXTNAME", "%s", 1, word)) return (FALSE);
+    char *extname = strcreate(word);
 
     // figure out the filter and direction from the EXTNAME
+    // EXTNAME is of the form DCR.[grizy].dP[xy]
 
-    // EXTNAME is of the form [grizy].[xy].v0 where 
-    char filtname = extname[0];
+    char *ptr = NULL;
+    char *w0 = strtok_r (extname, ".", &ptr); myAssert (w0, "invalid dcr file");
+    char *w1 = strtok_r (NULL, ".", &ptr); myAssert (w1, "invalid dcr file");
+    char *w2 = strtok_r (NULL, ".", &ptr); myAssert (w2, "invalid dcr file");
+    
+    myAssert (!strcmp(w0, "DCR"), "invalid dcr file");
+
+    char filtname = w1[0];
     int filtnum = -1;
     switch (filtname) {
@@ -86 +94 @@
 
     int dir = -1;
-    if (extname[2] == 'x') {
+    if (w2[2] == 'x') {
       dir = 0;
     }
-    if (extname[2] == 'y') {
+    if (w2[2] == 'y') {
       dir = 1;
     }