Changeset 27435 for trunk/Ohana/src/imregister/spreg/output.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/imregister/spreg/output.c (modified) (6 diffs)

trunk/Ohana/src/imregister/spreg/output.c

@@ -14 +14 @@
 
 /* given a subset list, write out the selected spectra, if desired */
-void OutputSubset (Spectrum *spectrum, int Nspectra, int *match, int Nmatch) {
+void OutputSubset (Spectrum *spectrum, off_t Nspectra, off_t *match, off_t Nmatch) {
 
   if (output.table != (char *) NULL) {
@@ -29 +29 @@
 
 /* write out complete binary FITS table in format of db */
-void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch) {
+void DumpFitsBintable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) {
 
-  int i, j;
+  off_t i, j;
   FILE *f;
   Header header;
@@ -72 +72 @@
 
 /* write out an ASCII table */
-void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch) {
+void DumpFitsTable (char *filename, Spectrum *spectrum, off_t *match, off_t Nmatch) {
   
-  int i;
+  off_t i;
   char *obsstr, *regstr, *line, *datestr;
   time_t tsecond;
@@ -141 +141 @@
 
 /* Select, TimeMode are global */
-int PrintSubset (Spectrum *spectrum, int *match, int Nmatch) {
+int PrintSubset (Spectrum *spectrum, off_t *match, off_t Nmatch) {
   
-  int i, j;
+  off_t i, j;
   char *timestr;
 
@@ -153 +153 @@
 
     /* predefined subset of values */
-    fprintf (stdout, "%5d %20s %s %s %s %s ", i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope);
+    fprintf (stdout, "%5lld %20s %s %s %s %s ", (long long) i, timestr, spectrum[i].pathname, spectrum[i].filename, spectrum[i].objname, spectrum[i].telescope);
     fprintf (stdout, "%5.1f %5.3f %.1f %.1f %.2f\n", spectrum[i].exptime, spectrum[i].airmass, spectrum[i].Ws, spectrum[i].We, spectrum[i].dW);
 
@@ -161 +161 @@
 }
 
-int dump_data (Spectrum *spectrum, int Nspectrum) {
+int dump_data (Spectrum *spectrum, off_t Nspectrum) {
 
-  int i;
+  off_t i;
 
   for (i = 0; i < Nspectrum; i++) {