Changeset 9515 for trunk

Timestamp:

10/21/09 09:52:52 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• candrv/canopen.cc (modified) (1 diff)
• caos/Ring.cc (modified) (1 diff)
• gui/MGEmbeddedCanvas.cc (modified) (1 diff)
• tcpip/MDriveCom.cc (modified) (1 diff)
• tpoint/TPointStar.h (modified) (1 diff)
• videodev/FilterLed.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -631 +631 @@
 WORD_t CanOpen::CobId(BYTE_t node, BYTE_t fcode) const
 {
-    return (fcode<<7) | node&0x1f;
-}
+    return (fcode<<7) | (node&0x1f);
+}

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -2 +2 @@
 
 #include <iostream>
+
+#include <math.h>
 
 #include "Led.h"

trunk/MagicSoft/Cosy/gui/MGEmbeddedCanvas.cc

@@ -8 +8 @@
 
 #include <iostream>
+
+#include <math.h>
 
 #include <TList.h>

trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc

@@ -2 +2 @@
 
 #include <iostream>
+
+#include <TObjArray.h>
 
 #include "MAstro.h"

trunk/MagicSoft/Cosy/tpoint/TPointStar.h

@@ -36 +36 @@
 
     Double_t GetMag() const { return fMag; }
-    Double_t GetResidual(Double_t *err=0) const;
+    Double_t GetResidual(Double_t *err) const;
+    Double_t GetResidual() const;
 
     void operator=(TPointStar &set)

trunk/MagicSoft/Cosy/videodev/FilterLed.cc

@@ -2 +2 @@
 
 #include <memory.h>   // memset
+#include <math.h>
 #include <iostream> // cout
+
+#include <TMath.h>
 
 #include "Led.h"
@@ -406 +409 @@
     
     // 254 because b<=max and not b<max
-    const double sdev = TMath::Sqrt(sq-sum*sum);
+    const double sdev = sqrt(sq-sum*sum);
     const byte   max  = sum+fCut*sdev>254 ? 254 : (byte)(sum+fCut*sdev);