Changeset 4711 for trunk/MagicSoft/Mars

Timestamp:

08/23/04 14:33:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MHillasCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -304 +304 @@
     }
 
-    if (TestBit(kCalcHillasSrc))
+    if (TestFlag(kCalcHillasSrc))
     {
         if (!fHillasSrc->Calc(*fHillas))
@@ -377 +377 @@
 void MHillasCalc::Print(Option_t *o) const
 {
-    *fLog << inf << GetDescriptor() << ":" << endl;
+    *fLog << inf << GetDescriptor() << " calculating:" << endl;
     if (TestFlag(kCalcHillas))
-        *fLog << " - Calculating " << fNameHillas << " from MGeomCam, MCerPhotEvt and fIdxIsland=" << fIdxIsland << endl;
+        *fLog << " - " << fNameHillas << " from MGeomCam, MCerPhotEvt and fIdxIsland=" << fIdxIsland << endl;
     if (TestFlag(kCalcHillasSrc))
-        *fLog << " - Calculating " << fNameHillasSrc << " from " << fNameSrcPosCam << ", " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
+        *fLog << " - " << fNameHillasSrc << " from " << fNameSrcPosCam << ", " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
     if (TestFlag(kCalcHillasExt))
-        *fLog << " - Calculating " << fNameHillasExt << " from MGeomCam, MCerPhotEvt, " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
+        *fLog << " - " << fNameHillasExt << " from MGeomCam, MCerPhotEvt, " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
     if (TestFlag(kCalcImagePar))
-        *fLog << " - Calculating " << fNameImagePar << " from MCerPhotEvt" << endl;
+        *fLog << " - " << fNameImagePar << " from MCerPhotEvt" << endl;
     if (TestFlag(kCalcNewImagePar))
-        *fLog << " - Calculating " << fNameNewImagePar << " from MGeomCam, MCerPhotEvt, " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
+        *fLog << " - " << fNameNewImagePar << " from MGeomCam, MCerPhotEvt, " << fNameHillas << " and fIdxIsland=" << fIdxIsland << endl;
     if (TestFlag(kCalcConc))
-        *fLog << " - Calculating " << fNameConc << " from MGeomCam, MCerPhotEvt and " << fNameHillas << endl;
+        *fLog << " - " << fNameConc << " from MGeomCam, MCerPhotEvt and " << fNameHillas << endl;
 }