Changeset 9641 for trunk/psastro/src/psastroAstromGuess.c

Timestamp:

Oct 18, 2006, 5:00:44 PM (20 years ago)

Author:

eugene

Message:

added tests to rationalize ra range

File:

• trunk/psastro/src/psastroAstromGuess.c (modified) (5 diffs)

trunk/psastro/src/psastroAstromGuess.c

@@ -10 +10 @@
     bool status = false;
     bool isMosaic = false;
-    double RAmin = NAN, RAmax = NAN, RAminSky = NAN, RAmaxSky = NAN;
-    double DECmin = NAN, DECmax = NAN;
+    double RAmin = NAN;
+    double RAmax = NAN;
+    double RAminSky = NAN;
+    double RAmaxSky = NAN;
+    double DECmin = NAN;
+    double DECmax = NAN;
 
     pmChip *chip = NULL;
@@ -54 +58 @@
         if (newFPA) {
             newFPA = false;
+            while (fpa->projection->R <        0) fpa->projection->R += 2.0*M_PI;
+            while (fpa->projection->R > 2.0*M_PI) fpa->projection->R -= 2.0*M_PI;
             RAminSky = fpa->projection->R - M_PI;
             RAmaxSky = fpa->projection->R + M_PI;
@@ -80 +86 @@
                     p_psDeproject (raw->sky, raw->TP, fpa->projection);
 
-                    if ((i < 10) && (psTraceGetLevel("psastro") > 5)) {
-                        fprintf (stderr, "up: %f,%f -> %f,%f -> %f,%f -> %f,%f\n",
+                    if (i < 10) {
+                        psTrace ("psastro", 8, "up: %f,%f -> %f,%f -> %f,%f -> %f,%f\n",
                                  raw->chip->x, raw->chip->y,
                                  raw->FP->x, raw->FP->y,
                                  raw->TP->x, raw->TP->y,
                                  raw->sky->r, raw->sky->d);
-
+                        
                         psPlane *fp = psPlaneAlloc();
                         psPlane *tp = psPlaneAlloc();
                         psPlane *ch = psPlaneAlloc();
-
+                        
                         p_psProject (tp, raw->sky, fpa->projection);
                         psPlaneDistortApply (fp, fpa->fromTangentPlane, tp, 0.0, 0.0);
                         psPlaneTransformApply (ch, chip->fromFPA, fp);
-
-                        fprintf (stderr, "dn: %f,%f <- %f,%f <- %f,%f <- %f,%f\n",
+                        
+                        psTrace ("psastro", 8, "dn: %f,%f <- %f,%f <- %f,%f <- %f,%f\n",
                                  ch->x, ch->y,
                                  fp->x, fp->y,
@@ -107 +113 @@
 
                     // rationalize ra to sky range centered on boresite
-                    while (raw->sky->r < RAminSky) raw->sky->r += M_PI;
-                    while (raw->sky->r > RAmaxSky) raw->sky->r -= M_PI;
+                    while (raw->sky->r < RAminSky) raw->sky->r += 2.0*M_PI;
+                    while (raw->sky->r > RAmaxSky) raw->sky->r -= 2.0*M_PI;
 
                     RAmin = PS_MIN (raw->sky->r, RAmin);
@@ -120 +126 @@
     }
 
-    psLogMsg ("psastro", 2, "loaded data from %f,%f - %f,%f\n", RAmin, DECmin, RAmax, DECmax);
+    psLogMsg ("psastro", 2, "loaded raw data from %f,%f to %f,%f\n", 
+              DEG_RAD*RAmin, DEG_RAD*DECmin, 
+              DEG_RAD*RAmax, DEG_RAD*DECmax);
 
     psMetadataAdd (recipe, PS_LIST_TAIL, "RA_MIN",  PS_DATA_F32 | PS_META_REPLACE, "", RAmin);