Merge pull request #324 from Caltech-IPAC/DM-9581-RotaionMSXImage

lznakano · web-flow · commit 7934b973ff59 · 2017-03-03T11:29:39.000-08:00
DM-9581:MSX image rotation not computed correctly.
diff --git a/src/firefly/java/edu/caltech/ipac/visualize/plot/FitsRead.java b/src/firefly/java/edu/caltech/ipac/visualize/plot/FitsRead.java
@@ -53,6 +53,9 @@
  *  remove the mask testing codes since the mask is done in the mask branch.
  * 9/26/16
  *  DM-4127
+ *
+ *  3/1/17
+ *  DM-9581
  */
 public class FitsRead implements Serializable {
     //class variable
@@ -264,11 +267,11 @@ public static FitsRead createFitsReadRotated(FitsRead fitsReader, double rotatio
                     return fitsReader;
                 }
                 else {
-                    return createFitsReadPositionAngle(fitsReader, -angleToRotate, CoordinateSys.EQ_J2000);
+                    return createFitsReadPositionAngle(fitsReader, -angleToRotate, inCoordinateSys);
                 }
             }
             else {
-                return createFitsReadPositionAngle(fitsReader, -positionAngle+ rotationAngle, CoordinateSys.EQ_J2000);
+                return createFitsReadPositionAngle(fitsReader, -positionAngle+ rotationAngle, inCoordinateSys);
             }
         } catch (ProjectionException pe) {
             if (SUTDebug.isDebug()) {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@`
`53`	`53`	`* remove the mask testing codes since the mask is done in the mask branch.`
`54`	`54`	`* 9/26/16`
`55`	`55`	`* DM-4127`
	`56`	`+ *`
	`57`	`+ * 3/1/17`
	`58`	`+ * DM-9581`
`56`	`59`	`*/`
`57`	`60`	`public class FitsRead implements Serializable {`
`58`	`61`	`//class variable`
`@@ -264,11 +267,11 @@ public static FitsRead createFitsReadRotated(FitsRead fitsReader, double rotatio`
`264`	`267`	`return fitsReader;`
`265`	`268`	`}`
`266`	`269`	`else {`
`267`		`- return createFitsReadPositionAngle(fitsReader, -angleToRotate, CoordinateSys.EQ_J2000);`
	`270`	`+ return createFitsReadPositionAngle(fitsReader, -angleToRotate, inCoordinateSys);`
`268`	`271`	`}`
`269`	`272`	`}`
`270`	`273`	`else {`
`271`		`- return createFitsReadPositionAngle(fitsReader, -positionAngle+ rotationAngle, CoordinateSys.EQ_J2000);`
	`274`	`+ return createFitsReadPositionAngle(fitsReader, -positionAngle+ rotationAngle, inCoordinateSys);`
`272`	`275`	`}`
`273`	`276`	`} catch (ProjectionException pe) {`
`274`	`277`	`if (SUTDebug.isDebug()) {`