Changeset 9523 for trunk/MagicSoft/Cosy/main

Timestamp:

12/01/09 13:03:41 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MTracking.cc (modified) (8 diffs)
• MTracking.h (modified) (1 diff)

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -225 +225 @@
 //    if (fCosy->fStarguider)
 //        fCosy->fStarguider->SetPointingPosition(sla.GetRaDec());
-
-//    gLog << all << "=====> " << (int)(&sla==&fSlalib) << " " << fTrackType << " MJD=" << Form("%.13f", sla.GetMjd()) << " HA=" << sla.GetHourAngle() << " Alpha=" << sla.GetAlpha() << " fTrackPos.Ra()=" << fTrackPos.Ra() << " fTrackPos.Dec()=" << fTrackPos.Dec() << " Alt=" << sla.GetZdAzRad().Zd() << " Az=" << sla.GetZdAzRad().Az() << endl;
-}
-
-void MTracking::UpdateSlalib(Double_t dt=0)
+}
+
+void MTracking::UpdateSlalib(Double_t dt)
 {
     fSlalib.Now(dt);
@@ -248 +246 @@
     const RaDec &dst = fSlalib.GetRaDecRad();
 
-    ZdAz dest = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(dst);
-
-    if (fTrackType<0)
-       gLog << all << fSlalib.GetTime() << ": Tracking Planet" << endl;
+    ZdAz dest = fSlalib.GetZdAzRad();
+
+    if (fTrackType>=0)
+       gLog << all << fSlalib.GetTime() << ": Tracking Planet with Id " << fTrackType << endl;
     gLog << all << fSlalib.GetTime() << ": Track Position " << dst.Ra()*kRad2Deg/15 << "h, " << dst.Dec()*kRad2Deg <<"deg" << endl;
 
@@ -279 +277 @@
 void MTracking::TrackPosition(const RaDec &dst)
 {
-
-//    gLog << all << "=====> dst.Ra()=" << dst.Ra() << " dst.Dec()=" << dst.Dec() << "   (deg?)" << endl;
-
     fTrackPos  = dst;
     fTrackType = -1;
@@ -322 +317 @@
     // Get current nominal local position
     UpdateSlalib();
-    //fCosy->fRaDec = fSlalib.GetRaDec();
-
-    ZdAz pos = fSlalib.GetZdAzRad();//fSlalib.CalcZdAz(fSlalib.GetRaDec());
+
+    ZdAz pos = fSlalib.GetZdAzRad();
 
     // Some output
@@ -363 +357 @@
         //
         UpdateSlalib(dt);
-        //fCosy->fRaDec = fSlalib.GetRaDec();
 
         //
         // Request nominal position for this time in the future (To+dt)
         //
-        const ZdAz pointing = fSlalib.GetZdAzRad(); //fSlalib.CalcZdAz(fSlalib.GetRaDec()); // [rad]
+        const ZdAz pointing = fSlalib.GetZdAzRad();
         ZdAz dest = fCosy->AlignTrackingPos(pointing);     // fix ambiguity
 
@@ -461 +454 @@
     //SlaPlanets sla(fSlalib.GetObservatoryKey());
     SlaPlanets sla(MObservatory::kMagic1);
-//    gLog << all << "====> KEYS " << (int)fSlalib.GetObservatoryKey() << " " << (int)sla.GetObservatoryKey() << " " << (int)fCosy->fObservatory << endl;
 
     UpdateSlalib(sla);
-
-    //ZdAz soll = sla.GetZdAz(); //sla.CalcZdAz(sla.GetRaDec()); // [rad]
 
     //
@@ -507 +497 @@
             UpdateSlalib(sla, mjdzd);
 
-            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdzd);
+            ZdAz dummy = sla.GetZdAzRad();
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Zd(dummy.Zd());
@@ -518 +508 @@
             UpdateSlalib(sla, mjdaz);
 
-            ZdAz dummy = sla.GetZdAzRad();//sla.CalcZdAz(radec, mjdaz);
+            ZdAz dummy = sla.GetZdAzRad();
             dummy = fCosy->AlignTrackingPos(dummy);
             fCosy->fZdAzSoll.Az(dummy.Az());

trunk/MagicSoft/Cosy/main/MTracking.h

@@ -31 +31 @@
 
     void UpdateSlalib(SlaPlanets &sla);
-    void UpdateSlalib(Double_t dt);
+    void UpdateSlalib(Double_t dt=0);
     void UpdateSlalib(SlaPlanets &sla, Double_t mjd);