Changeset 8869 for trunk/MagicSoft/Cosy/main

Timestamp:

02/21/08 22:03:06 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MSlewing.h (modified) (2 diffs)
• MTracking.cc (modified) (1 diff)
• MTracking.h (modified) (1 diff)

trunk/MagicSoft/Cosy/main/MSlewing.h

@@ -2 +2 @@
 #define COSY_MSlewing
 
-#ifndef MARS_MLog
-#include "MLog.h"
+#ifndef ROOT_TROOT
+#include <TROOT.h>
 #endif
 
@@ -10 +10 @@
 class ZdAz;
 
-class MSlewing : public MLog
+class MSlewing
 {
 protected:

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -269 +269 @@
      const Int_t paz  = fCosy->fAz->GetPos();
 
+     const Int_t res1 = fCosy->fZd1->GetPhysRes();
+     const Int_t res2 = fCosy->fZd2->GetPhysRes();
+
      // Get current shaftencoder position of the telescope
-     Double_t seposzd1 = ((pzd1+8192)%16384)*re.X();
-     Double_t seposzd2 = ((pzd2+8192)%16384)*re.X();
-     Double_t seposaz  =   paz              *re.Y();
+     Double_t seposzd1 = ((pzd1+res1/2)%res1)*re.X();
+     Double_t seposzd2 = ((pzd2+res2/2)%res2)*re.X();
+     //Double_t seposzd1 = pzd1*re.X();
+     //Double_t seposzd2 = pzd2*re.X();
+     Double_t seposaz  = paz *re.Y();
 
      // distance between (To+dt) and To [re]

trunk/MagicSoft/Cosy/main/MTracking.h

@@ -10 +10 @@
 #endif
 
+class MLog;
 class RaDec;
 class SlaStars;