Changeset 1802 for trunk/MagicSoft/Cosy/caos/Rings.cc

Timestamp:

03/02/03 16:55:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/caos/Rings.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/caos/Rings.cc

@@ -1 +1 @@
 #include "Rings.h"
+
+#include <iostream.h>
 
 #include "Led.h"
@@ -6 +8 @@
 ClassImp(Rings);
 
-Int_t Rings::CalcCenters(const Leds &leds)
+void Rings::CalcCenters(const Leds &leds)
 {
     int nPoints = leds.GetEntries();
@@ -15 +17 @@
             for (int k=j+1; k<nPoints; k++)
             {
-                Ring &ring = *(Ring*)(*this)[n];
+                Ring &ring = *new ((*this)[n]) Ring;
 
-                ring.CalcCenter(leds, i, j, k);
+                if (!ring.CalcCenter(leds, i, j, k))
+                {
+                    RemoveAt(n);
+                    continue;
+                }
 
                 n++;
             }
-    return n;
+
+    Expand(n);
 }
 
@@ -31 +38 @@
 
     //
-    // angles v and relative angle w
+    // angles v
     //
-    for (int j=0; j<leds.GetEntries(); j++)
+    const int n=leds.GetEntries();
+
+    for (int j=0; j<n; j++)
         leds(j).CalcPhi(fCenter);
 }
+
+void Rings::Print(Option_t *o=NULL) const
+{
+    cout << "Number of Rings: " << GetEntries() << endl;
+    TClonesArray::Print();
+    cout << "Center: " << endl;
+    fCenter.Print();
+}