Changeset 8244 for trunk/MagicSoft/Mars/mjobs/MJCut.cc

Timestamp:

01/11/07 14:56:24 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCut.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -62 +62 @@
 #include "MWriteRootFile.h"
 
+// Filter
+//#include "MFDataMember.h"
+
 // Fit signal environment
 #include "../mhflux/MAlphaFitter.h"
@@ -270 +273 @@
 // analysis number num, see GetOutputFile()
 //
-Bool_t MJCut::WriteResult(const MParList &plist, UInt_t num) const
+Bool_t MJCut::WriteResult(const MParList &plist, const MDataSet &set) const
 {
     TObjArray arr;
@@ -286 +289 @@
         arr.Add((TObject*)(&halpha->GetAlphaFitter()));
 
+    // Save also the dataset
+    arr.Add(const_cast<MDataSet*>(&set));
+
+    const Int_t num = set.GetNumAnalysis();
     const TString fname(fNameOutput.IsNull() ? Form("ganymed%08d.root", num) : fNameOutput.Data());
 
@@ -577 +584 @@
 
     // Initialize default binnings
-    MBinning bins1(18,  0,     90,    "BinningAlpha", "lin");
-    MBinning bins2(15, 10,     1e6 ,  "BinningSize",  "log");
-    MBinning bins3(67, -0.005, 0.665, "BinningTheta", "asin");
+    MBinning bins1( 18,  0,     90,    "BinningAlpha",  "lin");
+    MBinning bins2( 15, 10,     1e6 ,  "BinningSize",   "log");
+    MBinning bins3( 67, -0.005, 0.665, "BinningTheta",  "asin");
+    //MBinning binsT(150,  0,     150,   "BinningDeltaT", "lin");
     MBinning bins4("BinningFalseSource");
     MBinning bins5("BinningWidth");
@@ -597 +605 @@
     plist.AddToList(&bins9);
     plist.AddToList(&bins0);
-    //plist.AddToList(&binsa);
+    //plist.AddToList(&binsT);
 
     // --------------------------------------------------------------------------------
@@ -662 +670 @@
     MFillH fill6a("MHImgParOffPost [MHImagePar]",    "MImagePar",    "FillImgParPost");
     MFillH fill7a("MHNewParOffPost [MHNewImagePar]", "MNewImagePar", "FillNewParPost");
+    //MFillH fill9a("MHEffOffTime    [MHEffectiveOnTime]", "MTime",        "FillEffOnTime");
     fill1a.SetNameTab("PreCut");
     fill2a.SetNameTab("PostCut");
@@ -669 +678 @@
     fill6a.SetNameTab("ImgPar");
     fill7a.SetNameTab("NewPar");
+    //fill9a.SetNameTab("EffOffT");
+
+    //MFDataMember fbin("Bin.fVal", '>', 0);
+    //fill9a.SetFilter(&fbin);
 
     MPrint print2("MEffectiveOnTime");
@@ -722 +735 @@
     }
     if (!fWriteOnly)
+    {
         tlist2.AddToList(&falpha);
+        /* if (!fIsMonteCarlo)
+        {
+            tlist2.AddToList(&fbin);
+            tlist2.AddToList(&fill9a);
+        } */
+    }
     tlist2.AddToList(&cont3);
     if (write1)
@@ -810 +830 @@
     MFillH fill6b("MHImgParOnPost [MHImagePar]",    "MImagePar",    "FillImgParPost");
     MFillH fill7b("MHNewParOnPost [MHNewImagePar]", "MNewImagePar", "FillNewParPost");
+    //MFillH fill9b("MHEffOnTime    [MHEffectiveOnTime]", "MTime",        "FillEffOnTime");
     fill1b.SetNameTab("PreCut");
     fill2b.SetNameTab("PostCut");
@@ -817 +838 @@
     fill6b.SetNameTab("ImgPar");
     fill7b.SetNameTab("NewPar");
+    //fill9b.SetNameTab("EffOnT");
     fill1b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
     fill2b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
@@ -824 +846 @@
     fill6b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
     fill7b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":"");
+
+    //fill9b.SetFilter(&fbin);
 
     /*
@@ -891 +915 @@
         }
         tlist2.Replace(&falpha2);
+        //if (!fIsMonteCarlo)
+        //    tlist2.Replace(&fill9b);
         if (!fIsWobble || !fNameHist.IsNull())
             tlist2.Replace(&ffs2);
@@ -925 +951 @@
     // FIXME: Perform fit and plot energy dependant alpha plots
     // and fit result to new tabs!
-    if (!WriteResult(plist, set.GetNumAnalysis()))
+    if (!WriteResult(plist, set))
         return kFALSE;