Changeset 4892 for trunk/MagicSoft

Timestamp:

09/09/04 11:12:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/caos

Files:

• Led.cc (modified) (3 diffs)
• Leds.cc (modified) (2 diffs)
• Ring.cc (modified) (3 diffs)
• Rings.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/caos/Led.cc

@@ -1 +1 @@
 #include "Led.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <TROOT.h>
@@ -11 +11 @@
 ClassImp(Led);
 
+using namespace std;
+
 void Led::CalcPhi(const Ring &ring)
 {
@@ -16 +18 @@
 }
 
-void Led::Print(Option_t *o=NULL) const
+void Led::Print(Option_t *o) const
 {
     MString str;

trunk/MagicSoft/Cosy/caos/Leds.cc

@@ -1 +1 @@
 #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 +19 @@
 }
 
-void Leds::Print(Option_t *o=NULL) const
+void Leds::Print(Option_t *o) const
 {
     cout << "Number of Leds: " << GetEntries() << endl;

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -1 +1 @@
 #include "Ring.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Led.h"
@@ -11 +11 @@
 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 +120 @@
 }
 
-void Ring::Print(Option_t *o=NULL) const
+void Ring::Print(Option_t *o) const
 {
     MString str;

trunk/MagicSoft/Cosy/caos/Rings.cc

@@ -1 +1 @@
 #include "Rings.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Led.h"
@@ -7 +7 @@
 
 ClassImp(Rings);
+
+using namespace std;
 
 void Rings::CalcCenters(const Leds &leds, Float_t min, Float_t max)
@@ -51 +53 @@
     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;