Changeset 1953 for trunk/MagicSoft/Cosy/catalog

Timestamp:

04/12/03 19:06:27 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/catalog

Files:

• SlaStars.h (modified) (1 diff)
• StarCatalog.cc (modified) (4 diffs)
• StarCatalog.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -40 +40 @@
     ZdAz   CalcZdAz (const RaDec &radec) const;
 
+    AltAz  CalcAltAz(const RaDec &radec, double mjd)
+    { SetMjd(mjd); return CalcAltAz(radec); }
+    ZdAz   CalcZdAz (const RaDec &radec, double mjd)
+    { SetMjd(mjd); return CalcZdAz(radec); }
+
     AltAz  CalcAltAzFast(const RaDec &radec) const;
     ZdAz   CalcZdAzFast (const RaDec &radec) const;

trunk/MagicSoft/Cosy/catalog/StarCatalog.cc

@@ -14 +14 @@
 ClassImp(StarCatalog);
 
-StarCatalog::StarCatalog(MObservatory::LocationName_t key) : SlaStars(key), fEntries(0)
+StarCatalog::StarCatalog(MObservatory::LocationName_t key) : SlaStars(key), fEntries(0), fSinAngle(0), fCosAngle(1)
 {
     // p = pointer to MainFrame (not owner)
@@ -505 +505 @@
     // Align alt/az[pix]
     //
-    const int xx = 767-(int)((fWidth-dx+DPI)/fPixSize);
-    const int yy =     (int)((fHeight+dy)/fPixSize);
+    const int xx = (int)(((dx-DPI)*fCosAngle - dy*fSinAngle + fWidth)/fPixSize);
+    const int yy = (int)(((dx-DPI)*fSinAngle + dy*fCosAngle + fHeight)/fPixSize);
+    //const int xx = 767-(int)((fWidth-dx+DPI)/fPixSize);
+    //const int yy =     (int)((fHeight+dy)/fPixSize);
 
     //
@@ -685 +687 @@
 
             //
-            // Align alt/az[pix]
-            //
-            const float xx = 768.0 - (fWidth -dx+DPI)/fPixSize;
-            const float yy =         (fHeight+dy)    /fPixSize;
+            // Align and rotate alt/az[pix]
+            //
+            float xx = ((dx-DPI)*fCosAngle - dy*fSinAngle + fWidth)/fPixSize;
+            float yy = ((dx-DPI)*fSinAngle + dy*fCosAngle + fHeight)/fPixSize;
 
             //
@@ -710 +712 @@
 AltAz StarCatalog::CalcAltAzFromPix(Double_t pixx, Double_t pixy) const
 {
-    Double_t dx = (pixx-768.0)*fPixSize + fWidth+DPI;
-    Double_t dy =         pixy*fPixSize - fHeight;
+    pixx *= fPixSize;
+    pixy *= fPixSize;
+
+    const double dx =  (pixx-fWidth)*fCosAngle + (pixy-fHeight)*fSinAngle;
+    const double dy = -(pixx-fWidth)*fSinAngle + (pixy-fHeight)*fCosAngle;
+
+    //const double dx = (pixx-768.0)*fPixSize + fWidth+DPI;
+    //const double dy =         pixy*fPixSize - fHeight;
 
     double ha, dec;

trunk/MagicSoft/Cosy/catalog/StarCatalog.h

@@ -28 +28 @@
     double   fWidth;    // size of display
     double   fHeight;   //
+    double   fSinAngle;
+    double   fCosAngle;
 
     float    fLimitMag; // [M] limiting magnitude for display
@@ -87 +89 @@
     void  SetPixSize(const double pixsize);
     void  SetLimitMag(const float mag) { fLimitMag = mag; }
+    void  SetRotationAngle(const float angle) { fSinAngle = sin(angle/kRad2Deg); fCosAngle = cos(angle/kRad2Deg); }
 
     double GetPixSize() const;