Changeset 9554 for trunk

Timestamp:

02/25/10 11:26:20 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• catalog/SlaStars.cc (modified) (1 diff)
• catalog/SlaStars.h (modified) (1 diff)
• main/MMoonPointing.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -4 +4 @@
    * main/MMoonPointing.h:
      - changed comment
+     - added a few sanity checks to avoid unnecessary calculations
 
    * main/MTracking.[h,cc]:
      - changed internal units of offsets to rad
+     - interpret result of moon.CalcPosition correctly
+
+   * catalog/SlaStars.[h,cc]:
+     - removed obsolete ApplyOffset
 
 

trunk/MagicSoft/Cosy/catalog/SlaStars.cc

@@ -21 +21 @@
 {
     fAltAz = AltAz(TMath::Pi()/2-zdaz.Zd(), zdaz.Az()) * TMath::DegToRad();
-    fRaDec = CalcRaDec(fAltAz);
-}
-
-void SlaStars::ApplyOffsetAltAz(const AltAz &offset)
-{
-    fAltAz += offset;
     fRaDec = CalcRaDec(fAltAz);
 }

trunk/MagicSoft/Cosy/catalog/SlaStars.h

@@ -61 +61 @@
     ZdAz   CalcZdAzFast (const RaDec &radec) const;
 
-    void   ApplyOffsetAltAz(const AltAz &offset);
-    void   ApplyOffsetZdAz(const ZdAz &offset) { ApplyOffsetAltAz(AltAz(-offset.Zd(), offset.Az())); }
-
     ClassDef(SlaStars, 0)
 };

trunk/MagicSoft/Cosy/main/MMoonPointing.cc

@@ -119 +119 @@
 Bool_t MMoonPointing::CalcPosition(const ZdAz &moon, ZdAz &srcpos, ZdAz &pointpos) const
 {
+    // Avoid unnecessary calculations
+    if (fOffsetShadow==0)
+    {
+        pointpos = srcpos = moon;
+        return kTRUE;
+    }
+
     const Double_t fcos = const_cast<TGraph2D&>(fCos).Interpolate(moon.Az(), moon.Zd());
     const Double_t fsin = const_cast<TGraph2D&>(fSin).Interpolate(moon.Az(), moon.Zd());
@@ -133 +140 @@
         return kFALSE;
 
+    // Avoid unnecessary calculations
+    if (fOffsetWobble==0)
+    {
+        pointpos = srcpos;
+        return kTRUE;
+    }
+
     // Calaculate Telescope pointing position:
     const MPositionOffsetCalc calc2(fOffsetWobble, cs, sn);