Changeset 9899 for trunk/Mars

Timestamp:

08/30/10 09:50:35 (14 years ago)

Author:

tbretz

Message:

 Added the possibility to the camera display to display contents as int or float.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (4 diffs)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/08/30 Thomas Bretz
+
+   * mhist/MHCamera.cc:
+     - added options to display contents as int and float
+
+
 
  2010/08/27 Daniela Dorner

trunk/Mars/mhist/MHCamera.cc

@@ -599 +599 @@
 //                 GeMinimum() ((val-min)/(max-min))
 //   'text'        Draw GetBinContent as char
+//   'integer'     Draw GetBinContent as integer (TMath::Nint)
+//   'float'       Draw GetBinContent as float
 //   'proj'        Display the y-projection of the histogram
 //   'pal0'        Use Pretty palette
@@ -1078 +1080 @@
         opt.ReplaceAll("abscontent", "");
         opt.ReplaceAll("content", "");
+        opt.ReplaceAll("integer", "");
+        opt.ReplaceAll("float", "");
         opt.ReplaceAll("proj", "");
         opt.ReplaceAll("pal0", "");
@@ -1173 +1177 @@
     {
         PaintIndices(5);
+        return;
+    }
+    if (opt.Contains("integer"))
+    {
+        PaintIndices(6);
+        return;
+    }
+    if (opt.Contains("float"))
+    {
+        PaintIndices(7);
         return;
     }
@@ -1330 +1344 @@
         case 3: num += TMath::Nint(fArray[i+1]); break;
         case 4: num += fBinEntries[i+1]; break;
-        case 5: num = (char)TMath::Nint(GetBinContent(i+1)); break;
+        case 5: num  = (char)TMath::Nint(GetBinContent(i+1)); break;
+        case 6: num += TMath::Nint(GetBinContent(i+1)); break;
+        case 7: num += GetBinContent(i+1); break;
         }