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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -20 +20 @@
         if (h1==0)
         {
-                cout << "h1==0" <<endl;
-                return kFALSE;
+            cout << "h1==0" <<endl;
+            return kFALSE;
         }
     }
@@ -38 +38 @@
     }
 
-    Float_t w1 = leds(i).GetX() - leds(j).GetX();
-    Float_t w2 = leds(j).GetX() - leds(k).GetX();
+    const Float_t w1 = leds(i).GetX() - leds(j).GetX();
+    const Float_t w2 = leds(j).GetX() - leds(k).GetX();
 
-    Float_t m1 = -w1/h1;
-    Float_t m2 = -w2/h2;
+    const Float_t m1 = -w1/h1;
+    const Float_t m2 = -w2/h2;
 
     if (m2-m1==0)
     {
-        cout << "m2-m1==0" << endl;
+        cout << "All three points in a row! (m2-m1==0)" << endl;
         return kFALSE;
     }
@@ -66 +66 @@
     fR = 0;
 
+    fDx=0;
+    fDy=0;
+    fDr=0;
+
+    if (n<1)
+        return;
+
     for (int i=0; i<n; i++)
     {
-        const Ring &ring = *(Ring*)((Rings&)rings)[i];
+        const Ring &ring = rings(i);
 
         fX += ring.GetX();
@@ -79 +86 @@
     fR /= n;
 
+    if (n<2)
+        return;
+
     //
     // deviation of x- and y coordinate and radius
     //
-    Float_t sumx=0;
-    Float_t sumy=0;
-    Float_t sumr=0;
-
     for (int i=0; i<n; i++)
     {
-        const Ring &ring = *(Ring*)((Rings&)rings)[i];
+        const Ring &ring = rings(i);
 
-        sumx += sqr(ring.GetX()-fX);
-        sumy += sqr(ring.GetY()-fY);
-        sumr += sqr(ring.GetR()-fR);
+        fDx += sqr(ring.GetX()-fX);
+        fDy += sqr(ring.GetY()-fY);
+        fDr += sqr(ring.GetR()-fR);
     }
 
-        fDx=sqrt(sumx)/(n-1);
-        fDy=sqrt(sumy)/(n-1);
-        fDr=sqrt(sumr)/(n-1);
-
+    fDx=sqrt(fDx)/(n-1);
+    fDy=sqrt(fDy)/(n-1);
+    fDr=sqrt(fDr)/(n-1);
 }
 
+void Ring::Print(Option_t *o=NULL) const
+{
+    cout << "Ring: ";
+    cout << "x="   << fX   << "+-" << fDx   << ", ";
+    cout << "y="   << fY   << "+-" << fDy   << ", ";
+    cout << "r="   << fR   << "+-" << fDr   << ", ";
+    cout << "phi=" << fPhi << "+-" << fDphi << endl;
+}
+