Changeset 8864 for trunk/MagicSoft/Cosy/main

Timestamp:

02/17/08 22:39:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/main/MCosy.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -143 +143 @@
     // Get the values          (FIXME!)
     //
-    int p1 =  (fZd1->GetPos()/*+8192*/)%fZd1->GetPhysRes();
-    int p2 = -(fZd2->GetPos()/*+8192*/)%fZd2->GetPhysRes();
+    //int p1 =  (fZd1->GetPos()+fZd1->GetPhysRes()/2)%fZd1->GetPhysRes();
+    //int p2 = -(fZd2->GetPos()+fZd2->GetPhysRes()/2)%fZd2->GetPhysRes();
+
+    int p1 =  fZd1->GetPos();//+fZd1->GetPhysRes()/2)%fZd1->GetPhysRes();
+    int p2 = -fZd2->GetPos();//+fZd2->GetPhysRes()/2)%fZd2->GetPhysRes();
 
     if (fZd1->IsZombieNode())
@@ -562 +565 @@
         fMac1->HandleError();
         fMac2->HandleError();
-        fMac3->HandleError();
+        if (fMac3)
+            fMac3->HandleError();
         if (HasError() || HasZombie())
             return false;
@@ -948 +952 @@
     gLog << " * Max:  " << zmax << "deg  " << amax << "deg" << endl;
 
-    fMin = fBending.AddOffsets(fMin/TMath::RadToDeg());
-    fMax = fBending.AddOffsets(fMax/TMath::RadToDeg());
+    fMin = fBending.AddOffsets(fMin*TMath::DegToRad());
+    fMax = fBending.AddOffsets(fMax*TMath::DegToRad());
 
     gLog << " * Min': " << fMin.Zd()*TMath::RadToDeg() << "deg  " << fMin.Az()*TMath::RadToDeg() << "deg" << endl;
@@ -1628 +1632 @@
     gLog << inf << "Open Repfile: " << name << endl;
     fOutRep = new MLog(name, kTRUE);
-    *fOutRep << "[Drive Report File]" << endl;
+    *fOutRep << all << "[Drive Report File]" << endl;
     *fOutRep << "Version <cvs>" << endl;
     *fOutRep << "Date " << MTime(-1) << endl;