Changeset 6240 for trunk/MagicSoft/Mars/mhflux

Timestamp:

02/03/05 14:23:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHAlpha.cc (modified) (8 diffs)
• MHAlpha.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -36 +36 @@
 // PRELIMINARY!
 //
+//
+// ToDo:
+// =====
+//
+//   - Replace time-binning by histogram (which is enhanced bin-wise)
+//
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MHAlpha.h"
@@ -78 +85 @@
     fPointPos(0), fTimeEffOn(0), fTime(0),
     fSkipHistTime(kFALSE), fSkipHistTheta(kFALSE), fSkipHistEnergy(kFALSE),
-    //fEnergyMin(-1), fEnergyMax(-1), fSizeMin(-1), fSizeMax(-1),
-    fMatrix(0)
+    fNumTimeBins(10), fMatrix(0)
 {
     //
@@ -299 +305 @@
 
     fLastTime = MTime();
+    fNumRebin = fNumTimeBins;
 
     MBinning binst, binse, binsa;
@@ -353 +360 @@
         return;
 
-    const Int_t steps = 10;
-
-    static int rebin = steps;
-
     if (!final)
     {
@@ -368 +371 @@
         {
             fLastTime=*fTimeEffOn;
-            rebin--;
-        }
-
-        if (rebin>0)
+            fNumRebin--;
+        }
+
+        if (fNumRebin>0)
             return;
     }
@@ -384 +387 @@
         *fLog << "This should not happen. Maybe you started you eventloop with" << endl;
         *fLog << "an already initialized time stamp MTimeEffectiveOnTime?" << endl;
-        rebin++;
+        fNumRebin++;
         return;
     }
@@ -426 +429 @@
     *fLog << all << *fTimeEffOn << ": " << fit.GetEventsExcess() << endl;
 
-    rebin = steps;
+    fNumRebin = fNumTimeBins;
 }
 
@@ -902 +905 @@
     fMatrix = NULL; 
 }
+
+Int_t MHAlpha::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "NumTimeBins", print))
+    {
+        SetNumTimeBins(GetEnvValue(env, prefix, "NumTimeBins", fNumTimeBins));
+        rc = kTRUE;
+    }
+    return rc;
+}

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -104 +104 @@
     MTime    fLastTime;         //! Last fTimeEffOn
 
-    //Float_t fEnergyMin;
-    //Float_t fEnergyMax;
-    //Float_t fSizeMin;
-    //Float_t fSizeMax;
-
     Bool_t fSkipHistTime;
     Bool_t fSkipHistTheta;
     Bool_t fSkipHistEnergy;
+
+    UShort_t fNumTimeBins;      // Number of time bins to fill together
+    UShort_t fNumRebin;         //!
 
     //const TString fNameProjAlpha;  //! This should make sure, that gROOT doen't confuse the projection with something else
@@ -144 +142 @@
         fOffData = &h.fHAlpha;
     }
+    void SetNumTimeBins(UShort_t n) { fNumTimeBins = n; }
 /*
     void SetSizeCuts(Float_t min, Float_t max)   { fSizeMin=min; fSizeMax=max; }
@@ -162 +161 @@
     void SkipHistEnergy(Bool_t b=kTRUE) { fSkipHistEnergy=b; }
 
-    void Paint(Option_t *opt="");
-    void Draw(Option_t *option="");
-
     void DrawAll(); //*MENU*
 
@@ -170 +166 @@
     void StopMapping();
 
+    // TObject
+    void Paint(Option_t *opt="");
+    void Draw(Option_t *option="");
+
+    // MParContainer
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+
     ClassDef(MHAlpha, 1) // Alpha-Plot which is fitted online
 };