Changeset 9550 for trunk/MagicSoft/Cosy/main

Timestamp:

02/23/10 10:17:52 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• CosyMainLinkDef.h (modified) (1 diff)
• MCosy.cc (modified) (16 diffs)
• MCosy.h (modified) (2 diffs)
• MMoonPointing.cc (added)
• MMoonPointing.h (added)
• MTracking.cc (modified) (4 diffs)
• MTracking.h (modified) (3 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Cosy/main/CosyMainLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MSlewing+;
 #pragma link C++ class MTracking+;
+#pragma link C++ class MMoonPointing+;
 
 #endif

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -351 +351 @@
 }
 
-void MCosy::TrackPlanet(const Int_t &p) // ra, dec [rad]
+void MCosy::TrackPlanet(Int_t id, Double_t offset, Double_t angle)
 {
     MTracking track(this);
@@ -360 +360 @@
     track.SetTrackAcc(0.01, 0.01);
 
-    track.TrackPlanet((ePlanets_t)p);
-}
-
-void MCosy::TrackPosition(const RaDec &dst) // ra, dec [rad]
+    track.SetWobble(offset, angle);
+    track.TrackPlanet((ePlanets_t)id);
+}
+
+void MCosy::TrackMoon(Double_t wobble, Double_t offset)
 {
     MTracking track(this);
@@ -372 +373 @@
     track.SetTrackAcc(0.01, 0.01);
 
+    track.TrackMoon(wobble, offset);
+}
+
+void MCosy::TrackPosition(const RaDec &dst) // ra, dec [rad]
+{
+    MTracking track(this);
+    track.SetOut(fOutRep);
+
+    track.SetPointAcc(0.03, 0.01);
+    track.SetPointVelocity(0.3);
+    track.SetTrackAcc(0.01, 0.01);
+
+    //track.SetWobbleOffset(offset, angle);
     track.TrackPosition(dst);
 }
@@ -386 +400 @@
     track.SetTrackAcc(0.01, 0.01);
 
+    //track.SetWobbleOffset(offset, angle);
     track.TrackPosition(dst);
 }
@@ -530 +545 @@
             //cout << "WM_TPoint: done. (return 0xaffe)" << endl;
         }
-        return 0xca1b;
+        break;
 
     case WM_STARGTPOINT:
         if (fStarguider)
             fStarguider->StartTPoint((char*)mp);
-        return 0xca1c;
+        break;
 
     case WM_STARGMODE:
         if (fStarguider)
             fStarguider->StartStarguider(*((bool*)mp));
-        return 0xca1c;
+        break;
 
     case WM_TRACKPOS:
@@ -559 +574 @@
         }
         //cout << "WM_TrackPosition: done. (return 0xabcd)" << endl;
-        return 0xabcd;
+        break;
 
     case WM_ARM:
@@ -580 +595 @@
         }
         //cout << "WM_Position: done. (return 0x7777)" << endl;
-        return 0x9999;
+        break;
 
     case WM_POSITION:
@@ -592 +607 @@
         }
         //cout << "WM_Position: done. (return 0x7777)" << endl;
-        return 0x7777;
+        break;
 
     case WM_POSITION1:
@@ -604 +619 @@
         }
         //cout << "WM_Position: done. (return 0x7777)" << endl;
-        return 0x7777;
+        break;
 
     case WM_PREPS:
@@ -644 +659 @@
         }
         //cout << "WM_Track: done. (return 0x8888)" << endl;
-        return 0x7878;
+        break;
 /*
     case WM_TESTSE:
@@ -678 +693 @@
         }
         //cout << "WM_Track/GRB: done. (return 0x8888)" << endl;
-        return 0x8888;
-
-    case WM_PLANET:
+        break;
+
+    case WM_CELEST:
         //cout << "WM_PLANET: START" << endl;
         {
-            const Int_t p = ((Int_t*)mp)[0];
             if (!CheckNetwork())
                 return 0xebb1;
 
-            TrackPlanet(p);
+            const Double_t *d = (Double_t*)mp;
+
+            const Int_t    id     = TMath::Nint(d[0]);
+            const Double_t offset = d[1];
+            const Double_t angle  = d[2];
+
+            TrackPlanet(id, offset, angle);
         }
         //cout << "WM_PLANET: done. (return 0x8889)" << endl;
-        return 0x8889;
+        break;
+
+    case WM_MOON:
+        //cout << "WM_PLANET: START" << endl;
+        {
+            if (!CheckNetwork())
+                return 0xebb1;
+
+            const Double_t *d = (Double_t*)mp;
+
+            const Double_t wobble = d[0];
+            const Double_t offset = d[1];
+
+            TrackMoon(wobble, offset);
+        }
+        //cout << "WM_PLANET: done. (return 0x8889)" << endl;
+        break;
 /*
     case WM_NEWTRACK:
@@ -702 +738 @@
         fBending.Load("bending.txt");
         //cout << "WM_LoadBending: done. (return 0xbe0d)" << endl;
-        return 0xbe0d;
+        break;
 
     case WM_RESETBENDING:
@@ -708 +744 @@
         fBending.Reset();
         //cout << "WM_ResetBending: done. (return 0xbe0e)" << endl;
-        return 0xbe0e;
+        break;
 
     case WM_CALCALTAZ:
@@ -737 +773 @@
             cout << "SE bended:     " << a2.Zd() << "  " << a2.Az() << endl;
         }
-        return 0xa17a;
+        break;
 
     case WM_ENDSWITCH:
@@ -747 +783 @@
             cout << pos.Az() << "°" << endl;
         }
-
-        return 0x1010;
+        break;
 
     case WM_QUIT:
@@ -759 +794 @@
         TerminateApp();
         cout << "WM_Quit: done." << endl;
-        return 0xaaaa;
-    }
-    cout << "MCosy::Proc: Unknown message 0x" << msg << endl;
-    return 0xffffffff;
+        break;
+
+    default:
+        cout << "MCosy::Proc: Unknown message 0x" << msg << endl;
+        return 0xffffffff;
+    }
+
+    return msg;
 }
 

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -46 +46 @@
 #define WM_STARGTPOINT  0x1014
 #define WM_STARGMODE    0x1015
-#define WM_PLANET       0x1016
+#define WM_CELEST       0x1016
+#define WM_MOON         0x1017
 
 class Dkc;
@@ -103 +104 @@
 
     int  SetPosition(const ZdAz &dst, Bool_t track=kFALSE);
-    void TrackPlanet(const Int_t &p);
+    void TrackPlanet(Int_t id, Double_t offset, Double_t angle);
+    void TrackMoon(Double_t wobble, Double_t offset);
     void TrackPosition(const RaDec &dst);    // ra, dec [rad]
     void TrackPositionGRB(const RaDec &dst); // ra, dec [rad]

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -12 +12 @@
 #include "MDriveCom.h"
 
+#include "MMoonPointing.h"
+
 ClassImp(MTracking);
 
@@ -21 +23 @@
 MTracking::MTracking(MCosy *cosy)
     : MSlewing(cosy), MThread("MTracking"), fSlalib(fCosy->fObservatory),
-    fTrackAcc(0, 0), fOut(0)
+    fTrackAcc(0, 0), fWobbleOffset(-1), fWobbleAngle(0), fOut(0)
 {
 }
@@ -221 +223 @@
         sla.Set(fTrackPos/TMath::DegToRad());
     else
-        sla.SetPlanet((ePlanets_t)fTrackType);
-
-//    if (fCosy->fStarguider)
-//        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
+        sla.SetPlanet((ePlanets_t)(fTrackType&0xff));
+
+    if (fTrackType==(kEMoon|0x100))
+    {
+        MMoonPointing moon("MoonShadowOffsets.root");
+        if (moon.IsZombie())
+        {
+            gLog << warn << "WARNING - Calculation of moon shadow failed." << endl;
+            return;
+        }
+
+        moon.SetOffsetShadow(fWobbleAngle);
+        moon.SetOffsetWobble(fWobbleOffset);
+
+        ZdAz srcpos, pointpos;
+
+        const ZdAz za     = sla.GetZdAzRad();
+        const ZdAz offset = moon.CalcPosition(za, srcpos, pointpos);
+        sla.ApplyOffsetZdAz(pointpos-za);
+
+        // Ra/Dec, Zd/Az from pointpos
+        // NEW: Source pos from srcpos
+    }
+        /*
+    else
+        if (fWobbleOffset>0)
+        {
+            MPositionOffsetCalc calc(fWobbleOffset, fWobbleAngle);
+            const ZdAz offset = calc.GetOffset(sla.GetZdAzRad());
+            //if (srcpos.Zd()==0)
+            //    return kFALSE;
+            sla.ApplyOffsetAltAz(offset);
+        }
+        */
+    //    if (fCosy->fStarguider)
+    //        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
 }
 
@@ -288 +322 @@
     fTrackPos  = RaDec();
     fTrackType = planet;
+
+    // Start tracking
+    Track();
+}
+
+void MTracking::TrackMoon(Double_t wobble, Double_t offset)
+{
+    fTrackPos  = RaDec();
+    fTrackType = kEMoon|0x100;
+
+    fWobbleOffset = wobble;
+    fWobbleAngle  = offset;
 
     // Start tracking

trunk/MagicSoft/Cosy/main/MTracking.h

@@ -28 +28 @@
     RaDec fTrackPos;
 
+    Double_t fWobbleOffset;
+    Double_t fWobbleAngle;
+
     MLog   *fOut;
 
@@ -42 +45 @@
     Int_t Thread();
 
+    ZdAz GetZdAzRad(const Slalib &sla);
+
 public:
     MTracking(MCosy *cosy);
@@ -47 +52 @@
     void TrackPosition(const RaDec &dst); // ra, dec [rad]
     void TrackPlanet(ePlanets_t planet);  // ra, dec [rad]
+    void TrackMoon(Double_t wobble, Double_t offset);
     void SetTrackAcc(Float_t zd, Float_t az) { fTrackAcc.Zd(zd); fTrackAcc.Az(az); }
+
+    void SetWobble(Double_t offset, Double_t angle=0) { fWobbleOffset=offset; fWobbleAngle=angle; }
 
     void SetOut(MLog *fout) { fOut = fout; }

trunk/MagicSoft/Cosy/main/Makefile

@@ -18 +18 @@
 #------------------------------------------------------------------------------
 
-SRCFILES = MStarguider.cc \
-           MStargHistograms.cc \
-           MSlewing.cc \
+SRCFILES = MSlewing.cc \
            MTracking.cc \
+           MMoonPointing.cc \
            MCaos.cc \
+           MStarguider.cc \
+           MStargHistograms.cc \
            MCosy.cc