Changeset 8695 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/22/07 19:18:35 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (12 diffs)
• MSequence.cc (modified) (3 diffs)
• MSequence.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -62 +62 @@
 
 // Filter
-//#include "MFDataMember.h"
+#include "MFDataPhrase.h"
 
 // Fit signal environment
@@ -665 +665 @@
     cont3.SetAllowEmpty();
 
+    // Filter for VsSize
+    MFDataPhrase ftheta("", "CutT");
+    ftheta.SetAllowEmpty();
+
     // ------------- Loop Off Data --------------------
     MReadReports readoffdata;
@@ -712 +716 @@
     MFillH fill2a("MHHillasOffPost [MHHillas]",      "MHillas",      "FillHillasPost");
     MFillH fill3a("MHVsSizeOffPost [MHVsSize]",      "MHillasSrc",   "FillVsSizePost");
+    MFillH fill3c("MHVsSizeOffTheta [MHVsSize]",     "MHillasSrc",   "FillVsSizeTheta");
     MFillH fill4a("MHHilExtOffPost [MHHillasExt]",   "MHillasSrc",   "FillHilExtPost");
     MFillH fill5a("MHHilSrcOffPost [MHHillasSrc]",   "MHillasSrc",   "FillHilSrcPost");
@@ -720 +725 @@
     fill2a.SetNameTab("PostCut");
     fill3a.SetNameTab("VsSize");
+    fill3c.SetNameTab("CutT");
     fill4a.SetNameTab("HilExt");
     fill5a.SetNameTab("HilSrc");
@@ -726 +732 @@
     //fill9a.SetNameTab("EffOffT");
 
+    fill3c.SetFilter(&ftheta);
+
     //MFDataMember fbin("Bin.fVal", '>', 0);
     //fill9a.SetFilter(&fbin);
@@ -738 +746 @@
         fill2a.SetWeight(&scale);
         fill3a.SetWeight(&scale);
+        fill3c.SetWeight(&scale);
         fill4a.SetWeight(&scale);
         fill5a.SetWeight(&scale);
@@ -797 +806 @@
         if (fFullDisplay)
         {
+            tlist2.AddToList(&ftheta);
             tlist2.AddToList(&fill3a);
+            tlist2.AddToList(&fill3c);
             tlist2.AddToList(&fill4a);
             tlist2.AddToList(&fill5a);
@@ -905 +916 @@
     MFillH fill2b("MHHillasOnPost [MHHillas]",      "MHillas",      "FillHillasPost");
     MFillH fill3b("MHVsSizeOnPost [MHVsSize]",      "MHillasSrc",   "FillVsSizePost");
+    MFillH fill3d("MHVsSizeOnTheta [MHVsSize]",     "MHillasSrc",   "FillVsSizeTheta");
     MFillH fill4b("MHHilExtOnPost [MHHillasExt]",   "MHillasSrc",   "FillHilExtPost");
     MFillH fill5b("MHHilSrcOnPost [MHHillasSrc]",   "MHillasSrc",   "FillHilSrcPost");
@@ -913 +925 @@
     fill2b.SetNameTab("PostCut");
     fill3b.SetNameTab("VsSize");
+    fill3d.SetNameTab("CutT");
     fill4b.SetNameTab("HilExt");
     fill5b.SetNameTab("HilSrc");
@@ -921 +934 @@
     fill2b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
     fill3b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
+    fill3d.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
     fill4b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
     fill5b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
@@ -926 +940 @@
     fill7b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
     //fill9b.SetFilter(&fbin);
+
+    fill3d.SetFilter(&ftheta);
 
     /*
@@ -985 +1001 @@
     {
         tlist.Replace(&fill1b);
-/*        if (fIsWobble)
-        {
-            tlist2.AddToListAfter(&fill2b, &fill2a);
-            tlist2.AddToListAfter(&fill3b, &fill3a);
-        }
-        else
-        */
+
         tlist2.Replace(&fill2b);
         if (fFullDisplay)
         {
             tlist2.Replace(&fill3b);
+            tlist2.Replace(&fill3d);
             tlist2.Replace(&fill4b);
             tlist2.Replace(&fill5b);

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -123 +123 @@
 //   + fMonteCarlo
 //
+//  Class Version 3:
+//   + fComment
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MSequence.h"
@@ -450 +453 @@
     fHvSettings   = env.GetValue("HvSettings", "");
     fMonteCarlo   = env.GetValue("MonteCarlo", kFALSE);
+    fComment      = env.GetValue("Comment",    "");
 
     str = env.GetValue("Runs", "");
@@ -544 +548 @@
     if (!fDataPath.IsNull())
         gLog << endl << "DataPath: " << fDataPath << endl;
+
+    gLog << endl << "Comment: " << fComment << endl;
+
 }
 

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -45 +45 @@
     TString fTriggerTable;
     TString fHvSettings;
+    TString fComment;
 
     TArrayI fRuns;
@@ -144 +145 @@
     static Bool_t InflatePath(TString &seq, Bool_t ismc=kFALSE);
 
-    ClassDef(MSequence, 2)
+    ClassDef(MSequence, 3)
 };