Changeset 9369 for trunk/MagicSoft/Mars/mimage

Timestamp:

03/01/09 21:54:27 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MHillas.cc (modified) (2 diffs)
• MHillasExt.cc (modified) (2 diffs)
• MImgCleanStd.cc (modified) (8 diffs)
• MImgCleanStd.h (modified) (2 diffs)
• MNewImagePar.cc (modified) (2 diffs)
• MNewImagePar2.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mimage/MHillas.cc

@@ -291 +291 @@
             continue;
 
-        const MGeomPix &gpix = geom[i];
+        const MGeom &gpix = geom[i];
 
         const Float_t nphot = pix.GetNumPhotons();
@@ -339 +339 @@
             continue;
 
-        const MGeomPix &gpix = geom[i];
+        const MGeom &gpix = geom[i];
 
         const Float_t dx = gpix.GetX() - fMeanX;     // [mm]

trunk/MagicSoft/Mars/mimage/MHillasExt.cc

@@ -161 +161 @@
             continue;
 
-        const MGeomPix &gpix = geom[i];
+        const MGeom &gpix = geom[i];
 
         const Double_t x = gpix.GetX();
@@ -238 +238 @@
     // Asymmetry
     //
-    const MGeomPix &maxp = geom[maxpixid];
+    const MGeom &maxp = geom[maxpixid];
     fAsym = (hil.GetMeanX()-maxp.GetX())*c + (hil.GetMeanY()-maxp.GetY())*s;            // [mm]
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -395 +395 @@
 //
 //
-Bool_t MImgCleanStd::HasCoreNeighbors(const MGeomPix &gpix) const
+Bool_t MImgCleanStd::HasCoreNeighbors(const MGeom &gpix) const
 {
 //    if (fKeepIsolatedPixels)
@@ -428 +428 @@
 }
 
-Bool_t MImgCleanStd::HasUsedNeighbors(const MGeomPix &gpix) const
+Bool_t MImgCleanStd::HasUsedNeighbors(const MGeom &gpix) const
 {
     //loop on the neighbors to check if they are used
@@ -448 +448 @@
 
 
-void MImgCleanStd::SetUsedNeighbors(const MGeomPix &gpix, Int_t r) const
+void MImgCleanStd::SetUsedNeighbors(const MGeom &gpix, Int_t r) const
 {
     if (r>fCleanRings)
@@ -527 +527 @@
             continue;
 
-        const MGeomPix &gpix = (*fCam)[idx];
+        const MGeom &gpix = (*fCam)[idx];
 
         // Check if the pixel is an isolated core pixel
@@ -556 +556 @@
 
 /*
-Float_t MImgCleanStd::GetArrivalTimeNeighbor(const MGeomPix &gpix) const
+Float_t MImgCleanStd::GetArrivalTimeNeighbor(const MGeom &gpix) const
 {
     Float_t min = FLT_MAX;
@@ -595 +595 @@
             continue;
 
-        const MGeomPix &gpix = (*fCam)[idx];
+        const MGeom &gpix = (*fCam)[idx];
 
         // If isolated possible-corepixel doesn't have used
@@ -638 +638 @@
             continue;
 
-        const MGeomPix &gpix = (*fCam)[idx];
+        const MGeom &gpix = (*fCam)[idx];
 
         // If isolated possible-corepixel doesn't have used
@@ -676 +676 @@
 
         // loop over its neighbpors
-        const MGeomPix &gpix = (*fCam)[idx];
+        const MGeom &gpix = (*fCam)[idx];
 
         Int_t cnt = 0;

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -7 +7 @@
 
 class MGeomCam;
-class MGeomPix;
+class MGeom;
 class MSignalCam;
 class MPedPhotCam;
@@ -58 +58 @@
 
     // MImgCleanStd
-    Bool_t HasCoreNeighbors(const MGeomPix &gpix) const;
-    Bool_t HasUsedNeighbors(const MGeomPix &gpix) const;
-    void   SetUsedNeighbors(const MGeomPix &gpix, Int_t r=1) const;
+    Bool_t HasCoreNeighbors(const MGeom &gpix) const;
+    Bool_t HasUsedNeighbors(const MGeom &gpix) const;
+    void   SetUsedNeighbors(const MGeom &gpix, Int_t r=1) const;
     Int_t  DoCleaning(Float_t &size) const;
     void   ResetCleaning() const;

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -160 +160 @@
 
         // Get geometry of pixel
-        const MGeomPix &gpix = geom[i];
+        const MGeom &gpix = geom[i];
 
         // Find the three pixels which are next to the COG
@@ -220 +220 @@
         const Double_t dzx   =  hillas.GetCosDelta()*dx + hillas.GetSinDelta()*dy; // [mm]
         const Double_t dzy   = -hillas.GetSinDelta()*dx + hillas.GetCosDelta()*dy; // [mm]
-        const Double_t dz    =  gpix.GetD()*gpix.GetD()/4;
+        const Double_t dz    =  gpix.GetT()*gpix.GetT()/4;
         const Double_t tana  =  dzy*dzy/(dzx*dzx);
         const Double_t distr =  (1+tana)/(rl + tana*rw);

trunk/MagicSoft/Mars/mimage/MNewImagePar2.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MNewImagePar2.cc,v 1.2 2006-10-17 17:16:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MNewImagePar2.cc,v 1.3 2009-03-01 21:48:14 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -91 +91 @@
         Int_t used=0;
 
-        const MGeomPix &gpix = geom[i];
+        const MGeom &gpix = geom[i];
         const Int_t nn = gpix.GetNumNeighbors();
         for (int j=0; j<nn; j++)
@@ -108 +108 @@
             evt[i].ResetBit(BIT(14));
 
-        fBorderLinePixel += (nn-used)*gpix.GetL();
+        // FIXME: GetT is not the correct value
+        fBorderLinePixel += (nn-used)*gpix.GetT();
     }
 
@@ -115 +116 @@
         const Int_t l = idx[m];
 
-        const MGeomPix &gpix = geom[l];
+        const MGeom &gpix = geom[l];
 
         const Int_t nn = gpix.GetNumNeighbors();