Changeset 5860

Timestamp:

Dec 30, 2005, 9:15:45 AM (21 years ago)

Author:

eugene

Message:

adding ppMerge initial implementation

Location:

trunk

Files:

• ppImage/src/ppImage.c (modified) (1 diff)
• ppImage/src/ppImage.h (modified) (3 diffs)
• ppImage/src/ppImageParseCamera.c (modified) (1 diff)
• ppMerge (added)
• ppMerge/src (added)
• ppMerge/src/ppMerge.c (added)
• ppMerge/src/ppMerge.h (added)
• ppMerge/src/ppMergeCell.c (added)
• ppMerge/src/ppMergeConfig.c (added)
• ppMerge/src/ppMergeLoadPixels.c (added)
• ppMerge/src/ppMergeLoop.c (added)
• ppMerge/src/ppMergeOptions.c (added)
• ppMerge/src/ppMergeParseCamera.c (added)
• ppMerge/src/ppMergeParseDetrend.c (added)

trunk/ppImage/src/ppImage.c

@@ -15 +15 @@
     // Get camera configuration from header if not already defined
     // Construct camera in preparation for reading
-    ppImageParseCamera (&data, &config, argv);
+    ppImageParseCamera (&data, &config);
 
     // Set various tasks (define optional operations)

trunk/ppImage/src/ppImage.h

@@ -46 +46 @@
     bool doSource;                      // Source identification and photometry
     bool doAstrom;                      // Astrometry
-    bool preLoad;
 
     bool doOverscan;                    // Overscan subtraction
@@ -61 +60 @@
 
     ppImageLoadDepth imageLoadDepth;
-
 } ppOptions;
 
@@ -93 +91 @@
 bool ppImageLoop (ppData *data, ppOptions *options, ppConfig *config);
 bool ppImageOptions (ppData *data, ppOptions *options, ppConfig *config);
-bool ppImageParseCamera (ppData *data, ppConfig *config, char **argv);
+bool ppImageParseCamera (ppData *data, ppConfig *config);
 bool ppImageParseDetrend (ppData *data, ppOptions *options, ppConfig *config);
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -18 +18 @@
 }
 
-bool ppImageParseCamera (ppData *data, ppConfig *config, char **argv) {
+bool ppImageParseCamera (ppData *data, ppConfig *config) {
     
     bool status;