Changeset 4107 for trunk/MagicSoft/Cosy/caos

Timestamp:

05/20/04 05:40:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/caos

Files:

• Led.cc (modified) (2 diffs)
• Makefile (modified) (1 diff)
• Ring.cc (modified) (2 diffs)
• Ring.h (modified) (1 diff)

trunk/MagicSoft/Cosy/caos/Led.cc

@@ -7 +7 @@
 
 #include "Ring.h"
+#include "MString.h"
 
 ClassImp(Led);
@@ -17 +18 @@
 void Led::Print(Option_t *o=NULL) const
 {
+    MString str;
     cout << "Led: ";
-    cout << "x="   << Form("%5.1f", fX)   << "+-" << fDx   << ", ";
-    cout << "y="   << Form("%5.1f", fY)   << "+-" << fDy   << ", ";
-    cout << "phi=" << Form("%6.1f", fPhi) << "+-" << fDphi << ", ";
+    cout << "x="   << str.Print("%5.1f", fX)   << "+-" << fDx   << ", ";
+    cout << "y="   << str.Print("%5.1f", fY)   << "+-" << fDy   << ", ";
+    cout << "phi=" << str.Print("%6.1f", fPhi) << "+-" << fDphi << ", ";
     cout << "mag=" << fMag << endl;
 }

trunk/MagicSoft/Cosy/caos/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I..
+INCLUDES = -I. -I.. -I../base
+#base: MString
 
 # @code 

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -7 +7 @@
 
 #include "Rings.h"
+#include "MString.h"
 
 ClassImp(Ring);
 
-Ring::Ring() :
-    fX(0), fY(0), fR(0), fPhi(0), fDx(-1), fDy(-1), fDr(-1), fDphi(-1)
+Ring::Ring(Double_t x, Double_t y) :
+    fX(x), fY(y), fR(0), fPhi(0), fDx(-1), fDy(-1), fDr(-1), fDphi(-1)
 {
 }
@@ -114 +115 @@
 void Ring::Print(Option_t *o=NULL) const
 {
+    MString str;
     cout << "Ring: ";
-    cout << "x="   << Form("%5.1f", fX) << "+-" << Form("%.1f", fDx) << ", ";
-    cout << "y="   << Form("%5.1f", fY) << "+-" << Form("%.1f", fDy) << ", ";
-    cout << "r="   << Form("%5.1f", fR) << "+-" << Form("%.1f", fDr) << ", ";
+    cout << "x="   << str.Print("%5.1f", fX) << "+-" << Form("%.1f", fDx) << ", ";
+    cout << "y="   << str.Print("%5.1f", fY) << "+-" << Form("%.1f", fDy) << ", ";
+    cout << "r="   << str.Print("%5.1f", fR) << "+-" << Form("%.1f", fDr) << ", ";
     cout << "phi=" << fPhi              << "+-" << fDphi << endl;
 }

trunk/MagicSoft/Cosy/caos/Ring.h

@@ -32 +32 @@
 
 public:
-    Ring();
+    Ring(Double_t x=0, Double_t y=0);
 
     Double_t GetX() const   { return fX; }