Changeset 37054 for trunk

Timestamp:

Jul 17, 2014, 10:31:58 AM (12 years ago)

Author:

eugene

Message:

some minor changes

Location:

trunk

Files:

• Ohana/src/addstar/src/GetFileMode.c (modified) (1 diff)
• Ohana/src/addstar/src/MatchHeaders.c (modified) (1 diff)
• Ohana/src/gastro2/src/gstars2.c (modified) (1 diff)
• Ohana/src/getstar/src/GetFileMode.c (modified) (1 diff)
• Ohana/src/libfits/matrix/F_compress_M.c (modified) (2 diffs)
• ippTools/src/remotetool.c (modified) (1 diff)

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

@@ -10 +10 @@
   int havePHOT_VER, haveTARG_VER;
 
+  // NOTE target of %t must be int length
   gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
   int haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);

trunk/Ohana/src/addstar/src/MatchHeaders.c

@@ -60 +60 @@
     if (!strcmp (exttype, "PS1_V4")) goto keep;
     if (!strcmp (exttype, "PS1_V5")) goto keep;
+
     if (!strcmp (exttype, "PS1_SV1")) goto keep;
     if (!strcmp (exttype, "PS1_SV2")) goto keep;
     if (!strcmp (exttype, "PS1_SV3")) goto keep;
+
+    if (!strcmp (exttype, "PS1_DV1")) goto keep;
+    if (!strcmp (exttype, "PS1_DV2")) goto keep;
     if (!strcmp (exttype, "PS1_DV3")) goto keep;
-    if (!strcmp (exttype, "PS1_DV4")) {
-      goto keep;
-    }
+    if (!strcmp (exttype, "PS1_DV4")) goto keep;
     continue;
 

trunk/Ohana/src/gastro2/src/gstars2.c

@@ -125 +125 @@
   /* read from FITS table or from text table */
   /* Is NAXIS == 0 a better test?? */
-  gfits_scan_alt (&Target[0].header, "NAXIS",  "%t", 1, &naxis);
+  gfits_scan_alt (&Target[0].header, "NAXIS",  "%d", 1, &naxis);
   if ((naxis == 0) && !TEXTMODE) {
     Nskip = gfits_data_size (&Target[0].header);

trunk/Ohana/src/getstar/src/GetFileMode.c

@@ -8 +8 @@
   int simple, extend, haveNaxis, haveCTYPE;
 
+  // NOTE target of %t must be int length
   gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
   haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);

trunk/Ohana/src/libfits/matrix/F_compress_M.c

@@ -58 +58 @@
 
   // is ZIMAGE present?
+  // NOTE target of %t must be int length
   status = gfits_scan_alt (ftable->header, "ZIMAGE", "%t", 1, &zimage);
   if (!status || !zimage) ESCAPE;
@@ -125 +126 @@
   int have_ztension;
 
+  // NOTE target of %t must be int length
   have_zsimple  = gfits_scan_alt (header, "ZSIMPLE", "%t", 1, &zsimple);
   have_ztension = gfits_scan (header, "ZTENSION", "%s", 1, exttype);

trunk/ippTools/src/remotetool.c

@@ -358 +358 @@
   PXOPT_LOOKUP_S64(remote_id,  config->args, "-remote_id",    true, false);
   psAssert(remote_id,"This should have failed before this point.");
-  
+
   psMetadata *where = psMetadataAlloc();
   psMetadata *values = psMetadataAlloc();