Changeset 6338

Timestamp:

02/10/05 10:26:39 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mars.rc (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (4 diffs)
• mgeom/MGeomCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - added new member functions (GetNeighbors) to get all pixels
        around a given pixel with a given radius
+
+   * mars.rc:
+     - use same values for image cleaning as default in star
 
 

trunk/MagicSoft/Mars/mars.rc

@@ -22 +22 @@
 # This is how you can setup the Image cleaning used in the Camera Display
 # -------------------------------------------------------------------------
-#MImgCleanStd.CleanMethod: Probability
-#MImgCleanStd.CleanLevel1: 0.3
-#MImgCleanStd.CleanLevel2: 0.05
+MImgCleanStd.CleanMethod: Scaled
+MImgCleanStd.CleanLevel1: 4.5
+MImgCleanStd.CleanLevel2: 3.0

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -53 +53 @@
 
 #include <TClass.h>     // IsA()->New()
+#include <TArrayI.h>    // TArrayI
 #include <TVector2.h>   // TVector2
 
@@ -69 +70 @@
 //
 MGeomCam::MGeomCam()
-    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0), fMaxRadius(1), fMinRadius(1)
+    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0), /*fPixels(1000),*/ fMaxRadius(1), fMinRadius(1)
 {
     fName  = "MGeomCam";
@@ -302 +303 @@
         MGeomCam *cam = new MGeomCam(fNumPixels, fCamDist);
         for (UInt_t i=0; i<fNumPixels; i++)
-            (*this)[i].Copy((*cam)[i]);
+        {
+            //if (fPixels.UncheckedAt(i))
+                (*this)[i].Copy((*cam)[i]);
+        }
         cam->InitGeometry();
         return cam;
@@ -335 +339 @@
 }
 
-/*
-void MGeomCam::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class MGeomCam.
-
-    if (R__b.IsReading())
-    {
-        MGeomCam::Class()->ReadBuffer(R__b, this);
-
-        UInt_t R__s, R__c;
-        Version_t R__v = b.ReadVersion(&R__s, &R__c);
-        if (R__v > 2) {
-            MGeomCam::Class()->ReadBuffer(b, this, R__v, R__s, R__c);
-
-        Version_t v = MGeomCam::Class()->GetClassVersion();
-   }
-   else
-   {
-       MGeomCam::Class()->WriteBuffer(R__b, this);
-   }
-}
-*/
+// --------------------------------------------------------------------------
+//
+// Add all indices to arr of all neighbors around pix in a radius r.
+// The center pixel is also returned.
+//
+void MGeomCam::GetNeighbors(TArrayI &arr, const MGeomPix &pix, Float_t r) const
+{
+    arr.Set(GetNumPixels());
+
+    Int_t n = 0;
+
+    for (unsigned int i=0; i<GetNumPixels(); i++)
+    {
+        if (r>TMath::Hypot(pix.GetX()-(*this)[i].GetX(), pix.GetY()-(*this)[i].GetY()))
+            arr[n++] = i;
+    }
+
+    arr.Set(n);
+}
+
+// --------------------------------------------------------------------------
+//
+// Add all indices to arr of all neighbors around idx in a radius r.
+// The center pixel is also returned.
+//
+void MGeomCam::GetNeighbors(TArrayI &arr, UInt_t idx, Float_t r) const
+{
+    if (idx>=GetNumPixels())
+    {
+        arr.Set(0);
+        return;
+    }
+
+
+    const MGeomPix &pix = (*this)[idx];
+    GetNeighbors(arr, pix, r);
+}
+
+// --------------------------------------------------------------------------
+//
+// Add all pixels to list of all neighbors around pix in a radius r.
+// The center pixel is also returned.
+//
+void MGeomCam::GetNeighbors(TList &arr, const MGeomPix &pix, Float_t r) const
+{
+    for (unsigned int i=0; i<GetNumPixels(); i++)
+    {
+        if (r>TMath::Hypot(pix.GetX()-(*this)[i].GetX(), pix.GetY()-(*this)[i].GetY()))
+            arr.Add(fPixels.UncheckedAt(i));
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+// Add all pixels to list of all neighbors around idx in a radius r.
+// The center pixel is also returned.
+//
+void MGeomCam::GetNeighbors(TList &arr, UInt_t idx, Float_t r) const
+{
+    if (idx>=GetNumPixels())
+        return;
+
+    const MGeomPix &pix = (*this)[idx];
+    GetNeighbors(arr, pix, r);
+}

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -13 +13 @@
 
 class TVector2;
+class TArrayI;
 class MGeomPix;
 
@@ -84 +85 @@
     }
 
+    void GetNeighbors(TArrayI &arr, UInt_t idx,          Float_t r) const;
+    void GetNeighbors(TList &arr,   UInt_t idx,          Float_t r) const;
+    void GetNeighbors(TArrayI &arr, const MGeomPix &pix, Float_t r) const;
+    void GetNeighbors(TList &arr,   const MGeomPix &pix, Float_t r) const;
+
     virtual void Print(Option_t *opt=NULL)   const;