Changeset 27838 for branches/tap_branches/Ohana/src/libfits/table/F_define_column.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/table/F_define_column.c (modified) (7 diffs)

branches/tap_branches/Ohana/src/libfits/table/F_define_column.c

@@ -5 +5 @@
 int gfits_define_bintable_column (Header *header, char *format, char *label, char *comment, char *unit, double bscale, double bzero) {
 
-  int Nfields, Nbytes, Nval, Naxis1;
+  off_t Naxis1;
+  int Nfields, Nbytes, Nval;
   char type[16], field[16];
   
@@ -12 +13 @@
   Nfields = 0;
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Naxis1);
+  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
   Nfields ++;
   Naxis1 += Nbytes*Nval;
@@ -18 +19 @@
   sprintf (field, "TTYPE%d", Nfields);
   gfits_modify (header, field, "%s", 1, label);
-  gfits_modify (header, field, "%C", 1, comment);
+  gfits_modify_alt (header, field, "%C", 1, comment);
   sprintf (field, "TUNIT%d", Nfields);
   gfits_modify (header, field, "%s", 1, unit);
   sprintf (field, "TFORM%d", Nfields);
   gfits_modify (header, field, "%s", 1, format);
-  sprintf (field, "TSCAL%d", Nfields);
-  gfits_modify (header, field, "%lf", 1, bscale);
-  sprintf (field, "TZERO%d", Nfields);
-  gfits_modify (header, field, "%lf", 1, bzero);
+
+  // add scaling parameters unless they amount to a noop
+  if ((bscale != 1.0) || (bzero != 0.0)) {
+      sprintf (field, "TSCAL%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bscale);
+      sprintf (field, "TZERO%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bzero);
+  }
 
   /* update TFIELDS & NAXIS1 */
   gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
-  gfits_modify (header, "NAXIS1",  "%d", 1, Naxis1);
+  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
   header[0].Naxis[0] = Naxis1;
 
@@ -39 +44 @@
 int gfits_define_table_column (Header *header, char *format, char *label, char *comment, char *unit) {
 
-  int Nstart, Nfields, Nbytes, Nval, Naxis1;
+  off_t Naxis1;
+  int Nstart, Nfields, Nbytes, Nval;
   char type[16], field[16], cformat[16];
 
@@ -47 +53 @@
   Nfields = 0;
   gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  gfits_scan (header, "NAXIS1",  "%d", 1, &Naxis1);
+  gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
   Nstart = Naxis1 + 1;
   Nfields ++;
@@ -54 +60 @@
   sprintf (field, "TTYPE%d", Nfields);
   gfits_modify (header, field, "%s", 1, label);
-  gfits_modify (header, field, "%C", 1, comment);
+  gfits_modify_alt (header, field, "%C", 1, comment);
   sprintf (field, "TUNIT%d", Nfields);
   gfits_modify (header, field, "%s", 1, unit);
@@ -64 +70 @@
 
   gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
-  gfits_modify (header, "NAXIS1",  "%d", 1, Naxis1);
+  gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
   header[0].Naxis[0] = Naxis1;