Index: /trunk/Ohana/src/gophot/src/gophot.c =================================================================== --- /trunk/Ohana/src/gophot/src/gophot.c (revision 12901) +++ /trunk/Ohana/src/gophot/src/gophot.c (revision 12902) @@ -13,5 +13,4 @@ fprintf (stderr, "reading from %s, writing to %s, %s param file\n", argv[1], argv[2], argv[3]); - FT_UNSIGN_MODE = FALSE; strcpy (files[4], argv[2]); Index: /trunk/Ohana/src/libfits/header/F_init_H.c =================================================================== --- /trunk/Ohana/src/libfits/header/F_init_H.c (revision 12901) +++ /trunk/Ohana/src/libfits/header/F_init_H.c (revision 12902) @@ -1,5 +1,5 @@ # include # include -int FT_UNSIGN_MODE; +static int FT_UNSIGN_MODE = FALSE; /*********************** fits read header ***********************************/ @@ -21,2 +21,14 @@ return (TRUE); } + +int gfits_set_unsign_mode (int mode) { + int oldmode; + + oldmode = FT_UNSIGN_MODE; + FT_UNSIGN_MODE = mode; + return (oldmode); +} + +int gfits_get_unsign_mode () { + return (FT_UNSIGN_MODE); +} Index: /trunk/Ohana/src/libfits/header/F_read_H.c =================================================================== --- /trunk/Ohana/src/libfits/header/F_read_H.c (revision 12901) +++ /trunk/Ohana/src/libfits/header/F_read_H.c (revision 12902) @@ -1,5 +1,4 @@ # include # include -int FT_UNSIGN_MODE; /*********************** fits read header ***********************************/ @@ -51,5 +50,5 @@ } - header[0].unsign = FT_UNSIGN_MODE; + header[0].unsign = gfits_get_unsign_mode(); header[0].bscale = 1; header[0].bzero = 0; Index: /trunk/Ohana/src/libfits/header/F_read_XH.c =================================================================== --- /trunk/Ohana/src/libfits/header/F_read_XH.c (revision 12901) +++ /trunk/Ohana/src/libfits/header/F_read_XH.c (revision 12902) @@ -1,5 +1,4 @@ # include # include -int FT_UNSIGN_MODE; /*********************** fits read header ***********************************/ Index: /trunk/Ohana/src/libfits/include/gfitsio.h =================================================================== --- /trunk/Ohana/src/libfits/include/gfitsio.h (revision 12901) +++ /trunk/Ohana/src/libfits/include/gfitsio.h (revision 12902) @@ -32,6 +32,4 @@ # define FT_LINE_LENGTH 80 /* FITS header line length */ # define FT_RECORD_SIZE 2880 /* FITS block size */ - -extern int FT_UNSIGN_MODE; /* is unsigned the default? */ /* this structure defines the buffer which contains a header @@ -114,4 +112,6 @@ int gfits_matrix_size PROTO ((Header *)); int gfits_init_header PROTO ((Header *)); +int gfits_get_unsign_mode PROTO (()); +int gfits_set_unsign_mode PROTO ((int mode)); int gfits_create_table_header PROTO ((Header *, char *, char *)); int gfits_vtable_from_ftable PROTO ((FTable *ftable, VTable *vtable, int *row, int Nrow)); Index: /trunk/Ohana/src/misc/src/cubefilter.c =================================================================== --- /trunk/Ohana/src/misc/src/cubefilter.c (revision 12901) +++ /trunk/Ohana/src/misc/src/cubefilter.c (revision 12902) @@ -13,8 +13,7 @@ float fmin, fmax, Nval, sum; - FT_UNSIGN_MODE = FALSE; if (N = get_argument (argc, argv, "-unsign")) { remove_argument (N, &argc, argv); - FT_UNSIGN_MODE = TRUE; + gfits_set_unsign_mode (TRUE); } Index: /trunk/Ohana/src/misc/src/medianfilter.c =================================================================== --- /trunk/Ohana/src/misc/src/medianfilter.c (revision 12901) +++ /trunk/Ohana/src/misc/src/medianfilter.c (revision 12902) @@ -17,8 +17,7 @@ float fmin, fmax, Nval, sum; - FT_UNSIGN_MODE = FALSE; if ((N = get_argument (argc, argv, "-unsign"))) { remove_argument (N, &argc, argv); - FT_UNSIGN_MODE = TRUE; + gfits_set_unsign_mode (TRUE); } Index: /trunk/Ohana/src/opihi/cmd.data/rd.c =================================================================== --- /trunk/Ohana/src/opihi/cmd.data/rd.c (revision 12901) +++ /trunk/Ohana/src/opihi/cmd.data/rd.c (revision 12902) @@ -236,5 +236,5 @@ /** now - convert the matrix values to floats for internal use **/ - gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE); + gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, gfits_get_unsign_mode()); return (TRUE); Index: /trunk/Ohana/src/opihi/cmd.data/rdseg.c =================================================================== --- /trunk/Ohana/src/opihi/cmd.data/rdseg.c (revision 12901) +++ /trunk/Ohana/src/opihi/cmd.data/rdseg.c (revision 12902) @@ -66,5 +66,5 @@ /** now - convert the matrix values to floats for internal use **/ - gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE); + gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, gfits_get_unsign_mode()); return (TRUE); Index: /trunk/Ohana/src/opihi/cmd.data/unsign.c =================================================================== --- /trunk/Ohana/src/opihi/cmd.data/unsign.c (revision 12901) +++ /trunk/Ohana/src/opihi/cmd.data/unsign.c (revision 12902) @@ -4,5 +4,5 @@ if (argc == 1) { - if (FT_UNSIGN_MODE) + if (gfits_get_unsign_mode()) gprint (GP_ERR, "mode is now UNSIGNED int \n"); else @@ -13,10 +13,10 @@ if (argc == 2) { if (!strcmp (argv[1], "1")) { - FT_UNSIGN_MODE = TRUE; + gfits_set_unsign_mode (TRUE); set_int_variable ("UNSIGN", 1); return (TRUE); } if (!strcmp (argv[1], "0")) { - FT_UNSIGN_MODE = FALSE; + gfits_set_unsign_mode (FALSE); set_int_variable ("UNSIGN", 0); return (TRUE); Index: /trunk/Ohana/src/opihi/dimm/camera.c =================================================================== --- /trunk/Ohana/src/opihi/dimm/camera.c (revision 12901) +++ /trunk/Ohana/src/opihi/dimm/camera.c (revision 12902) @@ -112,5 +112,5 @@ ReadOut (x, y, dx, dy, 1, buf[0].matrix.buffer); - gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE); + gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, gfits_get_unsign_mode()); EXIT_STATUS (TRUE); Index: /trunk/Ohana/src/opihi/lib.shell/startup.c =================================================================== --- /trunk/Ohana/src/opihi/lib.shell/startup.c (revision 12901) +++ /trunk/Ohana/src/opihi/lib.shell/startup.c (revision 12902) @@ -47,11 +47,7 @@ set_variable ("PID", getpid()); - /* keep these? - set_int_variable ("UNSIGN", 0); - FT_UNSIGN_MODE = FALSE; - */ - - - + set_int_variable ("UNSIGN", 0); + gfits_set_unsign_mode (FALSE); + /* check history file permission */ { Index: /trunk/Ohana/src/tools/src/medianfilter.c =================================================================== --- /trunk/Ohana/src/tools/src/medianfilter.c (revision 12901) +++ /trunk/Ohana/src/tools/src/medianfilter.c (revision 12902) @@ -17,8 +17,7 @@ float fmin, fmax, Nval, sum; - FT_UNSIGN_MODE = FALSE; if ((N = get_argument (argc, argv, "-unsign"))) { remove_argument (N, &argc, argv); - FT_UNSIGN_MODE = TRUE; + gfits_set_unsign_mode (TRUE); }