Changeset 2333

Timestamp:

09/12/03 16:08:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHFadcCam.cc (modified) (8 diffs)
• mhist/MHFadcCam.h (modified) (1 diff)
• mhist/MHFadcPix.cc (modified) (1 diff)
• mhist/MHFadcPix.h (modified) (1 diff)
• mmain/MDataCheck.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -7 +7 @@
        information can be found in the comments there.
 
-   * mhist/MHFadcCam.cc:
+   * mhist/MHFadcCam.[h,cc]:
      - skip MC events which have no FADC information stored
      - better output in case of changes in the number of slices
-     
-   * mhist/MHFadcPix.cc:
+     - added size argument to constructor to support ECO100, too.
+     - removed all fixed numbers and replaced them by the corresponding
+       function
+     - fixed pixel numbering to be consistent with the software pixel
+       numbering in the rest of Mars
+
+   * mhist/MHFadcPix.[h,cc]:
      - fixed the missing y-axis (UseCurrentStyle()) 
+     - fixed pixel numbering by changing default arument of pixid in
+       constructor from 0 to -1
 
    * mmain/MDataCheck.cc
      - added 'Time Spectra of Cosmics' button
+     - added size argument to instatiation of MHFadcCam
+
 
 

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -49 +49 @@
 //  creates an a list of histograms for all pixels and both gain channels
 //
-MHFadcCam::MHFadcCam(MHFadcPix::Type_t t, const char *name, const char *title)
+MHFadcCam::MHFadcCam(const Int_t n, MHFadcPix::Type_t t, const char *name, const char *title)
     : fNumHiGains(-1), fNumLoGains(-1), fType(t)
 {
     //
-    //   set the name and title of this object
+    // set the name and title of this object
     //
     fName  = name  ? name  : "MHFadcCam";
@@ -59 +59 @@
 
     //
-    //   loop over all Pixels and create two histograms
-    //   one for the Low and one for the High gain
-    //   connect all the histogram with the container fHist
+    // loop over all Pixels and create two histograms
+    // one for the Low and one for the High gain
+    // connect all the histogram with the container fHist
     //
-    fArray = new TObjArray(577);
+    fArray = new TObjArray(n);
 
-    for (Int_t i=0; i<577; i++)
-        (*fArray)[i] = new MHFadcPix(i+1, fType);
+    for (Int_t i=0; i<n; i++)
+        (*fArray)[i] = new MHFadcPix(i, fType);
 }
 
@@ -82 +82 @@
 TObject *MHFadcCam::Clone(const char *) const
 {
-    MHFadcCam *cam = new MHFadcCam;
+    const Int_t n = fArray->GetSize();
 
-    for (int i=0; i<577; i++)
+    //
+    // FIXME, this might be done faster and more elegant, by direct copy.
+    //
+    MHFadcCam *cam = new MHFadcCam(n);
+
+    for (int i=0; i<n; i++)
     {
         delete (*cam->fArray)[i];
@@ -100 +105 @@
 Bool_t MHFadcCam::Fill(const MRawEvtData *par)
 {
+    const Int_t n = fArray->GetSize();
+
     if (fType==MHFadcPix::kSlices)
     {
@@ -113 +120 @@
 
         //
-        // First call
+        // First call with nhi!=0
         //
         if (fNumHiGains<0)
-            for (int i=0; i<577; i++)
+            for (int i=0; i<n; i++)
                 (*this)[i].Init(nhi, nlo);
         else
@@ -136 +143 @@
     }
 
-    for (int i=0; i<577; i++)
+    for (int i=0; i<n; i++)
         if (!(*this)[i].Fill(*par))
             return kFALSE;
@@ -145 +152 @@
 void MHFadcCam::ResetHistograms()
 {
-    for (Int_t i=0; i<577; i++)
+    const Int_t n = fArray->GetSize();
+    for (Int_t i=0; i<n; i++)
         ResetEntry(i);
 }
@@ -154 +162 @@
     GetHistLo(i)->Reset();
 }
-

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -33 +33 @@
 
 public:
-    MHFadcCam(MHFadcPix::Type_t t=MHFadcPix::kValue, const char *name=NULL, const char *title=NULL);
+    MHFadcCam(const Int_t n=577, MHFadcPix::Type_t t=MHFadcPix::kValue, const char *name=NULL, const char *title=NULL);
     ~MHFadcCam();
 

trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

@@ -48 +48 @@
 // Creates the histograms for lo and hi gain of one pixel
 //
-MHFadcPix::MHFadcPix(UInt_t pixid, Type_t t)
+MHFadcPix::MHFadcPix(Int_t pixid, Type_t t)
     : fPixId(pixid), fType(t)
 {
-    fHistHi.SetName(pixid ? Form("HiGain%03d", pixid) : "HiGain");
-    fHistHi.SetTitle(pixid ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples");
+    fHistHi.SetName(pixid>=0 ? Form("HiGain%03d", pixid) : "HiGain");
+    fHistHi.SetTitle(pixid>=0 ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples");
     fHistHi.SetDirectory(NULL);
     fHistHi.UseCurrentStyle();
 
-    fHistLo.SetName(pixid ? Form("LoGain%03d", pixid) : "LoGain");
-    fHistLo.SetTitle(pixid ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples");
+    fHistLo.SetName(pixid>=0 ? Form("LoGain%03d", pixid) : "LoGain");
+    fHistLo.SetTitle(pixid>=0 ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples");
     fHistLo.SetDirectory(NULL);
     fHistLo.UseCurrentStyle();

trunk/MagicSoft/Mars/mhist/MHFadcPix.h

@@ -26 +26 @@
 
 public:
-    MHFadcPix(UInt_t pixid=0, Type_t t=kValue);
+    MHFadcPix(Int_t pixid=-1, Type_t t=kValue);
 
     TH1F *GetHistHi() { return &fHistHi; }

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -120 +120 @@
     read.DisableAutoScheme();
 
-    MHFadcCam hist(t);
+    MHFadcCam hist(577, t);
     plist.AddToList(&hist);