Changeset 1623 for trunk/source/parse_punch.cpp

Timestamp:

12/07/07 06:50:47 (12 months ago)

Author:

rporter

Message:

trunk/source/cddrive.cpp
trunk/source/cdinit.cpp
trunk/source/cloudy.cpp
trunk/source/parse.h
trunk/source/parse_punch.cpp

ClosePunchFiles? now accepts boolean saying whether this is final close, then ignore clobber options. It also checks that any FITS files are the right size and complains if they are not.

Files:

• trunk/source/parse_punch.cpp (modified) (2 diffs)

trunk/source/parse_punch.cpp

@@ -2510 +2510 @@
  * from cloudy before returning 
  * NB - KEEP THIS ROUTINE SYNCHED UP WITH THE PREVIOUS ONE, PunchFilesInit */
-void ClosePunchFiles(void)
+void ClosePunchFiles( bool lgFinal )
 {
         long int i;
@@ -2521 +2521 @@
         for( i=0; i < punch.npunch; i++ )
         {
-                if( punch.ipPnunit[i] != NULL && !lgNoClobber[i] )
-                {
+                /* if lgFinal is true, we close everything, no matter what. 
+                 * this means ignoring "no clobber" options */
+                if( punch.ipPnunit[i] != NULL && ( !lgNoClobber[i] || lgFinal ) )
+                {
+                        /* Test that any FITS files are the right size! */ 
+                        if( punch.lgFITS[i] )
+                        {
+                                /* \todo 2 This overflows for file sizes larger (in bytes) than
+                                 * a long int can represent (about 2GB on most 2007 systems)  */
+                                fseek(punch.ipPnunit[i], 0, SEEK_END);
+                                long file_size = ftell(punch.ipPnunit[i]);
+                                if( file_size%2880 )
+                                {
+                                        fprintf( ioQQQ, " PROBLEM  FITS file is wrong size!\n" );
+                                }
+                        }
+
                         fclose( punch.ipPnunit[i] );
                         punch.ipPnunit[i] = NULL;