Changeset 9576

Timestamp:

04/22/10 11:43:42 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MParSpline.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (3 diffs)
• mhbase/MH3.cc (modified) (1 diff)
• mhbase/MHn.cc (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (1 diff)
• mhflux/MHPhi.cc (modified) (4 diffs)
• mhist/MHCamEvent.cc (modified) (1 diff)
• showplot.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/04/22 Thomas Bretz
+
+   * showplot.cc:
+     - added --debug-mem option
+
+   * mbase/MParSpline.cc, mhbase/MH3.cc, mhbase/MHn.cc,
+     mhflux/MHAlpha.cc, mhist/MHCamEvent.cc:
+     - added missing call to the RecursiveRemove of the base class
+
+   * mfileio/MReadTree.cc:
+     - In the case Notify failed since about two years accidentaly
+       kTRUE instead of kERROR was returned
+
+   * mfileio/MWriteRootFile.cc:
+     - added some more debug output
+
+   * mhflux/MAlphaFitter.cc:
+     - Return if fit failed
+
+   * mhflux/MHPhi.cc:
+     - avoid inf and nan when producing histogram (the divisor could
+       have been zero in case of the inetgral of an empty histogram)
+
+
 
  2010/04/21 Thomas Bretz
@@ -47 +72 @@
 
 
+ 2010/04/20 Thomas Bretz
+
+   * mfileio/MReadTree.cc:
+     - no error was returned anymore when Notify() failed. Fixed.
+
+
+
  2010/04/19 Thomas Bretz
 
-   * mase/MStatusArray.cc:
+   * mbase/MStatusArray.cc:
      - added a workaround to prevent crashes in case of double
        deleteion of the fHistogram in TGraphs

trunk/MagicSoft/Mars/mbase/MParSpline.cc

@@ -327 +327 @@
     if (obj==fSpline)
         fSpline=0;
-}
+
+    MParContainer::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -1001 +1001 @@
         case MChain::kFatalError:
             *fLog << err << GetDescriptor() << " - ERROR: Notify() failed." << endl;
-            return kTRUE;
+            return kERROR;
         case MChain::kCannotAccessFile:
             *fLog << err << GetDescriptor() << " - ERROR: TChain::LoadTree is unable to access requested file." << endl;

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -716 +716 @@
             if (!b->GetBranch()->Fill())
             {
-                *fLog << err << "ERROR - Zero bytes written to branch '" << b->GetBranch()->GetName() << "'... abort." << endl;
+                *fLog << err << "ERROR - MWriteRootFile: Zero bytes written to branch '" << b->GetBranch()->GetName() << "'... abort." << endl;
                 return kFALSE;
             }
@@ -730 +730 @@
     {
         TTree *t = (TTree*)fTrees[idx];
+        if (!t)
+        {
+            *fLog << err << "ERROR - MWriteRootFile: The Tree with index " << idx << endl;
+            *fLog << " in fTrees is NULL. This should never happen. Please send" << endl;
+            *fLog << " a bug report." << endl;
+            return kFALSE;
+        }
 
         //
@@ -746 +753 @@
         if (!t->Fill())
         {
-            *fLog << err << "ERROR - Zero bytes written to tree '" << t->GetName() << "'... abort." << endl;
+            *fLog << err << "ERROR - MWriteRootFiole: Zero bytes written to tree '" << t->GetName() << "'... abort." << endl;
             return kFALSE;
         }

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -1306 +1306 @@
     if (obj==fHist)
         fHist = 0;
-}
+
+    MH::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/mhbase/MHn.cc

@@ -609 +609 @@
             fHist[i]->RecursiveRemove(obj);
     }
-}
+
+    MH::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -208 +208 @@
     //           Q  quiet mode
     //           E  Perform better Errors estimation using Minos technique
-    h.Fit(fFunc, "NQI", "", fBgMin, fBgMax);
+    if (h.Fit(fFunc, "NQI", "", fBgMin, fBgMax))
+        return kFALSE;
+
     fChiSqBg = fFunc->GetChisquare()/fFunc->GetNDF();
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -1153 +1153 @@
     if (obj==fOffData)
         fOffData = 0;
-}
+
+    MH::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/mhflux/MHPhi.cc

@@ -355 +355 @@
     TVirtualPad *pad4 = gPad->GetPad(4);
 
+    const Double_t i2 = fHInhom.Integral();
+/*
     Double_t sig2 = 0;
     Double_t bg2  = 0;
     Double_t f2   = 1;
+*/
     TH1D *htemp = pad1 ? dynamic_cast<TH1D*>(pad1->FindObject("Template")) : NULL;
     if (htemp)
@@ -373 +376 @@
             fHPhi.Copy(*res);
 
+            const Double_t i0 = res->Integral(fNumBinsSignal+1, 9999);
+            const Double_t i1 = fHInhom.Integral(fNumBinsSignal+1, 9999);
+            const Double_t i3 = htemp->Integral();
+            const Double_t i4 = htemp->Integral(fNumBinsSignal+1, 9999);
+
             // Scale inhomogeneity to match the phi-plot in the off-region
-            sc1 = res->Integral(fNumBinsSignal+1, 9999)/fHInhom.Integral(fNumBinsSignal+1, 9999);
+            sc1 = i1==0 ? 0 : i0/i1;
             // Scale inhomogeneity to match the phi-plot in the off-region
-            sc2 = fHInhom.Integral()/htemp->Integral();
+            sc2 = i3==0 ? 0 : i2/i3;
 
             res->Add(&fHInhom, -sc1);
@@ -383 +391 @@
             res->SetDirectory(0);
 
-            htemp->Scale(res->Integral(fNumBinsSignal+1, 9999)/htemp->Integral(fNumBinsSignal+1, 9999));
-
-            sig2 = res->Integral(1, fNumBinsSignal);
-            bg2  = fHPhi.Integral(fNumBinsSignal+1, 9999);
-            f2   = htemp->Integral(1, fNumBinsSignal)/htemp->Integral(fNumBinsSignal+1, 9999);
+            htemp->Scale(i4==0 ? 0 : i0/i4);
+
+            //sig2 = res->Integral(1, fNumBinsSignal);
+            //bg2  = fHPhi.Integral(fNumBinsSignal+1, 9999);
+            //f2   = htemp->Integral(1, fNumBinsSignal)/i4;
         }
 
@@ -403 +411 @@
     if (htemp)
     {
+        const Double_t integ = htemp->Integral();
+
         fHTemplate.Copy(*htemp);
-        htemp->Scale(fHInhom.Integral()/htemp->Integral());
+        htemp->Scale(integ==0 ? 0 : i2/integ);
         htemp->SetName("Template");
         htemp->SetDirectory(0);

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -409 +409 @@
     if (obj==fSum)
         fSum = 0;
-}
+
+    MH::RecursiveRemove(obj);
+}

trunk/MagicSoft/Mars/showplot.cc

@@ -3 +3 @@
 #include <TGClient.h>
 #include <TRint.h>
+#include <TObjectTable.h>
 
 #include "MLog.h"
@@ -68 +69 @@
     gLog << "   --auto-size               Determin optimum size (not available in batch mode)" << endl;
     gLog << endl;
+    gLog << "   --debug-mem               Debug memory usage" << endl;
     gLog << "   --version, -V             Show startup message with version number" << endl;
     gLog << "   -?, -h, --help            This help" << endl;
@@ -165 +167 @@
     const Bool_t kBatch      = arg.HasOnlyAndRemove("-b");
     const Bool_t kRoot       = arg.HasOnlyAndRemove("-r");
+    const Bool_t kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
 
     const Int_t  kTab        = arg.GetIntAndRemove("--tab=", -1);
@@ -231 +234 @@
         return 3;
     }
+
+    if (kDebugMem)
+        TObject::SetObjectStat(kTRUE);
 
     //
@@ -314 +320 @@
     app->Run(kFALSE);
     delete app;
+
+    if (TObject::GetObjectStat())
+    {
+        TObject::SetObjectStat(kFALSE);
+        gObjectTable->Print();
+    }
+
     return 0;
 }