Changeset 2465 for trunk

Timestamp:

11/04/03 11:38:48 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (2 diffs)
• mimage/MImgCleanTGB.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
      - changed version number from 1 to 2
 
-   * mimage/MImgCleanStd.cc:
+   * mimage/MImgCleanStd.cc, mimage/MImgCleanTGB.cc:
      - directly use MGeomCam::GetPixRatioSqrt() now
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -343 +343 @@
         // fact that pixels have different size (see TDAS 02-14).
         //
-        const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(idx));
+        const Double_t factor = fCam->GetPixRatioSqrt(idx);
 
         // COBB: '<=' to skip entry=noise=0
@@ -509 +509 @@
     // fact that pixels have different size (see TDAS 02-14).
     //
-    const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(idx));
+    const Double_t factor = fCam->GetPixRatioSqrt(idx);
 
     return (entry * factor <= fCleanLvl2 * noise);

trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc

@@ -253 +253 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Double_t entry  = pix.GetNumPhotons();
-        const Double_t factor = fCam->GetPixRatio(pix.GetPixId());
-        const Float_t  noise  = (*fPed)[pix.GetPixId()].GetPedestalRms();
-
-        if (entry * TMath::Sqrt(factor) <= fCleanLvl2 * noise)
+        const Int_t    idx        = pix.GetPixId();
+        const Double_t entry      = pix.GetNumPhotons();
+        const Double_t factor     = fCam->GetPixRatio(idx);
+        const Double_t factorsqrt = fCam->GetPixRatioSqrt(idx);
+        const Float_t  noise      = (*fPed)[idx].GetPedestalRms();
+
+        if (entry * factorsqrt <= fCleanLvl2 * noise)
         {
             sum += entry*factor;