Changeset 9259 for trunk/MagicSoft/Mars/mgeom

Timestamp:

01/25/09 13:41:19 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

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

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -244 +244 @@
         const UInt_t  s = pix.GetAidx();
 
-        const Float_t d = pix.GetD();
+        const Float_t d = pix.GetT();
         const Float_t r = pix.GetDist();
 
@@ -340 +340 @@
 // --------------------------------------------------------------------------
 //
+// The maximum possible distance from the origin.
+//
+Float_t MGeomCam::GetMaxRadius() const
+{
+    return fMaxRadius[0];
+}
+
+// --------------------------------------------------------------------------
+//
+// The minimum possible distance from the origin.
+//
+Float_t MGeomCam::GetMinRadius() const
+{
+    return fMinRadius[0];
+}
+
+// --------------------------------------------------------------------------
+//
 // Have to call the radii of the subcameras starting to count from 1
 //
 Float_t MGeomCam::GetMaxRadius(const Int_t i) const
 {
-    return i<-1 || i>=(Int_t)GetNumAreas() ? -1 : fMaxRadius[i+1];
+    return i<0 || i>=(Int_t)GetNumAreas() ? -1 : fMaxRadius[i+1];
 }
 
@@ -353 +371 @@
 Float_t MGeomCam::GetMinRadius(const Int_t i) const
 {
-    return i<-1 || i>=(Int_t)GetNumAreas() ? -1 : fMinRadius[i+1];
+    return i<0 || i>=(Int_t)GetNumAreas() ? -1 : fMinRadius[i+1];
 }
 
@@ -379 +397 @@
     // The const_cast is necessary to support older root version
     return i<fNumPixels ? const_cast<TArrayF&>(fPixRatioSqrt)[i] : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Check if the position given in the focal plane (so z can be ignored)
+// is a position which might hit the detector. It is meant to be a rough
+// and fast estimate not a precise calculation. All positions dicarded
+// must not hit the detector. All positions accepted might still miss
+// the detector.
+//
+Bool_t MGeomCam::HitDetector(const MQuaternion &v, Double_t offset) const
+{
+    const Double_t max = fMaxRadius[0]/10+offset; // cm --> mm
+    return v.R2()<max*max;
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -78 +78 @@
     UInt_t  GetNumPixels()  const { return fNumPixels; }
 
-    Float_t GetMaxRadius(const Int_t i=-1) const;
-    Float_t GetMinRadius(const Int_t i=-1) const;
+    Float_t GetMaxRadius() const;
+    Float_t GetMinRadius() const;
+    Float_t GetMaxRadius(const Int_t i) const;
+    Float_t GetMinRadius(const Int_t i) const;
 
     Float_t GetDist(UShort_t i, UShort_t j=0) const;
@@ -113 +115 @@
 
     virtual Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const { return kFALSE; }
-    virtual Bool_t HitDetector(const MQuaternion &p) const { return kFALSE; }
+    virtual Bool_t HitDetector(const MQuaternion &p, Double_t offset=0) const;
 
     void Print(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.cc

@@ -133 +133 @@
 // --------------------------------------------------------------------------
 //
-// Check if the position given in the focal plane (so z can be ignored)
-// is a position which might hit the detector. It is meant to be a rough
-// and fast estimate not a precise calculation. All positions dicarded
-// must not hit the detector. All positions accepted might still miss
-// the detector.
-//
-// The units are cm.
-//
-Bool_t MGeomCamDwarf::HitDetector(const MQuaternion &v) const
-{
-    // Add 10% to the max radius and convert from mm to cm
-    return v.R()<GetMaxRadius()*0.11;//60.2;
-}
-
-// --------------------------------------------------------------------------
-//
 // Calculate in the direction 0-5 (kind of sector) in the ring-th ring
 // the x and y coordinate of the i-th pixel. The unitx are unity,

trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.h

@@ -29 +29 @@
 
     Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const;
-    Bool_t HitDetector(const MQuaternion &p) const;
 
     ClassDef(MGeomCamDwarf, 1) // Geometry class for the Dwarf camera

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc

@@ -67 +67 @@
 
     return TMath::Abs(p.X())<65 && TMath::Abs(p.Y())<65;
-}
-
-// --------------------------------------------------------------------------
-//
-// Check if the position given in the focal plane (so z can be ignored)
-// is a position which might hit the detector. It is meant to be a rough
-// and fast estimate not a precise calculation. All positions dicarded
-// must not hit the detector. All positions accepted might still miss
-// the detector.
-//
-Bool_t MGeomCamMagic::HitDetector(const MQuaternion &v) const
-{
-    return v.R()<60.2;
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.h

@@ -16 +16 @@
 
     Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const;
-    Bool_t HitDetector(const MQuaternion &p) const;
 
     ClassDef(MGeomCamMagic, 1)          // Geometry class for the Magic camera

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -66 +66 @@
 using namespace std;
 
-const Float_t MGeomPix::gsTan30 = tan(30/kRad2Deg);
-const Float_t MGeomPix::gsTan60 = tan(60/kRad2Deg);
+const Float_t MGeomPix::gsTan30 = TMath::Tan(30/kRad2Deg); // sqrt(3)/3
+const Float_t MGeomPix::gsTan60 = TMath::Tan(60/kRad2Deg); // sqrt(3)
 
 // --------------------------------------------------------------------------
@@ -73 +73 @@
 // Initializes one pixel
 //
-MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r, UInt_t s, UInt_t a)
+MGeomPix::MGeomPix(Float_t x, Float_t y, Float_t r, UInt_t s, UInt_t a) : fUserBits(0)
 {
     //  default constructor

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -9 +9 @@
 class TVector2;
 class TOrdCollection;
+
 
 class MGeomPix : public MParContainer
@@ -75 +76 @@
     Float_t GetX() const  { return fX; }
     Float_t GetY() const  { return fY; }
-    Float_t GetD() const  { return fD; }
+    Float_t GetD() const  { return fD; }         // Distance between two parellel sides
     Float_t GetL() const  { return fD*gsTan30; } // Length of one of the parallel sides
+    Float_t GetT() const  { return fD/gsTan60; } // Distance between two opposite edges (traverse)
     UInt_t  GetSector() const { return fSector; }
 
@@ -101 +103 @@
     //Double_t CalcOverlapArea(const MGeomPix &cam) const;
 
+    //TObject *GetGraphics() { return new MHexagon(*this); }
+
     ClassDef(MGeomPix, 4) // Geometry class describing the geometry of one pixel
 };