Changeset 6240

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (6 diffs)
• mfbase/MFilterList.cc (modified) (1 diff)
• mfbase/MFilterList.h (modified) (1 diff)
• mhbase/MFillH.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (8 diffs)
• mhflux/MHAlpha.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/02/03 Thomas Bretz
+
+   * mfbase/MFilterList.[h,cc]:
+     - added new function AddToList(TCollection&)
+
+   * mhbase/MFillH.cc:
+     - print a warning if 'same'-option given without 
+       a corresponding existing tab
+
+   * mhflux/MHAlpha.[h,cc]:
+     - made time bins settable by user
+
+
+
  2005/02/03 Markus Gaug
 
@@ -29 +43 @@
      - intialize fTimeShiftHiGain and fTimeShiftLoGain by default.
  
+
 
  2005/02/02 Markus Gaug
@@ -69 +84 @@
 
 
+
  2005/02/01 Raquel de los Reyes
 
    * mjobs/MSequence.h
      - Added "Get" functions for the TArrays variables.
+
 
 
@@ -90 +107 @@
      - return kTRUE in PostProcess if GetNumExecutions is 0
 
+
+
  2005/02/01 Daniel Mazin
 
@@ -97 +116 @@
        MDrive tree
 
+
+
  2005/02/01 Thomas Bretz
 
@@ -102 +123 @@
      - another fix to make the batch mode working (you can use the batch
        mode to convert a root-file into another format)
+
+
 
  2005/01/31 Thomas Bretz

trunk/MagicSoft/Mars/mfbase/MFilterList.cc

@@ -237 +237 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If you want to add a new filters from a TCollection to the list call
+// this function.
+//
+Bool_t MFilterList::AddToList(const TCollection &col)
+{
+    TIter Next(&col);
+    MFilter *f=0;
+    Int_t idx=0;
+    while ((f=(MFilter*)Next()))
+    {
+        if (!f->InheritsFrom(MFilter::Class()))
+        {
+            *fLog << warn << "WARNING - An object in TCollection doesn't inherit from MFilter... ignored." << endl;
+            continue;
+        }
+
+        f->SetName(Form("F%d", idx++));
+        if (!AddToList(f))
+            return kFALSE;
+    }
+    return kTRUE;
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mfbase/MFilterList.h

@@ -44 +44 @@
 
     Bool_t AddToList(MFilter *filter);
+    Bool_t AddToList(const TCollection &col);
     void SetOwner(Bool_t enable=kTRUE) { enable ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -379 +379 @@
     fCanvas = 0;
     if (fDrawOption.Contains("same", TString::kIgnoreCase))
+    {
         fCanvas = fDisplay->GetCanvas(tabname);
+        if (!fCanvas)
+            *fLog << warn << "WARNING - 'same' option given, but no tab with name '" << tabname << "' found." << endl;
+    }
+
     if (!fCanvas)
         fCanvas = &fDisplay->AddTab(tabname);

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
 };