Changeset 2781 for trunk/MagicSoft/Mars/mimage

Timestamp:

01/13/04 13:22:38 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MImgCleanStd.cc (modified) (3 diffs)
• MImgCleanStd.h (modified) (2 diffs)
• MImgCleanTGB.cc (modified) (3 diffs)
• MImgCleanTGB.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -274 +274 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
-
 #include "MGGroupFrame.h" // MGGroupFrame
 
@@ -559 +556 @@
     else
     {
-        fPed = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
+        fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
         if (!fPed)
         {
-            *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
+            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
             return kFALSE;
         }
@@ -581 +578 @@
 {
     if (fSgb)
-        fData->Calc(*fEvt, *fSgb, *fCam);
+        fData->CalcCleaningLevel(*fEvt, *fSgb, *fCam);
     else
-        fData->Calc(*fEvt, *fPed, *fCam);
+        fData->CalcCleaningLevel(*fEvt, *fPed, *fCam);
 
 #ifdef DEBUG

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -10 +10 @@
 class MCerPhotPix;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 class MCameraData;
 
@@ -24 +24 @@
 
 private:
-    const MGeomCam     *fCam;  //!
-          MCerPhotEvt  *fEvt;  //!
-          MSigmabar    *fSgb;  //!
-          MPedestalCam *fPed;  //!
-          MCameraData  *fData; //!
+    const MGeomCam    *fCam;  //!
+          MCerPhotEvt *fEvt;  //!
+          MSigmabar   *fSgb;  //!
+          MPedPhotCam *fPed;  //!
+          MCameraData *fData; //!
 
     CleaningMethod_t fCleaningMethod;

trunk/MagicSoft/Mars/mimage/MImgCleanTGB.cc

@@ -59 +59 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 
 #include "MGGroupFrame.h" // MGGroupFrame
@@ -223 +223 @@
     else
     {
-        fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
+        fPed = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
         if (!fPed)
         {
-            *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
+            *fLog << dbginf << "MPedPhotCam not found... aborting." << endl;
             return kFALSE;
         }
@@ -257 +257 @@
         const Double_t factor     = fCam->GetPixRatio(idx);
         const Double_t factorsqrt = fCam->GetPixRatioSqrt(idx);
-        const Float_t  noise      = (*fPed)[idx].GetPedestalRms();
+        const Float_t  noise      = (*fPed)[idx].GetRms();
 
         if (entry * factorsqrt <= fCleanLvl2 * noise)

trunk/MagicSoft/Mars/mimage/MImgCleanTGB.h

@@ -10 +10 @@
 class MCerPhotPix;
 class MCerPhotEvt;
-class MPedestalCam;
+class MPedPhotCam;
 
 class MGGroupFrame;
@@ -23 +23 @@
 
 private:
-    const MGeomCam     *fCam;  //!
-          MCerPhotEvt  *fEvt;  //!
-          MSigmabar    *fSgb;  //!
-          MPedestalCam *fPed;  //!
+    const MGeomCam    *fCam;  //!
+          MCerPhotEvt *fEvt;  //!
+          MSigmabar   *fSgb;  //!
+          MPedPhotCam *fPed;  //!
 
     CleaningMethod_t fCleaningMethod;