Changeset 1303 for trunk/MagicSoft/Mars

Timestamp:

04/26/02 10:17:49 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHFadcCam.cc (modified) (1 diff)
• mhist/MHFadcPix.cc (modified) (4 diffs)
• mhist/MHFadcPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/04/26: Thomas Bretz
+
+   * mhist/MHFadcCam.cc:
+     - start numbering of pixels with 1
+
+   * mhist/MHFadcPix.[h,cc]:
+     - overloaded clone to get rid of the histograms in any directory
+     - removed some unnecessary StrDup calls
+     - changed binning (Thanks to Abelardo)
+
+
+
  2002/04/25: Thomas Bretz
 

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -60 +60 @@
 
     for (Int_t i=0; i<577; i++)
-        (*fArray)[i] = new MHFadcPix(i);
+        (*fArray)[i] = new MHFadcPix(i+1);
 }
 

trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

@@ -48 +48 @@
 MHFadcPix::MHFadcPix(UInt_t pixid) : fPixId(pixid)
 {
-    Char_t *name  = StrDup(pixid ? Form("HiGain%03d", pixid) : "HiGain");
-    Char_t *title = StrDup(pixid ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples");
-
-    fHistHi =  new TH1F(name, title, 256, 0, 255);
+    fHistHi =  new TH1F(pixid ? Form("HiGain%03d", pixid) : "HiGain",
+                        pixid ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples",
+                        256, -.5, 255.5);
 
     fHistHi->SetDirectory(NULL);
@@ -57 +56 @@
     fHistHi->SetYTitle("Count");
 
-    delete [] name;
-    delete [] title;
-
-    name  = StrDup(pixid ? Form("LoGain%03d", pixid) : "LoGain");
-    title = StrDup(pixid ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples");
-
-    fHistLo = new TH1F(name, title, 256, 0, 255);
+    fHistLo = new TH1F(pixid ? Form("LoGain%03d", pixid) : "LoGain",
+                       pixid ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples",
+                       256, -.5, 255.5);
 
     fHistLo->SetDirectory(NULL);
     fHistLo->SetXTitle("Signal/FADC Units");
     fHistLo->SetYTitle("Count");
-
-    delete [] name;
-    delete [] title;
 }
 
@@ -105 +97 @@
 
 // --------------------------------------------------------------------------
+//
+// We need our own clone function to get rid of the histogram in any
+// directory
+//
+TObject *MHFadcPix::Clone(const char *) const
+{
+    MHFadcPix &pix = *(MHFadcPix*)TObject::Clone();
+
+    pix.fHistHi->SetDirectory(NULL);
+    pix.fHistLo->SetDirectory(NULL);
+
+    return &pix;
+}
+
+// --------------------------------------------------------------------------
 void MHFadcPix::Draw(Option_t *)
 {
@@ -110 +117 @@
     {
         const char *name  = StrDup(fPixId ? Form("Pixel #%d", fPixId) : "Pixel");
-        const char *title = StrDup(fPixId ? Form("%s FADC Samples", name) : "FADC Samples");
-        MH::MakeDefCanvas(name, title);
+        MH::MakeDefCanvas(name, fPixId ? Form("%s FADC Samples", name) : "FADC Samples");
         delete [] name;
-        delete [] title;
     }
 

trunk/MagicSoft/Mars/mhist/MHFadcPix.h

@@ -29 +29 @@
     void DrawLo();
 
+    TObject *Clone(const char *) const;
+
     void Draw(Option_t *opt=NULL);