Changeset 3047 for trunk

Timestamp:

02/06/04 18:12:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mraw/MRawEvtData.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
  2004/02/06: Thomas Bretz
 
-  * mhist/MHPixVsTime.[h,cc]:
-    - changed such that you can set the name of the time container now 
+   * mhist/MHPixVsTime.[h,cc]:
+     - changed such that you can set the name of the time container now 
+
+   * mraw/MRawRunHeader.[h,cc]:
+     - added GetMaxPixId()
+
+   * mraw/MRawEvtData.cc:
+     - fixed wrong size calculation for fABflags
 
 
@@ -13 +19 @@
  2004/02/06: Oscar Blanch
 
-  * mmc/MFadcDefine.h && mmc/MMcFadcHeader.cxx
-    - We cahnged the name (and values) of the global variable
-       MFADC_RESPONSE_AMPLITUDE to  MFADC_RESPONSE_INTEGRAL
+   * mmc/MFadcDefine.h && mmc/MMcFadcHeader.cxx
+     - We cahnged the name (and values) of the global variable
+        MFADC_RESPONSE_AMPLITUDE to  MFADC_RESPONSE_INTEGRAL
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -399 +399 @@
         fHiGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesHiGain());
         fLoGainFadcSamples = new MArrayB(npix*fRunHeader->GetNumSamplesLoGain());
-        fABFlags           = new TArrayC((npix-1)/8+1);
+        fABFlags           = new TArrayC(fRunHeader->GetMaxPixId());
 
         fArraySize  = npix;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -235 +235 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the number of pixel which are markes as connected in the
+// pix assignment (>0)
+//
 UShort_t MRawRunHeader::GetNumConnectedPixels() const
 {
@@ -241 +246 @@
     UShort_t rc = 0;
     for (int i=0; i<num; i++)
+    {
         if (GetPixAssignment(i)>0)
             rc++;
+    }
+    return rc;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the maximum id which exists in the pix assignment
+//
+UShort_t MRawRunHeader::GetMaxPixId() const
+{
+    const Int_t num = fPixAssignment->GetSize();
+
+    UShort_t rc = 0;
+    for (int i=0; i<num; i++)
+        rc = TMath::Max(GetPixAssignment(i), rc);
+
     return rc;
 }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -93 +93 @@
     const MTime &GetRunEnd() const        { return fRunStop; }
     UShort_t GetPixAssignment(UShort_t i) const;
+    UShort_t GetMaxPixId() const;
     UShort_t GetNumConnectedPixels() const;