Changeset 3545 for trunk/MagicSoft

Timestamp:

03/18/04 13:49:16 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (6 diffs)
• mgeom/MGeomCam.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -36 +36 @@
      - fill Ra/Dec into MPointingPos
 
-
-
  2004/03/18: Markus Gaug
+
+   * mgeom/MGeomCam.[h,cc]
+     - replace fMaxRadius by a TArrayF of pixel area types
+     - new TArrayF fMinRadius of each pixel area type
+     - backward compatibility should be given, 
+       call to GetMaxRadius() return fMaxRadius.At(fNumAreas-1)
+       (which corresponds to the previous value for the Magic camera)
+ 
 
    * mimage/MConcentration.cc

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!   Author(s): Harald Kornmayer 1/2001
-!
-!   Copyright: MAGIC Software Development, 2000-2002
-!
+!   Author(s): Thomas Bretz     12/2000 <mailto:tbretz@uni-sw.gwdg.de>
+!              Harald Kornmayer 01/2001
+!              Markus Gaug      03/2004 <mailto:markus@ifae.es>
+!
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 \* ======================================================================== */
@@ -68 +68 @@
 //
 MGeomCam::MGeomCam()
-    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0)
+    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0), fMaxRadius(1), fMinRadius(1)
 {
     fName  = "MGeomCam";
@@ -80 +80 @@
 //
 MGeomCam::MGeomCam(UInt_t npix, Float_t dist, const char *name, const char *title)
-    : fNumPixels(npix), fCamDist(dist), fConvMm2Deg(kRad2Deg/(dist*1000)), fPixels(npix), fPixRatio(npix), fPixRatioSqrt(npix)
+    : fNumPixels(npix), fCamDist(dist), fConvMm2Deg(kRad2Deg/(dist*1000)), 
+      fPixels(npix), fMaxRadius(1), fMinRadius(1), fPixRatio(npix), fPixRatioSqrt(npix)
 {
     fName  = name  ? name  : "MGeomCam";
@@ -159 +160 @@
     for (UInt_t i=0; i<fNumPixels; i++)
     {
-        const UInt_t s = (*this)[i].GetSector();
+        const Int_t s = (*this)[i].GetSector();
 
         if (s>fNumSectors)
@@ -179 +180 @@
     for (UInt_t i=0; i<fNumPixels; i++)
     {
-        const UInt_t s = (*this)[i].GetAidx();
+        const Int_t s = (*this)[i].GetAidx();
 
         if (s>fNumAreas)
@@ -194 +195 @@
 void MGeomCam::CalcMaxRadius()
 {
-    fMaxRadius = 0;
-
-    for (UInt_t i=0; i<fNumPixels; i++)
-    {
-        const MGeomPix &pix = (*this)[i];
-
-        const Float_t x = pix.GetX();
-        const Float_t y = pix.GetY();
-        const Float_t d = pix.GetD();
-
-        const Float_t maxr = sqrt(x*x+y*y) + d;
-
-        if (maxr>fMaxRadius)
-            fMaxRadius = maxr;
-    }
+
+  fMaxRadius.Set(fNumAreas);
+  fMinRadius.Set(fNumAreas);  
+
+  for (Int_t i=0; i<fNumAreas; i++)
+    {
+      fMaxRadius.AddAt(0.,i);
+      fMinRadius.AddAt(3.3e38,i);
+    }
+  
+  for (UInt_t i=0; i<fNumPixels; i++)
+    {
+
+      const MGeomPix &pix = (*this)[i];
+
+      const UInt_t  s = pix.GetAidx();      
+      const Float_t x = pix.GetX();
+      const Float_t y = pix.GetY();
+      const Float_t d = pix.GetD();
+      const Float_t r = sqrt(x*x+y*y);
+
+      const Float_t maxr = r + d;
+      const Float_t minr = r;
+      
+      if (maxr>fMaxRadius.At(s))
+        fMaxRadius.AddAt(maxr,s);
+      if (minr<fMinRadius.At(s))
+        fMinRadius.AddAt(minr,s);
+    }
+
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -18 +18 @@
 private:
     UInt_t    fNumPixels;    // Number of pixels in this camera
-    Float_t   fMaxRadius;    // maximum radius of the camera (eg. for GUI layout)
 
     Float_t   fCamDist;      // [m] Average distance of the camera from the mirror
@@ -25 +24 @@
     TObjArray fPixels;       // Array of singel pixels storing the geometry
 
+    TArrayF   fMaxRadius;    // maximum radius of the part of the camera with the same pixel size (eg. for GUI layout)
+    TArrayF   fMinRadius;    // minimum radius of the part of the camera with the same pixel size (eg. for GUI layout)    
     TArrayF   fPixRatio;     // Array storing the ratio between size of pixel 0 and pixel idx (for speed reasons)
     TArrayF   fPixRatioSqrt; // Array storing the square root ratio between size of pixel 0 and pixel idx (for speed reasons)
 
-    UInt_t    fNumSectors;   // Number of sectors
-    UInt_t    fNumAreas;     // Number of different pixel sizes
+    Int_t     fNumSectors;   // Number of sectors
+    Int_t     fNumAreas;     // Number of different pixel sizes
 
 protected:
+
     void CalcMaxRadius();
     void CalcNumSectors();
@@ -60 +62 @@
     Float_t GetConvMm2Deg() const { return fConvMm2Deg; }
 
-    UInt_t  GetNumPixels() const  { return fNumPixels; }
-    Float_t GetMaxRadius() const  { return fMaxRadius; }
-    UInt_t  GetNumSectors() const { return fNumSectors; }
-    UInt_t  GetNumAreas() const   { return fNumAreas; }
-    Float_t GetPixRatio(UInt_t i) const;
-    Float_t GetPixRatioSqrt(UInt_t i) const;
+    UInt_t  GetNumPixels()  const { return fNumPixels; }
+
+    Float_t GetMaxRadius(const Int_t i=-1) const { if (i >= fNumAreas) return -1.;
+                                                  else if (i==-1) return fMaxRadius.At(fNumAreas-1);
+                                                  else return fMaxRadius.At(i);  }
+    Float_t GetMinRadius(const Int_t i=-1) const { if (i >= fNumAreas) return -1.;
+                                                  else if (i==-1) return fMinRadius.At(0);
+                                                  else return fMinRadius.At(i);  }
+
+    UInt_t  GetNumSectors()                const  { return fNumSectors; }
+    UInt_t  GetNumAreas()                  const  { return fNumAreas; }
+    Float_t GetPixRatio(UInt_t i)          const;
+    Float_t GetPixRatioSqrt(UInt_t i)      const;
 
     MGeomPix &operator[](Int_t i);
-    MGeomPix &operator[](Int_t i) const;
+    MGeomPix &operator[](Int_t i)          const;
 
-    virtual void Print(Option_t *opt=NULL) const;
+    virtual void Print(Option_t *opt=NULL)   const;
 
     ClassDef(MGeomCam, 3)  // Geometry base class for the camera