Changeset 8862 for trunk/MagicSoft/Cosy/main

Timestamp:

02/13/08 19:44:39 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/main

Files:

• MCosy.cc (modified) (14 diffs)
• MCosy.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -16 +16 @@
 #include "MLogManip.h"
 
+#include "MEnv.h"
 #include "MTime.h"
 #include "MPointing.h"
@@ -140 +141 @@
 
     //
-    // Get the values
-    //
-    int p1 =  (fZd1->GetPos()+8192)%16384;
-    int p2 = -(fZd2->GetPos()+8192)%16384;
+    // Get the values          (FIXME!)
+    //
+    int p1 =  (fZd1->GetPos()/*+8192*/)%fZd1->GetPhysRes();
+    int p2 = -(fZd2->GetPos()/*+8192*/)%fZd2->GetPhysRes();
 
     if (fZd1->IsZombieNode())
@@ -930 +931 @@
 }
 
-void MCosy::ReadConfig()
-{
-    gLog << inf2 << "Reading configuration file..." << flush;
-    TEnv env(".cosyrc");
-    gLog << "done." << endl;
-
+void MCosy::ReadConfig(MEnv &env)
+{
     gLog << inf2 << "Reading telescope range..." << flush;
     const Double_t amin = env.GetValue("Az_Min[deg]", -95.0);
@@ -946 +943 @@
     gLog << "done." << endl;
 
-    gLog << all << " * Min:  " << zmin << "deg  " << amin << "deg" << endl;
-    gLog << all << " * Max:  " << zmax << "deg  " << amax << "deg" << endl;
+    gLog << all << flush;
+
+    gLog << " * Min:  " << zmin << "deg  " << amin << "deg" << endl;
+    gLog << " * Max:  " << zmax << "deg  " << amax << "deg" << endl;
 
     fMin = fBending.AddOffsets(fMin/TMath::RadToDeg());
     fMax = fBending.AddOffsets(fMax/TMath::RadToDeg());
 
-    gLog << all << " * Min': " << fMin.Zd()*TMath::RadToDeg() << "deg  " << fMin.Az()*TMath::RadToDeg() << "deg" << endl;
-    gLog << all << " * Max': " << fMax.Zd()*TMath::RadToDeg() << "deg  " << fMax.Az()*TMath::RadToDeg() << "deg" << endl;
-
-    gLog << inf2 << "Reading gear ratios..." << flush;
-//    kGear.X(env.GetValue("Zd_GearRatio[U_mot/U_tel]", 1000.0));
-//    kGear.Y(env.GetValue("Az_GearRatio[U_mot/U_tel]", 1000.0));
+    gLog << " * Min': " << fMin.Zd()*TMath::RadToDeg() << "deg  " << fMin.Az()*TMath::RadToDeg() << "deg" << endl;
+    gLog << " * Max': " << fMax.Zd()*TMath::RadToDeg() << "deg  " << fMax.Az()*TMath::RadToDeg() << "deg" << endl;
+
     kGear.Set(env.GetValue("Zd_GearRatio[U_mot/U_tel]", 1000.0),
               env.GetValue("Az_GearRatio[U_mot/U_tel]", 1000.0));
@@ -975 +971 @@
     kResRE.Set(x,y);
 
-    x = zd1 ? fZd1->GetPhysRes() : (zd2 ? fZd2->GetPhysRes() : env.GetValue("Zd_ResSE[se/U_mot]", 16384));
-    y = az  ? fAz->GetPhysRes() : env.GetValue("Az_ResSE[se/U_mot]", 16384);
+    gLog << " * Az RE resolution: " << x << " re/U_mot" << endl;
+    gLog << " * Zd RE resolution: " << y << " re/U_mot" << endl;
+
+    x = zd1 ? fZd1->GetPhysRes() : (zd2 ? fZd2->GetPhysRes() : env.GetValue("Zd_ResSE[se/U_tel]", 16384));
+    y = az  ? fAz->GetPhysRes() : env.GetValue("Az_ResSE[se/U_tel]", 16384);
     kResSE.Set(x,y);
+
+    gLog << " * Az SE resolution: " << x << " se/U_tel" << endl;
+    gLog << " * Zd SE resolution: " << y << " se/U_tel" << endl;
 
     /*
@@ -1019 +1021 @@
 //    kGearTot = kResRE*kGear;
 
-    gLog << "done." << endl;
-
-    gLog << all;
-    gLog << " * Setting Gear Ratios:" << endl;
-    gLog << "   --------------------" << endl;
+//    gLog << all;
+//    gLog << " * Setting Gear Ratios:" << endl;
+ //   gLog << "   --------------------" << endl;
     gLog << " *  X: " << kGear.X() << "*" << kResRE.X()/4 << "/" << kResSE.X() << "=4*" << kGearTot.X() << "/" << kResSE.X() << endl;
     gLog << " *  Y: " << kGear.Y() << "*" << kResRE.Y()/4 << "/" << kResSE.Y() << "=4*" << kGearTot.Y() << "/" << kResSE.Y() << endl;
@@ -1065 +1065 @@
 
     gLog << inf2 << "Starting Shaftencoder Test..." << endl;
+
+    gLog << err << "Build in values!!!" << endl;
 
     while (fBackground==kBgdSeTest)
@@ -1434 +1436 @@
 // turn on the gui update
 //
-void MCosy::Start()
+void MCosy::Start(MEnv &env)
 {
     // Don't call this function twice!
@@ -1441 +1443 @@
     CheckForError();
 
-    ReadConfig();
+    ReadConfig(env);
 
     gLog << inf << "- Starting TX Thread." << endl;
@@ -1610 +1612 @@
 }
 
-MCosy::MCosy()
+MCosy::MCosy(MEnv &env, const char *addr, const char *pointing)
 : Network(), fObservatory(MObservatory::kMagic1), fStarguider(NULL),
 fZd1(0), fZd2(0), fAz(0), fMac1(0), fMac2(0), fMac3(0),
@@ -1616 +1618 @@
 fOutTp(0), fOutRep(0)
 {
-    TEnv env(".cosyrc");
     const Int_t id1 = env.GetValue("Az_Id-MAC1", 1); //1
     const Int_t id2 = env.GetValue("Az_Id-MAC2", 2); //2
@@ -1637 +1638 @@
     {
     case 0:
-        gLog << "<<Standard mode>>" << endl;*/
-        fBending.Load("bending.txt");
+    gLog << "<<Standard mode>>" << endl;*/
+        gLog << all << "Reading pointing model from " << pointing << "..." << endl;
+        if (fBending.Load(pointing))
+            gLog << all << "Reading pointing model from " << pointing << " successfull." << endl;
+        else
+            gLog << err << "ERROR - Reading pointing model from " << pointing << endl;
         Constructor(id1, id2, id3, id4, id5, id6);/*
         break;
@@ -1651 +1656 @@
     }
 */
+
     gLog.SetOutputGui(fWin->GetLog(), kTRUE);
 
@@ -1657 +1663 @@
     fAz->SetDisplay(fWin->GetLabel1());
 
-    fCom = new MDriveCom(this, fOutRep);
+    fCom = new MDriveCom(this, addr, fOutRep);
 //    fCom->Start();
 }

trunk/MagicSoft/Cosy/main/MCosy.h

@@ -52 +52 @@
 class MStarguider;
 class MDriveCom;
+class MEnv;
 
 class MTTalk : public MThread
@@ -173 +174 @@
     //void ConstructorDemo();
 
-    void ReadConfig();
+    void ReadConfig(MEnv &env);
 
     bool CheckNetwork();
 
+    void Start() { }
+
 public:
-    MCosy();
+    MCosy(MEnv &env, const char *addr, const char *pointing);
     ~MCosy();
 
-    void Start();
+    void Start(MEnv &env);
     void Stop();