Changeset 1832 for trunk/MagicSoft

Timestamp:

03/19/03 10:24:59 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhist/MH3.cc (modified) (1 diff)
• mhist/MH3.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/03/19: Thomas Bretz
+
+    * mhist/MH3.[h,cc]:
+      - changed default constructor to support different dimensions
+
+
 
  2003/03/18: Thomas Bretz
@@ -328 +335 @@
 
 
+<<<<<<< Changelog
+                                                         -*-*- END -*-*-
+ 2003/02/19: Thomas Bretz
+ 
+    * mhist/MH3.[h,cc]:
+      - changed default constructor to support different dimensions
+
+
+
+=======
+>>>>>>> 1.405
  2003/02/18: Thomas Bretz
  

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -87 +87 @@
 // Default constructor.
 //
-MH3::MH3() : fDimension(0), fHist(NULL)
-{
+MH3::MH3(const unsigned int dim)
+    : fDimension(dim>3?3:dim), fHist(NULL)
+{
+    switch (fDimension)
+    {
+    case 1:
+        fHist = new TH1F;
+        fHist->SetYTitle("Counts");
+        break;
+    case 2:
+        fHist = new TH2F;
+        fHist->SetZTitle("Counts");
+        break;
+    case 3:
+        fHist = new TH3F;
+        break;
+    }
+
+    fData[0] = NULL;
+    fData[1] = NULL;
+    fData[2] = NULL;
+
     fName  = gsDefName;
-    fTitle = Form(gsDefTitle.Data(), 0);
-
-    fData[0]  = fData[1]  = fData[2]  = NULL;
-    fScale[0] = fScale[1] = fScale[2] = 1;
+    fTitle = Form(gsDefTitle.Data(), 1);
+
+    fHist->SetDirectory(NULL);
+
+    fScale[0] = 1;
+    fScale[1] = 1;
+    fScale[2] = 1;
 }
 

trunk/MagicSoft/Mars/mhist/MH3.h

@@ -33 +33 @@
 
 public:
-    MH3();
+    MH3(const unsigned int dim=0);
     MH3(const char *memberx);
     MH3(const char *memberx, const char *membery);