Changeset 2135 for trunk/MagicSoft/Mars/mgeom

Timestamp:

05/23/03 17:30:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCam.cc (modified) (1 diff)
• MGeomCam.h (modified) (1 diff)
• MGeomCamMagic.cc (modified) (3 diffs)
• MGeomPix.cc (modified) (3 diffs)
• MGeomPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -102 +102 @@
         const Float_t x = pix.GetX();
         const Float_t y = pix.GetY();
-        const Float_t r = pix.GetR();
+        const Float_t d = pix.GetD();
 
-        const Float_t maxr = sqrt(x*x+y*y) + r;
+        const Float_t maxr = sqrt(x*x+y*y) + d;
 
         if (maxr>fMaxRadius)

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -42 +42 @@
     MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->UncheckedAt(i); }
 
-
-
     virtual void Print(Option_t *opt=NULL) const;
 

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc

@@ -222 +222 @@
     };
 
-    const Float_t rtemp[577] = {
+    const Float_t dtemp[577] = {
         30.00, 30.00, 30.00, 30.00, 30.00, 30.00, 30.00, 30.00,  //   0
         30.00, 30.00, 30.00, 30.00, 30.00, 30.00, 30.00, 30.00,  //   8
@@ -302 +302 @@
 
     for (UInt_t i=0; i<GetNumPixels(); i++)
-        (*this)[i].Set(xtemp[i], ytemp[i], rtemp[i]) ;
+        (*this)[i].Set(xtemp[i], ytemp[i], dtemp[i]) ;
 }
 
@@ -892 +892 @@
     };
 
-  for (Int_t i=0; i<577; i++)
-      (*this)[i].SetNeighbors(nn[i][0], nn[i][1], nn[i][2],
-                              nn[i][3], nn[i][4], nn[i][5]);
-
-  InitOuterRing();
+    for (Int_t i=0; i<577; i++)
+        (*this)[i].SetNeighbors(nn[i][0], nn[i][1], nn[i][2],
+                                nn[i][3], nn[i][4], nn[i][5]);
+
+    InitOuterRing();
 }

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -52 +52 @@
 // Initializes one pixel
 //
-MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r) : fX(x), fY(y), fR(r)
+MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r) : fX(x), fY(y), fD(r)
 {
     //  default constructor
@@ -63 +63 @@
 Float_t MGeomPix::GetA() const
 {
-    return fR*fR*tan(60/kRad2Deg);
+    return fD*fD*tan(60/kRad2Deg);
 }
 
@@ -121 +121 @@
     *fLog << all << "MPixGeom:  x= " << fX
         << "  y= " << fY
-        << "  r= " << fR
+        << "  d= " << fD
         << endl ;
 }

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -20 +20 @@
     Float_t fX;  // [mm] the x coordinate of the center
     Float_t fY;  // [mm] the y coordinate of the center
-    Float_t fR;  // [mm] the r coordinate of the pixel (dist between two parallel sides)
+    Float_t fD;  // [mm] the d coordinate of the pixel (dist between two parallel sides)
 
     Byte_t  fNumNeighbors; // number of valid neighbors
@@ -26 +26 @@
 
 public:
-    MGeomPix(Float_t x=0, Float_t y=0, Float_t r=0);
+    MGeomPix(Float_t x=0, Float_t y=0, Float_t d=0);
 
     void Print(Option_t *opt=NULL) const;
 
-    void Set(Float_t x, Float_t y, Float_t r) { fX=x; fY=y; fR=r; }
+    void Set(Float_t x, Float_t y, Float_t d) { fX=x; fY=y; fD=d; }
 
     void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1,
@@ -39 +39 @@
     void SetX(Float_t x) { fX = x; }
     void SetY(Float_t y) { fY = y; }
-    void SetR(Float_t r) { fR = r; }
+    void SetD(Float_t d) { fD = d; }
 
     Float_t GetX() const  { return fX; }
     Float_t GetY() const  { return fY; }
-    Float_t GetR() const  { return fR; }
+    Float_t GetD() const  { return fD; }
 
     Float_t GetA() const;