Changeset 10008 for trunk/Cosy/main

Timestamp:

10/14/10 13:47:48 (14 years ago)

Author:

tbretz

Message:

Mainly unit fixes to get the moon tracking working.

Location:

trunk/Cosy/main

Files:

• MMoonPointing.cc (modified) (4 diffs)
• MSlewing.cc (modified) (1 diff)

trunk/Cosy/main/MMoonPointing.cc

@@ -22 +22 @@
 public:
     MPositionOffsetCalc(Double_t offset) :
-        fCosOffset(offset==0 ? 0 : TMath::Cos(offset*TMath::DegToRad())),
-        fSinOffset(offset==0 ? 0 : TMath::Sin(offset*TMath::DegToRad())),
+        fCosOffset(offset==0 ? 0 : TMath::Cos(offset)),
+        fSinOffset(offset==0 ? 0 : TMath::Sin(offset)),
         fCosAngle(0), fSinAngle(0)
     {
@@ -29 +29 @@
 
     MPositionOffsetCalc(Double_t offset, Double_t angle) :
-        fCosOffset(offset==0 ? 0 : TMath::Cos(offset*TMath::DegToRad())),
-        fSinOffset(offset==0 ? 0 : TMath::Sin(offset*TMath::DegToRad())),
+        fCosOffset(offset==0 ? 0 : TMath::Cos(offset)),
+        fSinOffset(offset==0 ? 0 : TMath::Sin(offset)),
         fCosAngle(TMath::Cos(angle*TMath::DegToRad())),
         fSinAngle(TMath::Sin(angle*TMath::DegToRad()))
@@ -37 +37 @@
 
     MPositionOffsetCalc(Double_t offset, Double_t cos, Double_t sin) :
-        fCosOffset(offset==0 ? 0 : TMath::Cos(offset*TMath::DegToRad())),
-        fSinOffset(offset==0 ? 0 : TMath::Sin(offset*TMath::DegToRad())),
+        fCosOffset(offset==0 ? 0 : TMath::Cos(offset)),
+        fSinOffset(offset==0 ? 0 : TMath::Sin(offset)),
         fCosAngle(cos), fSinAngle(sin)
     {
@@ -133 +133 @@
 Bool_t MMoonPointing::CalcPosition(const ZdAz &moon, ZdAz &srcpos, ZdAz &pointpos) const
 {
-    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());
+    const Double_t az = fmod(moon.Az()+TMath::TwoPi(), TMath::TwoPi());
+
+    const Double_t fcos = const_cast<TGraph2D&>(fCos).Interpolate(az, moon.Zd());
+    const Double_t fsin = const_cast<TGraph2D&>(fSin).Interpolate(az, moon.Zd());
 
     // This is a sanity check for the case the Interpolation failed

trunk/Cosy/main/MSlewing.cc

@@ -134 +134 @@
     const ZdAz dest = bend/TMath::TwoPi();   // [revolutions]
 
+    // Check whether bending is valid!
+
     if (!fCosy->CheckRange(bend))
         return kFALSE;