Changeset 8669 for trunk

Timestamp:

08/15/07 18:06:11 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH3.cc (modified) (7 diffs)
• mjobs/MJCut.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
      - fixed a bug in the quality cuts (all showers with saturating
        hi-gains were removed)
+
+   * mhbase/MH3.cc:
+     - allow to split the histogram name and the binning name
+     - set a different line color in case of the "same" option
 
 

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz  2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -41 +41 @@
 //   "MyHillas.fLength"
 //
+// If you want to use a different unit for histogramming use SetScaleX,
+// SetScaleY and SetScaleZ.
+//
+//
+// Binning name
+// ============
+//
 // The axis binning is retrieved from the parameter list, too. Create a
 // MBinning with the name "Binning" plus the name of your MH3 container
 // plus the axis name ("X", "Y" or "Z") and add it to the parameter list.
 //
-// If you want to use a different unit for histogramming use SetScaleX,
-// SetScaleY and SetScaleZ.
+// If the binning should have a different name than the histogram name
+// the binning name can be added to the name, eg.:
+//    SetName("MyHistName;MyBinning")
+// Instead of BinningMyHistName[XYZ] the parameter list will be searched
+// for BinningMyBinning[XYZ].
 //
 //
@@ -59 +69 @@
 //    the axis titles. For more information see TH1::SetTitle, eg.
 //       SetTitle("MyHist;x[mm];y[cm];Counts");
+//
 //
 // For example:
@@ -301 +312 @@
     fHist->Reset();
 
+    const Int_t split = fName.First(';');
+
+    const TString name = split<0 ? fName : fName(0, split);
+    const TString bins = split<0 ? fName : fName(split+1, fName.Length());
+
     TString bname("Binning");
-    bname += fName;
+    bname += bins;
 
     MBinning *binsx = NULL;
@@ -364 +380 @@
 
     TString title("Histogram for ");
-    title += fName;
+    title += name;
     title += Form(" (%dD)", fDimension);
 
-    fHist->SetName(fName);
+    fHist->SetName(name);
     fHist->SetTitle(fTitle==gsDefTitle ? title : fTitle);
     fHist->SetDirectory(0);
@@ -577 +593 @@
 
     const Bool_t only  = str.Contains("only")  && fDimension==2;
-    const Bool_t same  = str.Contains("same")  && fDimension==2;
+    const Bool_t same  = str.Contains("same")  && fDimension<3;
     const Bool_t blue  = str.Contains("blue")  && fDimension==2;
     const Bool_t profx = str.Contains("profx") && fDimension==2;
@@ -587 +603 @@
     str.ReplaceAll("profy", "");
     str.ReplaceAll(" ", "");
+
+    if (same && fDimension==1)
+    {
+        fHist->SetLineColor(kBlue);
+        fHist->SetMarkerColor(kBlue);
+    }
 
     // FIXME: We may have to remove all our own options from str!

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -760 +760 @@
     MSrcPosRndm srcrndm;
 
+    MH3 hvs("MPointingPos.fZd");
+    hvs.SetName("ThetaOff;Theta");
+    hvs.SetTitle("Effective On-Time vs. Zenith Angle;\\Theta [\\circ];T_{on} [s]");
+
+    MFillH fillvs(&hvs, "", "FillOnTime");
+    if (!set.IsMonteCarlo())
+        fillvs.SetWeight("MEffectiveOnTime");
+    fillvs.SetNameTab("OnTime");
+
+    // It is not really necessary to re-calculate the image parameters
+    // for the the on-source for MCs, but it is done for symmetry reasons
+    if (set.IsMonteCarlo())
+        tlist2.AddToList(&fillvs);
+
     tlist2.AddToList(&scalc);
     tlist2.AddToList(&scor);
@@ -808 +822 @@
 
     tlist.AddToList(&readoff);
+    if (!set.IsMonteCarlo())
+        tlist.AddToList(&fillvs, "EffectiveOnTime");
     if (gLog.GetDebugLevel()>4)
         tlist.AddToList(&print2, "EffectiveOnTime");
@@ -917 +933 @@
      fillvs.SetNameTab("OnTime");
      */
-    MH3 hvs("MPointingPos.fZd");
-    hvs.SetName("Theta");
-    hvs.SetTitle("Effective On-Time vs. Zenith Angle;\\Theta [\\circ];T_{on} [s]");
-    MFillH fillvs(&hvs, "", "FillOnTime");
-    if (!set.IsMonteCarlo())
-        fillvs.SetWeight("MEffectiveOnTime");
-    fillvs.SetNameTab("OnTime");
 
     /*
@@ -962 +971 @@
     if (set.IsWobbleMode() && !set.IsMonteCarlo())
         tlist2.AddToListBefore(&fillsrc, &hcalc);
+
+    MH3 hvs2("MPointingPos.fZd");
+    hvs2.SetName("Theta");
+    hvs2.SetTitle("Effective On-Time vs. Zenith Angle;\\Theta [\\circ];T_{on} [s]");
+
+    MFillH fillvs2(&hvs2, "", "FillOnTime");
+    if (!set.IsMonteCarlo())
+        fillvs2.SetWeight("MEffectiveOnTime");
+    fillvs2.SetNameTab("OnTime");
+    fillvs2.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":"");
 
     if (!fWriteOnly)
@@ -995 +1014 @@
 
         if (!set.IsMonteCarlo())
-            tlist.AddToList(&fillvs, "EffectiveOnTime");
+            tlist.Replace(&fillvs2);
         else
-            // It is not really necessary to re-calculate the image parameters
-            // for the the on-source for MCs, but it is done for symmetry reasons
-            tlist2.AddToListBefore(&fillvs, &scalc);
+            tlist2.Replace(&fillvs2);
     }