Changeset 4107 for trunk/MagicSoft/Cosy/main

Timestamp:

05/20/04 05:40:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MCosy.cc (modified) (3 diffs)
• MTracking.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -883 +883 @@
     cout << " *  Y: " << kGear.Y() << "*" << kResRE.Y()/4 << "/" << kResSE.Y() << "=4*" << kGearTot.Y() << "/" << kResSE.Y() << endl;
 }
-
+/*
 void MCosy::InitSync()
 {
@@ -899 +899 @@
     fMac3->StartPosSync();
 }
-
+*/
 void MCosy::TalkThreadSeTest()
 {
@@ -1042 +1042 @@
     }
 
-    InitSync();
+    //InitSync();
 
     /*** FOR DEMO MODE ***/

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -550 +550 @@
         //        time.Zd(fCosy->fMac2->GetMjd());
 
-        Double_t mjd1 = fCosy->fZd1->GetMjd();
-        Double_t mjd2 = fCosy->fZd2->GetMjd();
-        Double_t mjd0 = fCosy->fAz->GetMjd();
+        //Double_t mjd1 = fCosy->fZd1->GetMjd();
+        //Double_t mjd2 = fCosy->fZd2->GetMjd();
+        //Double_t mjd0 = fCosy->fAz->GetMjd();
+
+        Double_t mjdaz = fCosy->fMac1->GetPdoMjd();//mjd0;
+        Double_t mjdzd = fCosy->fMac2->GetPdoMjd();//TMath::Max(mjd1, mjd2);
 
         // get current position of shaftencoders (interpolated
@@ -565 +568 @@
         if (phca1 || phca2)
         {
-            ZdAz dummy = sla.CalcZdAz(fCosy->fRaDec, fCosy->fMac2->GetPdoMjd());//TMath::Max(mjd1, mjd2));
+            ZdAz dummy = sla.CalcZdAz(fCosy->fRaDec, mjdzd);
             dummy = fCosy->AlignTrackingPos(dummy);
             dummy = fCosy->fBending(dummy);
@@ -572 +575 @@
         if (phcaz)
         {
-            const Double_t mjd = fCosy->fMac1->GetMjd();
-            ZdAz dummy = sla.CalcZdAz(fCosy->fRaDec, fCosy->fMac1->GetPdoMjd());//mjd0);
+            ZdAz dummy = sla.CalcZdAz(fCosy->fRaDec, mjdaz);
             dummy = fCosy->AlignTrackingPos(dummy);
             dummy = fCosy->fBending(dummy);