Changeset 4357 for trunk/MagicSoft/Cosy/caos

Timestamp:

06/28/04 14:21:08 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/caos

Files:

• Ring.cc (modified) (3 diffs)
• Ring.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -62 +62 @@
     fR = hypot(fX-leds(i).GetX(), fY-leds(i).GetY());
 
+    fMag = (leds(i).GetMag() + leds(j).GetMag() + leds(k).GetMag())/3;
+
     return kTRUE;
 }
@@ -77 +79 @@
     fDr=0;
 
+    fMag=0;
+
     if (n<1)
         return;
@@ -84 +88 @@
         const Ring &ring = rings(i);
 
-        fX += ring.GetX();
-        fY += ring.GetY();
-        fR += ring.GetR();
+        fX +  = ring.GetX();
+        fY   += ring.GetY();
+        fR   += ring.GetR();
+        fMag += ring.GetMag();
     }
 
-    fX /= n;
-    fY /= n;
-    fR /= n;
+    fX   /= n;
+    fY   /= n;
+    fR   /= n;
+    fMag /= n;
 
     if (n<2)

trunk/MagicSoft/Cosy/caos/Ring.h

@@ -22 +22 @@
     Double_t fDphi;
 
+    Double_t fMag;
+
     Double_t sqr(Double_t x) { return x*x; }
 
@@ -39 +41 @@
     Double_t GetPhi() const { return fPhi; }
 
+    Double_t GetMag() const { return fMag; }
+
     bool CalcCenter(const Leds &leds, Int_t i, Int_t j, Int_t k);
     void InterpolCenters(const Rings &rings);