Changeset 1030 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/05/01 10:35:36 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (2 diffs)
• MHFadcCam.cc (modified) (2 diffs)
• MHFadcCam.h (modified) (2 diffs)
• MHFadcPix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -25 +25 @@
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
-//  MFill                                                                   //
+//  MFillH                                                                  //
 //                                                                          //
 //  This is a common interface (task) to fill mars histograms. Every mars   //
@@ -35 +35 @@
 //  objects in the parameter list or by specifiing a pointer to the object. //
 //  (s. Constructor)                                                        //
+//                                                                          //
+//  WARNING:                                                                //
+//   Because MFillH is a generalized task to fill histograms it doesn't     //
+//   know about which branches from a file are necessary to fill the        //
+//   histograms. If you are reading data from a file which is directly      //
+//   filled into a histogram via MFillH, please call either                 //
+//   MReadTree::DisableAutoScheme() or enable the necessary branches by     //
+//   yourself, using MReadTree::EnableBranch()                              //
 //                                                                          //
 //  Input Containers:                                                       //

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -44 +44 @@
 //  creates an a list of histograms for all pixels and both gain channels
 //
-MHFadcCam::MHFadcCam (const char *name, const char *title)
+#include <iostream.h>
+MHFadcCam::MHFadcCam(const char *name, const char *title)
 {
     //
     //   set the name and title of this object
     //
-    
-    fName  = name  ? name  : "MHFadcCam" ;
-    fTitle = title ? title : "Container for ADC spectra histograms" ;
+    fName  = name  ? name  : "MHFadcCam";
+    fTitle = title ? title : "Container for ADC spectra histograms";
 
     //
@@ -65 +65 @@
 
 // --------------------------------------------------------------------------
-MHFadcCam::~MHFadcCam ()
+MHFadcCam::~MHFadcCam()
 {
     delete fArray;
+}
+
+// --------------------------------------------------------------------------
+//
+// Our own clone function is necessary since root 3.01/06 or Mars 0.4
+// I don't know the reason
+//
+TObject *MHFadcCam::Clone(const char *) const
+{
+    MHFadcCam *cam = new MHFadcCam;
+
+    for (int i=0; i<577; i++)
+    {
+        delete (*cam->fArray)[i];
+        (*cam->fArray)[i] = (MHFadcPix*)(*fArray)[i]->Clone();
+    }
+    return cam;
 }
 

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -26 +26 @@
 
 public:
-     MHFadcCam(const char *name=NULL, const char *title=NULL);
+    MHFadcCam(const char *name=NULL, const char *title=NULL);
     ~MHFadcCam();
 
@@ -46 +46 @@
     void DrawPix(UInt_t i)     { (*this)[i]->Draw(); }
 
-    Int_t GetEntries()         { return fArray->GetEntries(); }
+    Int_t GetEntries() const   { return fArray->GetEntries(); }
+
+    TObject *Clone(const char *opt="") const;
 
     ClassDef(MHFadcCam, 1) // A list of histograms storing the Fadc spektrum of one pixel

trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

@@ -54 +54 @@
 
     fHistHi->SetDirectory(NULL);
-    fHistHi->SetXTitle("Time/Slices");
-    fHistHi->SetYTitle("Signal");
+    fHistHi->SetXTitle("Signal/FADC Units");
+    fHistHi->SetYTitle("Count");
 
     delete [] name;
@@ -66 +66 @@
 
     fHistLo->SetDirectory(NULL);
-    fHistLo->SetXTitle("Time/Slices");
-    fHistLo->SetYTitle("Signal");
+    fHistLo->SetXTitle("Signal/FADC Units");
+    fHistLo->SetYTitle("Count");
 
     delete [] name;