Changeset 14889 for trunk/psModules/src/camera/pmFPAfileDefine.h

Timestamp:

Sep 19, 2007, 11:37:58 AM (19 years ago)

Author:

Paul Price

Message:

Had trouble with defining files for psphot from pswarp --- didn't know what format to use, and so ended up using the default one, which was wrong (because wanted to run psphot on the warped image, not the input image). So added format and format name to the pmFPAfile, and new functions to define a file from one already existing, using its camera and format.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.h (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-23 23:42:41 $
+ * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-09-19 21:37:58 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -28 +28 @@
 // Define an output pmFPAfile
 pmFPAfile *pmFPAfileDefineOutput(const pmConfig *config, // Configuration
-                                 pmFPA *fpa, // Optional FPA to bind
-                                 const char *name // Name of camera format to use
+                                 pmFPA *fpa, // Optional FPA to bind
+                                 const char *name // Name of file rule
     );
 
+/// Same as pmFPAfileDefineOutput, but binds to the fpa in the provided file
+pmFPAfile *pmFPAfileDefineOutputFromFile(const pmConfig *config, // Configuration
+                                         pmFPAfile *file, // File to bind FPAs, or NULL
+                                         const char *name // Name of file rule
+    );
+
+/// Define the FPA file using the provided camera and format names.
 pmFPAfile *pmFPAfileDefineOutputForFormat(const pmConfig *config, // Configuration
-                                          pmFPA *fpa, // Optional FPA to bind
-                                          const char *name, // Name of file rule
-                                          const char *cameraName, // Name of camera configuration to use
-                                          const char *formatName // Name of camera format to use
+                                          pmFPA *fpa, // Optional FPA to bind
+                                          const char *name, // Name of file rule
+                                          psString cameraName, // Name of camera configuration to use
+                                          psString formatName // Name of camera format to use
     );
 
@@ -69 +76 @@
 // reference count is held by the config->files metadata.
 pmFPAfile *pmFPAfileDefineFromFPA (const pmConfig *config, pmFPA *src, int xBin, int yBin, const char *filename);
+
+/// Same as pmFPAfileDefineFromFPA, except it uses an FPA file instead of an FPA
+pmFPAfile *pmFPAfileDefineFromFile(const pmConfig *config, // Configuration
+                                   pmFPAfile *src, // Source file for this file
+                                   int xBin, int yBin, // Binning for this file
+                                   const char *filename // Name of file rule
+    );
+
 
 // create a new output pmFPAfile based on an existing FPA