Changeset 7711 for trunk/MagicSoft/Mars

Timestamp:

05/18/06 14:10:18 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * mhflux/MAlphaFitter.h:
      - added Getter for ScaleMode
+
+   * mhflux/MHAlpha.[h,cc]:
+     - made fHillas data member protected
+     - increased size of fMap
 
    * mhflux/MHThetaSq.[h,cc]:

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -82 +82 @@
 MHAlpha::MHAlpha(const char *name, const char *title)
     : fNameParameter("MHillasSrc"), fParameter(0),
-    fOffData(0), fResult(0), /*fExcess(0),*/ fEnergy(0), fHillas(0),
+    fOffData(0), fResult(0), /*fExcess(0),*/ fEnergy(0),
     fPointPos(0), fTimeEffOn(0), fTime(0), fNumTimeBins(10),
-    fMatrix(0), fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE),
+    fHillas(0), fMatrix(0), fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE),
     fSkipHistEnergy(kFALSE), fForceUsingSize(kFALSE)
 {
@@ -468 +468 @@
     {
         alpha  = GetVal();
-
-        if (fHillas)
-            size = fHillas->GetSize();
         energy = fEnergy   ? fEnergy->GetVal() : (fHillas?fHillas->GetSize():1000);
         theta  = fPointPos ? fPointPos->GetZd() : 0;