Changeset 35424

Timestamp:

Apr 22, 2013, 1:00:45 PM (13 years ago)

Author:

eugene

Message:

refactor to load astrometry from headers up front, making output format flexible

Location:

branches/eam_branches/ipp-20130419/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.c (modified) (1 diff)
• pswarp.h (modified) (1 diff)
• pswarpDefineLayout.c (added)
• pswarpLoadAstrometry.c (added)
• pswarpLoop.c (modified) (1 diff)
• pswarpOverlaps.c (added)

branches/eam_branches/ipp-20130419/pswarp/src/Makefile.am

@@ -35 +35 @@
         pswarpDefine.c                  \
         pswarpDefineBackground.c        \
-        pswarpDefineSkycell.c   \
+        pswarpDefineSkycell.c           \
+        pswarpDefineLayout.c            \
         pswarpErrorCodes.c              \
+        pswarpLoadAstrometry.c          \
         pswarpMapGrid.c                 \
         pswarpMaskStats.c               \
         pswarpMatchRange.c              \
+        pswarpOverlaps.c                \
         pswarpParseCamera.c             \
         pswarpPixelsLit.c               \

branches/eam_branches/ipp-20130419/pswarp/src/pswarp.c

@@ -39 +39 @@
     }
 
+# if (0)
+    // XXX I'm going to add the new code before removing the old code.
+    // load the input & output astrometry, find the output overlaps, generate the output pixels
+    if (!pswarpDefineLayout(config)) {
+        pswarpCleanup(config, statsFile);
+    }
+
+    pswarpDumpOutput (config);
+    exit (0);
+# endif
+
     // load the skycell layout information:
     //   read the output astrometry description

branches/eam_branches/ipp-20130419/pswarp/src/pswarp.h

@@ -172 +172 @@
 // cleanup memory and exit
 void pswarpCleanup (pmConfig *config, pswarpStatsFile *statsFile) PS_ATTR_NORETURN;
+
+// load the astrometry header info and generate the tranformations 
+bool pswarpDefineLayout (pmConfig *config);
+
+// XXX function for testing
+bool pswarpDumpOutput (pmConfig *config);
+
+// structure to describe approximate bounds for each fpa element (eg, chip)
+// P,Q are a locally linear projection
+typedef struct {
+    psVector *Pmin; 
+    psVector *Pmax;
+    psVector *Qmin;
+    psVector *Qmax;
+} pswarpBounds;
+
+bool pswarpFindOverlap (pmFPA *fpa, pswarpBounds *src, pswarpBounds *tgt);
+psProjection *pswarpLocalFrame (pmFPA *fpa);
+pswarpBounds *pswarpMakeBounds (pmFPA *fpa, psProjection *frame);
+bool pswarpBoundsAppend(pswarpBounds *bounds, float Pmin, float Pmax, float Qmin, float Qmax);
+pswarpBounds *pswarpBoundsAlloc();
+
+bool pswarpLoadAstrometry (pmConfig *config, pmFPAfile *astrom, pmFPAfile *target);

branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c

@@ -91 +91 @@
     // }
    
-
     // Read the input astrometry
     // XXX rather than use the activations here, this should just explicitly loop over the desired filerule