Changeset 22699 for trunk/psModules/src/camera

Timestamp:

Feb 26, 2009, 2:45:31 PM (17 years ago)

Author:

Paul Price

Message:

Reorganised the concepts files, moving the Write functions into pmConceptsWrite, and the Read functions into pmConceptsRead, which sort of makes sense. Added new type of concept property: copy. Most concepts use the default copy method (which is to simply copy the item), but for the TIMESYS concepts, we want to ensure that the target is of the correct type --- if it's already set (e.g., via the DEFAULTS), then we don't copy it. This will allow us to set the target TIMESYS using the DEFAULTS in the camera format, and have the output time be adjusted appropriately. Without this, the TIMESYS is simply copied, and specifying the TIMESYS in the DEFAULTS results in a warning ('values don't match'). Removed pmFPACopyConcepts, since it is pretty much the same as pmConceptsCopyFPA.

Location:

trunk/psModules/src/camera

Files:

• pmFPAConstruct.c (modified) (1 diff)
• pmFPACopy.c (modified) (1 diff)
• pmFPAHeader.c (modified) (1 diff)
• pmFPARead.c (modified) (1 diff)
• pmFPAWrite.c (modified) (1 diff)
• pmFPAfile.c (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (3 diffs)
• pmFPAfileFitsIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -14 +14 @@
 #include "pmFPAview.h"
 #include "pmFPAFlags.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAConstruct.h"
 #include "pmFPAUtils.h"

trunk/psModules/src/camera/pmFPACopy.c

@@ -13 +13 @@
 #include "pmFPAUtils.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 #include "pmFPACopy.h"
 

trunk/psModules/src/camera/pmFPAHeader.c

@@ -10 +10 @@
 #include "pmFPA.h"
 #include "pmFPALevel.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 

trunk/psModules/src/camera/pmFPARead.c

@@ -17 +17 @@
 #include "pmFPAFlags.h"
 #include "pmHDUUtils.h"
-#include "pmConcepts.h"
+#include "pmConceptsRead.h"
 #include "pmFPAHeader.h"
 

trunk/psModules/src/camera/pmFPAWrite.c

@@ -18 +18 @@
 #include "pmHDUUtils.h"
 #include "pmHDUGenerate.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 #include "pmFPAWrite.h"

trunk/psModules/src/camera/pmFPAfile.c

@@ -18 +18 @@
 #include "pmFPAfile.h"
 #include "pmFPACopy.h"
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 static void pmFPAfileFree(pmFPAfile *file)
@@ -409 +409 @@
     // XXX this should be smarter (ie, only copy concepts from the current chips)
     // but such a call is needed, so re-copy stuff rather than no copy
-    pmFPACopyConcepts (out, in);
+    pmConceptsCopyFPA(out, in, true, true);
 
     // pmFPAWrite takes care of all PHUs as needed

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -21 +21 @@
 #include "pmFPAConstruct.h"
 
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 # define FPA_TEST_ASSERT(A){ \
@@ -1024 +1024 @@
         }
 
-        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
-        // we are going to replace it when we determine the true file.  blow this away here...
-        psFree (file->fpa);
-        file->fpa = NULL;
+        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
+        // we are going to replace it when we determine the true file.  blow this away here...
+        psFree (file->fpa);
+        file->fpa = NULL;
     }
 
@@ -1184 +1184 @@
 
     // inherit the concepts from the src fpa:
-    pmFPACopyConcepts(file->fpa, file->src);
+    pmConceptsCopyFPA(file->fpa, file->src, true, true);
 
     return file;

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -22 +22 @@
 #include "pmFPAConstruct.h"
 #include "pmDark.h"
-#include "pmConcepts.h"
+#include "pmConceptsWrite.h"
 
 // Get a suitable FPA for the file; generate it if necessary