Changeset 34772 for branches/czw_branch/20120906/psModules/src/objects/pmSourceOutputs.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/psModules

Files:

• . (modified) (1 prop)
• src/objects (modified) (1 prop)
• src/objects/pmSourceOutputs.c (modified) (1 diff)

branches/czw_branch/20120906/psModules/src/objects

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+

branches/czw_branch/20120906/psModules/src/objects/pmSourceOutputs.c

@@ -227 +227 @@
     *pltScale = 0.5*(pltScale_x + pltScale_y);
 
+    float posAngle_x, posAngle_y;
     float crossProduct = dTPx_dCHx * dTPy_dCHy - dTPx_dCHy * dTPy_dCHx;
     if  (crossProduct > 0.) {
       *pltScale *= -1.0;
-    }
-
-    float posAngle_x = atan2 (+dTPy_dCHx, +dTPx_dCHx);
-    float posAngle_y = atan2 (-dTPy_dCHy, +dTPx_dCHy);
+      posAngle_x = atan2 (dTPy_dCHx, dTPx_dCHx);
+      posAngle_y = atan2 (dTPy_dCHy, dTPx_dCHy) - M_PI_2;
+    } else {
+      posAngle_x = atan2 (dTPy_dCHx, -dTPx_dCHx);
+      posAngle_y = atan2 (dTPy_dCHy,  dTPx_dCHy) - M_PI_2;
+    }
+
+    // with errors, these may end up on opposite sides of the M_PI boundary.  
+    if (posAngle_x - posAngle_y > M_PI) {
+      posAngle_y += 2.0 * M_PI;
+    }
+    if (posAngle_y - posAngle_x > M_PI) {
+      posAngle_x += 2.0 * M_PI;
+    }
     *posAngle = 0.5*(posAngle_x + posAngle_y);
 

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_SV2.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
+pmSourceIO_CMF_PS1_DV3.c
+