Changeset 7355 for trunk/MagicSoft/Mars

Timestamp:

09/16/05 14:57:22 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• mgeom/MGeomCam.cc (modified) (1 diff)
• mgeom/MGeomCam.h (modified) (1 diff)
• mgeom/MGeomPix.h (modified) (1 diff)
• mhvstime/MHSectorVsTime.cc (modified) (1 diff)
• msignal/MSignalPix.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
      - removed some obsolete comments
      - added Copy() member function
+
+   * mgeom/MGeomCam.[h,cc], mgeom/MGeomPix.h:
+     - new member function GetAngle
 
 

trunk/MagicSoft/Mars/NEWS

@@ -20 +20 @@
    - callisto: The status "unmapped" (for pixel which cannot be interpolated)
      got lost when the events were stored by the calibration... fixed.
+     (This was no problem for normal image cleaning because the pixel 
+      content was artificially set to 0 not surviving standard cleaning
+      algorithm)
 
    - callisto: Fixed a bug which caused the random and peak-search pedestal
@@ -48 +51 @@
  *** Version 0.9.4 (2005/08/05)
 
-   - general: Fixed the ZA binning. It didn't correctyl fit the
+   - general: Fixed the ZA binning. It did not correctly fit the
      MC binning
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -237 +237 @@
 // --------------------------------------------------------------------------
 //
+// Returns the angle between of pixels i wrt pixel j (default=0). The angle
+// is returned in the range between -pi and pi (atan2) and 2*pi if i or j
+// is out of range.
+//
+Float_t MGeomCam::GetAngle(UShort_t i, UShort_t j) const
+{
+    if (i>=fNumPixels || j>=fNumPixels)
+        return TMath::TwoPi();
+
+    return (*this)[i].GetAngle((*this)[j]);
+}
+
+// --------------------------------------------------------------------------
+//
 // Have to call the radii of the subcameras starting to count from 1
 //

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -67 +67 @@
 
     Float_t GetDist(UShort_t i, UShort_t j=0) const;
+    Float_t GetAngle(UShort_t i, UShort_t j=0) const;
 
     UInt_t  GetNumSectors()                const  { return fNumSectors; }

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -63 +63 @@
     UInt_t  GetSector() const { return fSector; }
 
-    Float_t GetDist(const MGeomPix & pix) const  { return TMath::Hypot(fX-pix.fX, fY-pix.fY); }
+    Float_t GetDist(const MGeomPix &pix) const  { return TMath::Hypot(fX-pix.fX, fY-pix.fY); }
+    Float_t GetAngle(const MGeomPix &pix) const { return TMath::ATan2(fX - pix.GetX(), fY - pix.GetY()); }
+
 
     Float_t GetA() const    { return fA; /*fD*fD*gsTan60/2;*/ }

trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

@@ -63 +63 @@
 //     // Task to fill the histogram
 //     MFillH fill1(&hist1, "MCameraDC");
-// 
+//
+//
+// Class Version 2:
+// ----------------
+//  + Double_t fMinimum;      // User defined minimum
+//  + Double_t fMaximum;      // User defined maximum
+//
 //
 /////////////////////////////////////////////////////////////////////////////

trunk/MagicSoft/Mars/msignal/MSignalPix.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
-!   Author(s): Harald Kornmayer 1/2001
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -59 +58 @@
 //    the container for calibrated data will change soon.
 //
+// Version 7:
+// ----------
+//  - removed '!' from fRing to allow the status 'Unmapped' to be stored
+//    after calibration (bad pixel treatment). This increases the file
+//    size of the calibrated data by roughly 0.5%
+//
 ////////////////////////////////////////////////////////////////////////////
 #include "MSignalPix.h"
@@ -97 +102 @@
 { 
     gLog << GetDescriptor();// << " Pixel: "<< fPixId;
-    gLog << (fRing>0?"   Used ":" Unused ");
+    switch (fRing)
+    {
+    case -1:
+        gLog << "Unampped";
+        break;
+    case 0:
+        gLog << " Unused ";
+        break;
+    default:
+        gLog << "  Used  ";
+        break;
+    }
     gLog << (fIsCore?" Core ":"      ");
     gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;