Changeset 9338 for trunk/MagicSoft/Mars/mfilter

Timestamp:

02/15/09 15:09:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFMagicCuts.cc (modified) (2 diffs)
• MFMagicCuts.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.cc

@@ -188 +188 @@
 Int_t MFMagicCuts::PreProcess(MParList *pList)
 {
-    MGeomCam *cam = (MGeomCam*)pList->FindObject("MGeomCam");
-    if (!cam)
+    fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!fGeom)
     {
         *fLog << err << "MGeomCam not found... aborting." << endl;
         return kFALSE;
     }
-
-    // Geometry in SPONDE?
-
-    fMm2Deg = cam->GetConvMm2Deg();
 
     fThetaSq = (MParameterD*)pList->FindCreateObj("MParameterD", "ThetaSquared");
@@ -425 +421 @@
     // For simplicity
     const Double_t *c = fVariables.GetArray();
+
+    const Float_t fMm2Deg = fGeom->GetConvMm2Deg();
 
     // Default if we return before the end

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.h

@@ -12 +12 @@
 class MParList;
 
+class MGeomCam;
 class MHillas;
 class MHillasSrc;
@@ -49 +50 @@
     };
 
+    MGeomCam       *fGeom;              //! Conversion factor from mm to deg
     MHillas        *fHil;               //! Pointer to MHillas container
     MHillasSrc     *fHilSrc;            //! Pointer to MHillasSrc container
@@ -59 +61 @@
     MParameterD    *fHadronness;        //! Pointer to MParameterD container called Hadronness
 
-    Float_t         fMm2Deg;            //! Conversion factor from mm to deg, from MGeomCam
     Bool_t          fResult;            //! Result of the filter evaluation