Changeset 1623

Timestamp:

12/07/07 06:50:47 (9 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.

Location:

trunk/source

Files:

• cddrive.cpp (modified) (1 diff)
• cdinit.cpp (modified) (1 diff)
• cloudy.cpp (modified) (1 diff)
• parse.h (modified) (1 diff)
• parse_punch.cpp (modified) (2 diffs)

trunk/source/cddrive.cpp

@@ -2122 +2122 @@
         DEBUG_ENTRY( "cdClosePunchFiles()" );
 
-        ClosePunchFiles();
+        ClosePunchFiles( true );
         return;
 }

trunk/source/cdinit.cpp

@@ -254 +254 @@
 
         /* close any open units */
-        ClosePunchFiles();
+        ClosePunchFiles( true );
 
         /* this routine must be called upon exit or machine will appear to "hang",

trunk/source/cloudy.cpp

@@ -300 +300 @@
         }
 
-        ClosePunchFiles();
+        ClosePunchFiles( false );
 
         /* this checks that various parts of the code worked properly */

trunk/source/parse.h

@@ -38 +38 @@
 void PunchFilesInit(void);
 
-/**close all open punch files */
-void ClosePunchFiles(void);
+/**close all open punch files 
+\param lgFinal - close ALL files, regardless of "no clobber" status
+*/
+void ClosePunchFiles( bool lgFinal );
 
 /**ParseAge - parse the age command */

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;