Changeset 27840 for branches/simtest_nebulous_branches/magic/remove/src/streaksastrom.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• magic (modified) (1 prop)
• magic/remove (modified) (1 prop)
• magic/remove/src (modified) (1 prop)
• magic/remove/src/streaksastrom.c (modified) (10 diffs)

branches/simtest_nebulous_branches/magic

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

branches/simtest_nebulous_branches/magic/remove/src

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in
+stamp-h1

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in
+stamp-h1

branches/simtest_nebulous_branches/magic/remove/src/streaksastrom.c

@@ -93 +93 @@
     // since the transform already accounts for the chip parity we just use the cell parity
     astrom->xParity = (double) xParityCell;
-    astrom->yParity = (double) yParityCell; 
+    astrom->yParity = (double) yParityCell;
 
     astrom->numCols = numCols;
@@ -135 +135 @@
 
 void
-cellToChipInt(int *xChip, int *yChip, strkAstrom *astrom, int xCell, int yCell)
+cellToChipInt(unsigned int *xChip, unsigned int *yChip, strkAstrom *astrom, int xCell, int yCell)
 {
     if (astrom->xParity > 0) {
@@ -148 +148 @@
     }
 }
- 
+
 bool
 SkyToLocal(strkPt *outPt, strkAstrom *astrom, double ra, double dec)
@@ -156 +156 @@
 
     pmFPA *fpa   = (pmFPA *) astrom->fpa;
-    pmChip *chip = (pmChip *) astrom->chip;
 
     // find the RA,DEC coords of the 0,0 pixel for this chip:
@@ -183 +182 @@
 
     pmFPA *fpa   = (pmFPA *) astrom->fpa;
-    pmChip *chip = (pmChip *) astrom->chip;
 
     // find the RA,DEC coords of the 0,0 pixel for this chip:
@@ -251 +249 @@
     pmChip *chip = (pmChip *) astrom->chip;
     pmAstromObj *pt = (pmAstromObj *) astrom->pt;
-    
+
     pt->sky->r = ra;
     pt->sky->d = dec;
@@ -276 +274 @@
     pmChip *chip = (pmChip *) astrom->chip;
     pmAstromObj *pt = (pmAstromObj *) astrom->pt;
-    
+
     cellToChip(&pt->chip->x, &pt->chip->y, astrom, x, y);
 
@@ -294 +292 @@
 }
 
- 
+
 static bool
 readAstrometry(streakFiles *sf)
@@ -362 +360 @@
             break;
         }
-    } 
+    }
     if (!sf->chip) {
         psError(PS_ERR_UNKNOWN, true, "Failed to find chip with data.");
@@ -380 +378 @@
 linearizeTransforms(strkAstrom *astrom)
 {
-    if (!pmAstromLinearizeTransforms((pmFPA *) astrom->fpa, (pmChip *) astrom->chip)) {
-        // streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
-        psError(PS_ERR_UNKNOWN, false, "linear fit to astrometry failed ignoring");
+    if (!pmAstromLinearizeTransforms((pmFPA *) astrom->fpa, (pmChip *) astrom->chip, NULL, NULL, NULL, 0, 0)) {
+        psErrorStackPrint(stderr, "linear fit to astrometry failed. ignoring\n");
         return false;
     }

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in
+stamp-h1