Changeset 15323 for trunk/ppstamp/src/ppstamp.h

Timestamp:

Oct 16, 2007, 4:00:33 PM (19 years ago)

Author:

bills

Message:

Solved problem with chip and cell boundary calculations by using different
functions than pmChipPixels and pmCellExtents. They don't do their calculations
in image coordinates.

Implemented specifying width/height of the ROI in celestial coordinates.
Removed unneeded WCS calculation methods. (The bug I was chasing was actually
not in ppstamp. It was a bug in ds9

File:

• trunk/ppstamp/src/ppstamp.h (modified) (4 diffs)

trunk/ppstamp/src/ppstamp.h

@@ -16 +16 @@
 #include "ppStats.h"
 
-#define RECIPE_NAME "PPSTAMP"           // Name of the recipe to use
 #define TIMERNAME "ppstamp"             // Name of timer
 
@@ -29 +28 @@
 typedef struct {
     // input arguments
-    double centerX;
-    double centerY;
-    double dX;
-    double dY;
+    int    centerX;
+    int    centerY;
+    int    dX;
+    int    dY;
     double centerRA;
     double centerDEC;
     double dRA;
     double dDEC;
-    bool celestialCenter;       // true if center is in RA/dec
-    bool celestialRange;        // true if range is in RA/dec
+    bool   celestialCenter;       // true if center is in RA/dec
+    bool   celestialRange;        // true if range is in RA/dec
     psString    chipName;
     //
-    // Calculated Parameters
+    // Calculated Values
     //
-    int         chip;
-    int         cell;
     psRegion    roi;            // roi in chip coordinates
-    // psPlane     fpaCenter;      // center of ROI in FPA coordinates
-    // ppstampROI  fpaROI;         // region of interest in FPA coordinates
+
 } ppstampOptions;
 
@@ -64 +60 @@
 bool ppstampMakeStamp(pmConfig *config, ppstampOptions *);
 
-// Loop over the input
-bool ppstampLoop(pmConfig *config, ppstampOptions *options);
-
-bool ppstampReadout(pmConfig *config, pmFPAview *view);
-
 // free memory, check for leaks
 void ppstampCleanup (pmConfig *config, ppstampOptions *options);
-
-#ifdef notyet
-// calculate stats, including MD5
-bool ppstampStats (pmConfig *config, pmChip *chip, const pmFPAview *inputView);
-
-// write stats to output file 
-bool ppstampStatsOutput (pmConfig *config);
-#endif
 
 /// Return short version information
@@ -90 +73 @@
     );
 
-
-// calculate stats, including MD5
-bool ppstampPixelStats (pmConfig *config, const pmFPAview *inputView);
-
-// calculate stats from headers and concepts
-bool ppstampMetadataStats (pmConfig *config);
-
-void ppstampFileCheck (pmConfig *config);
+psRegion *ppstampCellRegion(const pmCell *cell);
+psRegion *ppstampChipRegion(const pmChip *chip);
 
 #endif