Changeset 6891 for trunk

Timestamp:

03/29/05 10:08:09 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MAlphaFitter.h (modified) (1 diff)
• mhflux/Makefile (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (2 diffs)
• mjobs/MDataSet.h (modified) (2 diffs)
• mjobs/MJCut.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/03/29 Thomas Bretz
+
+   * ganymed.cc:
+     - implemented cmdline option for wobble and no-wobble to overwrite
+       dataset
+     - added cmdline option to print dataset
+
+   * mbase/MEvtLoop.[h,cc]:
+     - added some memory leak analysis to eventloop
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - added third part to status bar which displays the current
+       memory usage
+     - added some more sizes to menu bar
+     - replaced SetStatusLine1/2 by calling a common SetStatusLine
+     - added a delete to CloseWindow() to be able to close a 
+       static window. REMARK: This gives a hell of warnings in
+       valgrind but it is currently the only option to get this working
+       which is really annoying
+
+   * mhbase/MH.cc:
+     - small simplification
+
+   * mhbase/MHMatrix.cc:
+     - replaced IsValid() by a check for the number of Rows, this
+       was necessary because in root 4.02/00 all matrices seems
+       to be valid
+
+   * mhflux/MHAlpha.cc:
+     - changed the number of default bins in energy
+     - make sure that the Alpha plot for off-data is displayed with
+       a minimum at 0
+     - fixed TPad::Divide for root 4.02/00
+
+   * mhflux/MHEnergyEst.cc:
+     - use the mean abs of the resolution as fit value
+     - some fixed to graphics
+     - fixed the TPad::Divide for root 4.02/00
+     - for the moment removed the pad added to the list of cleanups
+       to get rid of the crashes
+
+   * mhflux/MHFalseSource.cc:
+     - fixed for root 4.02/00 which seaqrches in the current pad
+       for the histogram when calling Project3D
+     - fixed the TPad::Divide for root 4.02/00
+
+   * mhist/MHHadronness.[h,cc]:
+     - use MParameterD instead of MHadronness
+
+   * mimage/ImageLinkDef.h, mimage/Makefile:
+     - added MHVsSize
+
+   * mimage/MHHillas.cc:
+     - implemented 'same' for Center-histogram
+
+   * mhflux/FluxLinkDef.h, mhflux/Makefile:
+     - added MHEnergyEst
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - added significancetimes log10(excess) as fit option
+
+   * mjobs/MDataSet.[h,cc]:
+     - added wobble-mode option
+
+   * mjobs/MJCut.cc:
+     - changed default binning for energy
+     - added MHillasSrcAnti optionally to the output
+     - added MHVsSize to the tabs which are shown
+
+   * mjobs/MJOptimize.h:
+     - added dummy parameters to FixParameter for compatibility
+       with SetParemeter
+
+
 
  2005/03/24 Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -13 +13 @@
 
    - a bug in the time fine adjustment of the digital filter has been fixed
+
+   - a lot of small fixes to calling TPad::Divide with a margin==0
+
+   - MStatusDisplay now shows the memory usage
+
+   - added a memory leak statistic after the eventloop
+
+   - MHadronness replaced by MParameterD
+
+   - wobble mode can now be switched on from the data-set
+
 
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -501 +501 @@
     case kSignificanceChi2:
         return -GetSignificance()/GetChiSqSignal();
+    case kSignificanceLogExcess:
+        if (GetEventsExcess()<1)
+            return 0;
+        return -GetSignificance()*TMath::Log10(GetEventsExcess());
     case kSignificanceExcess:
         return -GetSignificance()*GetEventsExcess();

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

@@ -30 +30 @@
     enum Strategy_t {
         kSignificance,
+        kSignificanceChi2,
+        kSignificanceLogExcess,
         kSignificanceChi2,
         kSignificanceExcess,

trunk/MagicSoft/Mars/mhflux/Makefile

@@ -25 +25 @@
 
 SRCFILES = MAlphaFitter.cc \
+           MHEnergyEst.cc \
            MHAlpha.cc \
            MHEnergyEst.cc \

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -170 +170 @@
 
 
-    fNameSource = env.GetValue("SourceName", "");
-    fCatalog    = env.GetValue("Catalog",    "~/Software/data/magic_favorites.edb");
+    fNameSource   = env.GetValue("SourceName", "");
+    fCatalog      = env.GetValue("Catalog",    "~/Software/data/magic_favorites.edb");
+    fIsWobbleMode = env.GetValue("WobbleMode", kFALSE);
 
     //Print();
@@ -214 +215 @@
     gLog << "SourceName: " << fNameSource << endl;
     gLog << "Catalog:    " << fCatalog << endl;
+
+    gLog << "WobbleMode: " << (fIsWobbleMode?"On":"Off") << endl;
 
     if (!TString(o).Contains("files", TString::kIgnoreCase))

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -16 +16 @@
 {
 private:
-    UInt_t fNumAnalysis;      // Analysis number (artificial)
+    UInt_t  fNumAnalysis;     // Analysis number (artificial)
 
     TArrayI fNumSequencesOn;  // number of on-sequences
     TArrayI fNumSequencesOff; // number of off-sequences
 
-    TList fSequencesOn;       // list of names and paths of on-sequences
-    TList fSequencesOff;      // list of names and paths of off-sequences
+    TList   fSequencesOn;     // list of names and paths of on-sequences
+    TList   fSequencesOff;    // list of names and paths of off-sequences
 
+    TString fNameSource;      // Name of source from catalog
+    TString fCatalog;         // edb catalog (magic_favourites.edb)
 
-    TString  fNameSource;     // Name of source from catalog
-    TString  fCatalog;        // edb catalog (magic_favourites.edb)
-
+    Bool_t  fIsWobbleMode;    // Wobble Mode for this dataset?
 
     void Split(TString &runs, TArrayI &data) const;
@@ -51 +51 @@
     Bool_t GetSourcePos(MPointingPos &pos) const;
 
+    Bool_t IsWobbleMode() const { return fIsWobbleMode; }
+
     // Setter
     static Bool_t AddSequencesToList(const TList &list, MRead &read, char *id="I", Bool_t raw=kFALSE);

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -263 +263 @@
 {
     write.SetName(name);
-    write.AddContainer("MHillas",     "Events");
-    write.AddContainer("MHillasSrc",  "Events");
-    write.AddContainer("MHadronness", "Events", kFALSE);
-    write.AddContainer("MEnergyEst",  "Events", kFALSE);
-    write.AddContainer("DataType",    "Events");
+    write.AddContainer("MHillas",        "Events");
+    write.AddContainer("MHillasSrc",     "Events");
+    write.AddContainer("MHillasSrcAnti", "Events", kFALSE);
+    write.AddContainer("MHadronness",    "Events", kFALSE);
+    write.AddContainer("MEnergyEst",     "Events", kFALSE);
+    write.AddContainer("DataType",       "Events");
 
     // Should not be the default: Either as option, or as
@@ -321 +322 @@
 
     // Initialize default binnings
-    MBinning bins1(18, 0,  90,   "BinningAlpha",     "lin");
-    MBinning bins2(25, 10, 1e6 , "BinningEnergyEst", "log");
-    MBinning bins3(50, 0,  60,   "BinningTheta",     "cos");
+    MBinning bins1(18, 0,  90,  "BinningAlpha",     "lin");
+    MBinning bins2(30, 10, 1e6, "BinningEnergyEst", "log");
+    MBinning bins3(25, 0,  60,  "BinningTheta",     "cos"); // orig=50bins
     MBinning bins4("BinningFalseSource");
     plist.AddToList(&bins1);
@@ -383 +384 @@
     taskenv2.SetDefault(fCalcHadronness);
 
-    MFillH fill1a("MHHillasOffPre  [MHHillas]", "MHillas", "FillHillasPre");
-    MFillH fill2a("MHHillasOffPost [MHHillas]", "MHillas", "FillHillasPost");
+    MFillH fill1a("MHHillasOffPre  [MHHillas]", "MHillas",    "FillHillasPre");
+    MFillH fill2a("MHHillasOffPost [MHHillas]", "MHillas",    "FillHillasPost");
+    MFillH fill3a("MHVsSizeOffPost [MHVsSize]", "MHillasSrc", "FillVsSizePost");
     fill1a.SetNameTab("PreCut");
     fill2a.SetNameTab("PostCut");
+    fill3a.SetNameTab("VsSize");
 
     MPrint print2("MEffectiveOnTime");
@@ -418 +421 @@
     tlist2.AddToList(&cont2);
     if (!fWriteOnly)
+    {
         tlist2.AddToList(&fill2a);
+        tlist2.AddToList(&fill3a);
+    }
     if (!fWriteOnly)
         tlist2.AddToList(&falpha);
@@ -467 +473 @@
         scalc.SetWobbleMode(kFALSE); /********************/
 
-    MFillH fill1b("MHHillasOnPre  [MHHillas]", "MHillas", "FillHillasPre");
-    MFillH fill2b("MHHillasOnPost [MHHillas]", "MHillas", "FillHillasPost");
+    MFillH fill1b("MHHillasOnPre  [MHHillas]", "MHillas",    "FillHillasPre");
+    MFillH fill2b("MHHillasOnPost [MHHillas]", "MHillas",    "FillHillasPost");
+    MFillH fill3b("MHVsSizeOnPost [MHVsSize]", "MHillasSrc", "FillVsSizePost");
     fill1b.SetNameTab("PreCut");
     fill2b.SetNameTab("PostCut");
+    fill3b.SetNameTab("VsSize");
     fill1b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
     fill2b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
+    fill3b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
 
     MFillH falpha2("MHAlpha", "MHillasSrc", "FillAlpha");
@@ -482 +491 @@
         tlist2.Replace(&fill1b);
         tlist2.Replace(&fill2b);
+        tlist2.Replace(&fill3b);
         tlist2.Replace(&falpha2);
         tlist2.Replace(&ffs2);