Changeset 14916 for trunk/Mars/mmuon

Timestamp:

02/13/13 10:48:49 (12 years ago)

Author:

tbretz

Message:

Reverting to last revision.

File:

• trunk/Mars/mmuon/MMuonSearchParCalc.cc (modified) (2 diffs)

trunk/Mars/mmuon/MMuonSearchParCalc.cc

@@ -76 +76 @@
 Int_t MMuonSearchParCalc::PreProcess(MParList *pList)
 {
-    fHillas = 0;
-    if (!fUseFactAlgorithm)
+    fHillas = (MHillas*)pList->FindObject("MHillas");
+    if (!fHillas)
     {
-        fHillas = (MHillas*)pList->FindObject("MHillas");
-        if (!fHillas)
-        {
-            *fLog << err << "MHillas not found... aborting." << endl;
-            return kFALSE;
-        }
+        *fLog << err << "MHillas not found... aborting." << endl;
+        return kFALSE;
     }
 
@@ -112 +108 @@
 Int_t MMuonSearchParCalc::Process()
 {
-    if (fUseFactAlgorithm)
-        fMuonPar->CalcFact(*fGeomCam, *fSignalCam);
-    else
-        fMuonPar->Calc(*fGeomCam, *fSignalCam, *fHillas);
-
+    fMuonPar->Calc(*fGeomCam, *fSignalCam, *fHillas);
     return kTRUE;
 }