Changeset 38441 for trunk/Ohana/src/libdvo/src/flatcorr_io.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/flatcorr_io.c (modified) (4 diffs)

trunk/Ohana/src/libdvo/src/flatcorr_io.c

@@ -49 +49 @@
     return (NULL);
   }
-  flatcorrTable->image = gfits_table_get_FlatCorrectionImage (&ftable, &flatcorrTable->Nimage, NULL);
+  flatcorrTable->image = gfits_table_get_FlatCorrectionImage (&ftable, &flatcorrTable->Nimage, NULL, NULL);
   if (!flatcorrTable->image) {
     fprintf (stderr, "ERROR: failed to read Flat Correction Images\n");
@@ -64 +64 @@
     return (NULL);
   }
-  flatcorrTable->corr = gfits_table_get_FlatCorrection (&ftable, &flatcorrTable->Ncorr, NULL);
+  flatcorrTable->corr = gfits_table_get_FlatCorrection (&ftable, &flatcorrTable->Ncorr, NULL, NULL);
   if (!flatcorrTable->corr) {
     fprintf (stderr, "ERROR: failed to read Flat Corrections\n");
@@ -93 +93 @@
     for (j = 0; j < flatcorrTable->image[i].Nx; j++) {
       ALLOCATE (flatcorrTable->offset[i][j], float, flatcorrTable->image[i].Ny);
-      memset (flatcorrTable->offset[i][j], 0.0, flatcorrTable->image[i].Ny*sizeof(float));
+      memset (flatcorrTable->offset[i][j], 0, flatcorrTable->image[i].Ny*sizeof(float));
     }
   }
@@ -161 +161 @@
 
   ftableImage.header = &theaderImage;
-  gfits_table_set_FlatCorrectionImage (&ftableImage, image, flatcorrTable->Nimage);
+  gfits_table_set_FlatCorrectionImage (&ftableImage, image, flatcorrTable->Nimage, TRUE);
 
   ftableCorr.header = &theaderCorr;
-  gfits_table_set_FlatCorrection (&ftableCorr, corr, flatcorrTable->Ncorr);
+  gfits_table_set_FlatCorrection (&ftableCorr, corr, flatcorrTable->Ncorr, TRUE);
 
   f = fopen (filename, "w");