Changeset 8871

Timestamp:

02/22/08 11:44:53 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• main/MTracking.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -9 +9 @@
      - changed version number from 0.69 to 0.70
      - move the arbitrary factor 4 from cosy to aposs
+
+   * devdrv/macs.cc:
+     - changed the requires software version from 0.69 to 0.70
+     - do not start the node automatically
+
+   * main/MStarguider.cc:
+     - added an ExitLoop for fGetter
+     - added a sanity check if GetDriveCom returns a valid pointer
+
+   * main/MTracking.cc:
+     - removed the arbitrary factor 4 from the code (it is now 
+       implemented in the MACS)
 
 

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -222 +222 @@
     const Float_t maxtrack = 0.1;
 
-    if (fabs(vt->Az()) > maxtrack*vraz*4)
-    {
-        vt->Az(maxtrack*vraz*4*sgn(vcalc.Az()));
+    if (fabs(vt->Az()) > maxtrack*vraz)
+    {
+        vt->Az(maxtrack*vraz*sgn(vcalc.Az()));
         gLog << warn << "Warning: Azimuth speed limit (" << maxtrack*100 << "%) exceeded (" << fabs(vt->Az()) << " > " << maxtrack*vraz << ")... limited." << endl;
         gLog << "Vcalc: " << vcalc.Zd() << " " << vcalc.Az() << "re/min" <<endl;
         rc=kTRUE;
     }
-    if (fabs(vt->Zd()) > maxtrack*vrzd*4)
-    {
-        vt->Zd(maxtrack*vrzd*4*sgn(vcalc.Zd()));
+    if (fabs(vt->Zd()) > maxtrack*vrzd)
+    {
+        vt->Zd(maxtrack*vrzd*sgn(vcalc.Zd()));
         gLog << warn << "Warning: Altitude speed limit (" << maxtrack*100 << "%) exceeded (" << fabs(vt->Zd()) <<" > " << maxtrack*vrzd << ")... limited." << endl;
         gLog << "Vcalc: " << vcalc.Zd() << " " << vcalc.Az() << "re/min" <<endl;
@@ -485 +485 @@
         // believing the Macs manual '/4' shouldn't be necessary, but it is.
         //
-        ZdAz vt = v/4; //[re'/min]
+        ZdAz vt = v; //[re'/min]
         //lout << " " << vt.Zd() << " " << vt.Az() << " ";
         vt.Round();
@@ -511 +511 @@
         // Now do 'unnecessary' things (timing)
         //
-        fCosy->fVelocity = vt*4/fCosy->kGear; // [U_mot/min]
+        fCosy->fVelocity = vt/fCosy->kGear; // [U_mot/min]
         // *OLD* fVelocity = vt/kGearRatio2*4;