Index: trunk/MagicSoft/Cosy/caos/Led.cc
===================================================================
--- trunk/MagicSoft/Cosy/caos/Led.cc	(revision 4865)
+++ trunk/MagicSoft/Cosy/caos/Led.cc	(revision 4892)
@@ -1,5 +1,5 @@
 #include "Led.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <TROOT.h>
@@ -11,4 +11,6 @@
 ClassImp(Led);
 
+using namespace std;
+
 void Led::CalcPhi(const Ring &ring)
 {
@@ -16,5 +18,5 @@
 }
 
-void Led::Print(Option_t *o=NULL) const
+void Led::Print(Option_t *o) const
 {
     MString str;
Index: trunk/MagicSoft/Cosy/caos/Leds.cc
===================================================================
--- trunk/MagicSoft/Cosy/caos/Leds.cc	(revision 4865)
+++ trunk/MagicSoft/Cosy/caos/Leds.cc	(revision 4892)
@@ -1,9 +1,11 @@
 #include "Leds.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Led.h"
 
 ClassImp(Leds);
+
+using namespace std;
 
 void Leds::Set(Int_t i, Double_t x, Double_t y, Double_t dx, Double_t dy, Double_t mag)
@@ -17,5 +19,5 @@
 }
 
-void Leds::Print(Option_t *o=NULL) const
+void Leds::Print(Option_t *o) const
 {
     cout << "Number of Leds: " << GetEntries() << endl;
Index: trunk/MagicSoft/Cosy/caos/Ring.cc
===================================================================
--- trunk/MagicSoft/Cosy/caos/Ring.cc	(revision 4865)
+++ trunk/MagicSoft/Cosy/caos/Ring.cc	(revision 4892)
@@ -1,5 +1,5 @@
 #include "Ring.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Led.h"
@@ -11,9 +11,10 @@
 ClassImp(Ring);
 
+using namespace std;
+
 Ring::Ring(Double_t x, Double_t y) :
     fX(x), fY(y), fR(0), fPhi(0), fDx(-1), fDy(-1), fDr(-1), fDphi(-1)
 {
 }
-
 
 bool Ring::CalcCenter(const Leds &leds, Int_t i, Int_t j, Int_t k)
@@ -119,5 +120,5 @@
 }
 
-void Ring::Print(Option_t *o=NULL) const
+void Ring::Print(Option_t *o) const
 {
     MString str;
Index: trunk/MagicSoft/Cosy/caos/Rings.cc
===================================================================
--- trunk/MagicSoft/Cosy/caos/Rings.cc	(revision 4865)
+++ trunk/MagicSoft/Cosy/caos/Rings.cc	(revision 4892)
@@ -1,5 +1,5 @@
 #include "Rings.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Led.h"
@@ -7,4 +7,6 @@
 
 ClassImp(Rings);
+
+using namespace std;
 
 void Rings::CalcCenters(const Leds &leds, Float_t min, Float_t max)
@@ -51,14 +53,10 @@
     fCenter.InterpolCenters(*this);
 
-    //
-    // angles v
-    //
-    const int n=leds.GetEntries();
-
+    int n = leds.GetEntries();
     for (int j=0; j<n; j++)
         leds(j).CalcPhi(fCenter);
 }
 
-void Rings::Print(Option_t *o=NULL) const
+void Rings::Print(Option_t *o) const
 {
     cout << "Number of Rings: " << GetEntries() << endl;